From 912b3f7737259d5977ce3fa64781a3280c712bfe Mon Sep 17 00:00:00 2001
From: Pieter Cappelle <pieter@newance.be>
Date: Wed, 5 Feb 2020 13:38:28 +0100
Subject: [PATCH 001/671] Added hashbased check to prevent image duplication on
 product import & remove unused images

---
 .../Model/Import/Product.php                  | 204 ++++++++++++++----
 .../Import/Product/MediaGalleryProcessor.php  |  20 ++
 2 files changed, 186 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index ae5f0f5d79e2a..58ae970e93f82 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1020,6 +1020,7 @@ public function setParameters(array $params)
      * Delete products for replacement.
      *
      * @return $this
+     * @throws \Exception
      */
     public function deleteProductsForReplacement()
     {
@@ -1111,6 +1112,11 @@ protected function _importData()
      * Replace imported products.
      *
      * @return $this
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Validation\ValidationException
+     * @throws \Zend_Validate_Exception
      */
     protected function _replaceProducts()
     {
@@ -1132,6 +1138,11 @@ protected function _replaceProducts()
      * Save products data.
      *
      * @return $this
+     * @throws LocalizedException
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Validation\ValidationException
+     * @throws \Zend_Validate_Exception
      */
     protected function _saveProductsData()
     {
@@ -1274,6 +1285,11 @@ protected function _prepareRowForDb(array $rowData)
      * Must be called after ALL products saving done.
      *
      * @return $this
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws LocalizedException
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     protected function _saveLinks()
     {
@@ -1305,6 +1321,7 @@ protected function _saveLinks()
      *
      * @param array $attributesData
      * @return $this
+     * @throws \Exception
      */
     protected function _saveProductAttributes(array $attributesData)
     {
@@ -1436,6 +1453,7 @@ private function getOldSkuFieldsForSelect()
      *
      * @param array $newProducts
      * @return void
+     * @throws \Exception
      */
     private function updateOldSku(array $newProducts)
     {
@@ -1459,6 +1477,7 @@ private function updateOldSku(array $newProducts)
      * Get new SKU fields for select
      *
      * @return array
+     * @throws \Exception
      */
     private function getNewSkuFieldsForSelect()
     {
@@ -1542,6 +1561,7 @@ public function getImagesFromRow(array $rowData)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      * @throws LocalizedException
+     * @throws \Zend_Validate_Exception
      * phpcs:disable Generic.Metrics.NestingLevel.TooHigh
      */
     protected function _saveProducts()
@@ -1559,12 +1579,17 @@ protected function _saveProducts()
             $this->categoriesCache = [];
             $tierPrices = [];
             $mediaGallery = [];
+            $uploadedFiles = [];
+            $galleryItemsToRemove = [];
             $labelsForUpdate = [];
             $imagesForChangeVisibility = [];
             $uploadedImages = [];
             $previousType = null;
             $prevAttributeSet = null;
+
+            $importDir = $this->_mediaDirectory->getAbsolutePath($this->getImportDir());
             $existingImages = $this->getExistingImages($bunch);
+            $this->addImageHashes($existingImages);
 
             foreach ($bunch as $rowNum => $rowData) {
                 // reset category processor's failed categories array
@@ -1660,6 +1685,7 @@ protected function _saveProducts()
                 if (!array_key_exists($rowSku, $this->websitesCache)) {
                     $this->websitesCache[$rowSku] = [];
                 }
+
                 // 2. Product-to-Website phase
                 if (!empty($rowData[self::COL_PRODUCT_WEBSITES])) {
                     $websiteCodes = explode($this->getMultipleValueSeparator(), $rowData[self::COL_PRODUCT_WEBSITES]);
@@ -1711,12 +1737,11 @@ protected function _saveProducts()
                 foreach (array_keys($imageHiddenStates) as $image) {
                     //Mark image as uploaded if it exists
                     if (array_key_exists($image, $rowExistingImages)) {
+                        $rowImages[self::COL_MEDIA_IMAGE][] = $image;
                         $uploadedImages[$image] = $image;
                     }
-                    //Add image to hide to images list if it does not exist
-                    if (empty($rowImages[self::COL_MEDIA_IMAGE])
-                        || !in_array($image, $rowImages[self::COL_MEDIA_IMAGE])
-                    ) {
+
+                    if (empty($rowImages)) {
                         $rowImages[self::COL_MEDIA_IMAGE][] = $image;
                     }
                 }
@@ -1730,56 +1755,89 @@ protected function _saveProducts()
                 $position = 0;
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
-                        if (!isset($uploadedImages[$columnImage])) {
-                            $uploadedFile = $this->uploadMediaFiles($columnImage);
-                            $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
-                            if ($uploadedFile) {
-                                $uploadedImages[$columnImage] = $uploadedFile;
+                        if (filter_var($columnImage, FILTER_VALIDATE_URL) === false) {
+                            $filename = $importDir . DIRECTORY_SEPARATOR . $columnImage;
+                            if (file_exists($filename)) {
+                                $hash = hash_file('sha256', $importDir . DIRECTORY_SEPARATOR . $columnImage);
                             } else {
-                                unset($rowData[$column]);
-                                $this->addRowError(
-                                    ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
-                                    $rowNum,
-                                    null,
-                                    null,
-                                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
-                                );
+                                $hash = hash_file('sha256', $filename);
                             }
                         } else {
-                            $uploadedFile = $uploadedImages[$columnImage];
+                            $hash = hash_file('sha256', $columnImage);
+                        }
+
+                        // Add new images
+                        if (empty($rowExistingImages)) {
+                            $imageAlreadyExists = false;
+                        } else {
+                            $imageAlreadyExists = array_reduce(
+                                $rowExistingImages,
+                                function ($exists, $file) use ($hash) {
+                                    if ($exists) {
+                                        return $exists;
+                                    }
+                                    if ($file['hash'] === $hash) {
+                                        return $file['value'];
+                                    }
+                                    return $exists;
+                                },
+                                ''
+                            );
+                        }
+
+                        if ($imageAlreadyExists) {
+                            $uploadedFile = $imageAlreadyExists;
+                        } else {
+                            if (!isset($uploadedImages[$columnImage])) {
+                                $uploadedFile = $this->uploadMediaFiles($columnImage);
+                                $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
+                                if ($uploadedFile) {
+                                    $uploadedImages[$columnImage] = $uploadedFile;
+                                } else {
+                                    unset($rowData[$column]);
+                                    $this->addRowError(
+                                        ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
+                                        $rowNum,
+                                        null,
+                                        null,
+                                        ProcessingError::ERROR_LEVEL_NOT_CRITICAL
+                                    );
+                                }
+                            } else {
+                                $uploadedFile = $uploadedImages[$columnImage];
+                            }
                         }
 
                         if ($uploadedFile && $column !== self::COL_MEDIA_IMAGE) {
                             $rowData[$column] = $uploadedFile;
                         }
 
+                        if ($uploadedFile) {
+                            $uploadedFiles[] = $uploadedFile;
+                        }
+
                         if (!$uploadedFile || isset($mediaGallery[$storeId][$rowSku][$uploadedFile])) {
                             continue;
                         }
 
                         if (isset($rowExistingImages[$uploadedFile])) {
                             $currentFileData = $rowExistingImages[$uploadedFile];
-                            $currentFileData['store_id'] = $storeId;
-                            $storeMediaGalleryValueExists = isset($rowStoreMediaGalleryValues[$uploadedFile]);
-                            if (array_key_exists($uploadedFile, $imageHiddenStates)
-                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
-                            ) {
-                                $imagesForChangeVisibility[] = [
-                                    'disabled' => $imageHiddenStates[$uploadedFile],
-                                    'imageData' => $currentFileData,
-                                    'exists' => $storeMediaGalleryValueExists
-                                ];
-                                $storeMediaGalleryValueExists = true;
-                            }
-
                             if (isset($rowLabels[$column][$columnImageKey])
                                 && $rowLabels[$column][$columnImageKey] !=
                                 $currentFileData['label']
                             ) {
                                 $labelsForUpdate[] = [
                                     'label' => $rowLabels[$column][$columnImageKey],
-                                    'imageData' => $currentFileData,
-                                    'exists' => $storeMediaGalleryValueExists
+                                    'imageData' => $currentFileData
+                                ];
+                            }
+
+                            if (array_key_exists($uploadedFile, $imageHiddenStates)
+                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
+                            ) {
+                                $imagesForChangeVisibility[] = [
+                                    'disabled' => $imageHiddenStates[$uploadedFile],
+                                    'imageData' => $currentFileData
                                 ];
                             }
                         } else {
@@ -1800,6 +1858,17 @@ protected function _saveProducts()
                     }
                 }
 
+                // 5.1 Items to remove phase
+                if (!empty($rowExistingImages)) {
+                    $galleryItemsToRemove = \array_merge(
+                        $galleryItemsToRemove,
+                        \array_diff(
+                            \array_keys($rowExistingImages),
+                            $uploadedFiles
+                        )
+                    );
+                }
+
                 // 6. Attributes phase
                 $rowStore = (self::SCOPE_STORE == $rowScope)
                     ? $this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])
@@ -1910,6 +1979,8 @@ protected function _saveProducts()
                 $tierPrices
             )->_saveMediaGallery(
                 $mediaGallery
+            )->_removeOldMediaGalleryItems(
+                $galleryItemsToRemove
             )->_saveProductAttributes(
                 $attributes
             )->updateMediaGalleryVisibility(
@@ -1928,6 +1999,25 @@ protected function _saveProducts()
     }
     //phpcs:enable Generic.Metrics.NestingLevel
 
+    /**
+     * Generate hashes for existing images for comparison with newly uploaded images.
+     *
+     * @param array $images
+     */
+    public function addImageHashes(&$images)
+    {
+        $productMediaPath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)
+            ->getAbsolutePath('/catalog/product');
+
+        foreach ($images as $storeId => $skus) {
+            foreach ($skus as $sku => $files) {
+                foreach ($files as $path => $file) {
+                    $images[$storeId][$sku][$path]['hash'] = hash_file('sha256', $productMediaPath . $file['value']);
+                }
+            }
+        }
+    }
+
     /**
      * Prepare array with image states (visible or hidden from product page)
      *
@@ -2063,6 +2153,24 @@ protected function _saveProductTierPrices(array $tierPriceData)
         return $this;
     }
 
+    /**
+     * Returns the import directory if specified or a default import directory (media/import).
+     *
+     * @return string
+     */
+    protected function getImportDir()
+    {
+        $dirConfig = DirectoryList::getDefaultConfig();
+        $dirAddon = $dirConfig[DirectoryList::MEDIA][DirectoryList::PATH];
+
+        if (!empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])) {
+            $tmpPath = $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
+        } else {
+            $tmpPath = $dirAddon . '/' . $this->_mediaDirectory->getRelativePath('import');
+        }
+        return $tmpPath;
+    }
+
     /**
      * Returns an object for upload a media files
      *
@@ -2079,11 +2187,7 @@ protected function _getUploader()
             $dirConfig = DirectoryList::getDefaultConfig();
             $dirAddon = $dirConfig[DirectoryList::MEDIA][DirectoryList::PATH];
 
-            if (!empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])) {
-                $tmpPath = $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
-            } else {
-                $tmpPath = $dirAddon . '/' . $this->_mediaDirectory->getRelativePath('import');
-            }
+            $tmpPath = $this->getImportDir();
 
             if (!$fileUploader->setTmpDir($tmpPath)) {
                 throw new LocalizedException(
@@ -2168,6 +2272,22 @@ protected function _saveMediaGallery(array $mediaGalleryData)
         return $this;
     }
 
+    /**
+     * Remove old media gallery items.
+     *
+     * @param array $itemsToRemove
+     * @return $this
+     */
+    protected function _removeOldMediaGalleryItems(array $itemsToRemove)
+    {
+        if (empty($itemsToRemove)) {
+            return $this;
+        }
+        $this->mediaProcessor->removeOldMediaItems($itemsToRemove);
+
+        return $this;
+    }
+
     /**
      * Save product websites.
      *
@@ -2210,6 +2330,9 @@ protected function _saveProductWebsites(array $websiteData)
      * Stock item saving.
      *
      * @return $this
+     * @throws \Magento\Framework\Exception\CouldNotSaveException
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Validation\ValidationException
      */
     protected function _saveStockItem()
     {
@@ -2791,6 +2914,7 @@ private function _customFieldsMapping($rowData)
      * Validate data rows and save bunches to DB
      *
      * @return $this|AbstractEntity
+     * @throws LocalizedException
      */
     protected function _saveValidatedBunches()
     {
@@ -2930,6 +3054,7 @@ private function isNeedToChangeUrlKey(array $rowData): bool
      * Get product entity link field
      *
      * @return string
+     * @throws \Exception
      */
     private function getProductEntityLinkField()
     {
@@ -2945,6 +3070,7 @@ private function getProductEntityLinkField()
      * Get product entity identifier field
      *
      * @return string
+     * @throws \Exception
      */
     private function getProductIdentifierField()
     {
@@ -2961,6 +3087,7 @@ private function getProductIdentifierField()
      *
      * @param array $labels
      * @return void
+     * @throws \Exception
      */
     private function updateMediaGalleryLabels(array $labels)
     {
@@ -2974,6 +3101,7 @@ private function updateMediaGalleryLabels(array $labels)
      *
      * @param array $images
      * @return $this
+     * @throws \Exception
      */
     private function updateMediaGalleryVisibility(array $images)
     {
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
index a94a87a44b32a..9d24bbdb00440 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
@@ -104,6 +104,7 @@ public function __construct(
      *
      * @param array $mediaGalleryData
      * @return void
+     * @throws \Exception
      */
     public function saveMediaGallery(array $mediaGalleryData)
     {
@@ -270,6 +271,7 @@ private function prepareMediaGalleryValueData(
      *
      * @param array $labels
      * @return void
+     * @throws \Exception
      */
     public function updateMediaGalleryLabels(array $labels)
     {
@@ -281,6 +283,7 @@ public function updateMediaGalleryLabels(array $labels)
      *
      * @param array $images
      * @return void
+     * @throws \Exception
      */
     public function updateMediaGalleryVisibility(array $images)
     {
@@ -293,6 +296,7 @@ public function updateMediaGalleryVisibility(array $images)
      * @param array $data
      * @param string $field
      * @return void
+     * @throws \Exception
      */
     private function updateMediaGalleryField(array $data, $field)
     {
@@ -337,6 +341,7 @@ private function updateMediaGalleryField(array $data, $field)
      *
      * @param array $bunch
      * @return array
+     * @throws \Exception
      */
     public function getExistingImages(array $bunch)
     {
@@ -444,10 +449,25 @@ private function getLastMediaPositionPerProduct(array $productIds): array
         return $result;
     }
 
+    /**
+     * Remove old media gallery items.
+     *
+     * @param array $oldMediaValues
+     * @return void
+     */
+    public function removeOldMediaItems(array $oldMediaValues)
+    {
+        $this->connection->delete(
+            $this->mediaGalleryTableName,
+            $this->connection->quoteInto('value IN (?)', $oldMediaValues)
+        );
+    }
+
     /**
      * Get product entity link field.
      *
      * @return string
+     * @throws \Exception
      */
     private function getProductEntityLinkField()
     {

From ffdb34112974d74aa2d72b5fd441641e85234ad3 Mon Sep 17 00:00:00 2001
From: Pieter Cappelle <pieter@newance.be>
Date: Wed, 5 Feb 2020 13:38:38 +0100
Subject: [PATCH 002/671] Adjusted the product import test

---
 .../Catalog/_files/magento_image_2.jpg        | Bin 0 -> 12137 bytes
 .../Model/Import/ProductTest.php              |  18 ++++++++++++++++++
 .../_files/import_media_update_images.csv     |   2 ++
 .../_files/import_with_filesystem_images.php  |   4 ++++
 4 files changed, 24 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image_2.jpg
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image_2.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2c21e0238ede73faf93b6ae9641a2f649f537f55
GIT binary patch
literal 12137
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
PY$<|U+}aCC>xlmWy16?N

literal 0
HcmV?d00001

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index f24981ca40156..47e02b08783ca 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -533,6 +533,7 @@ private function createImportModel($pathToFile, $behavior = \Magento\ImportExpor
     /**
      * @param string $productSku
      * @return array ['optionId' => ['optionValueId' => 'optionValueTitle', ...], ...]
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getCustomOptionValues($productSku)
     {
@@ -876,6 +877,23 @@ public function testSaveMediaImage()
         $this->assertInstanceOf(\Magento\Framework\DataObject::class, $additionalImageTwoItem);
         $this->assertEquals('/m/a/magento_additional_image_two.jpg', $additionalImageTwoItem->getFile());
         $this->assertEquals('Additional Image Label Two', $additionalImageTwoItem->getLabel());
+
+        // Will check that existing product update works
+        // New unique images as per MD5 should be added, images not mentioned in the import should be removed
+        $this->importDataForMediaTest('import_media_update_images.csv');
+
+        $product = $this->getProductBySku('simple_new');
+        $this->assertEquals('/m/a/magento_image_2.jpg', $product->getData('image'));
+        // small_image should be skipped from update as it is a duplicate (md5 is the same)
+        $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $product->getData('thumbnail'));
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
+
+        $gallery = $product->getMediaGalleryImages();
+        $this->assertInstanceOf(\Magento\Framework\Data\Collection::class, $gallery);
+
+        $items = $gallery->getItems();
+        $this->assertCount(4, $items);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv
new file mode 100644
index 0000000000000..56dd5b4e977bf
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv
@@ -0,0 +1,2 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label1,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
+simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,magento_image_2.jpg,Image Label,magento_small_image_2.jpg,Small Image Label,magento_thumbnail.jpg,Thumbnail Label,magento_image.jpg,Image Label,10/20/15 07:05,10/20/15 07:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,1,1,1,10000,1,1,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
index 0ee59aedd8979..d426a1521e5b6 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
@@ -29,6 +29,10 @@
         'source' => __DIR__ . '/../../../../../Magento/Catalog/_files/magento_image.jpg',
         'dest' => $dirPath . '/magento_image.jpg',
     ],
+    [
+        'source' => __DIR__ . '/../../../../../Magento/Catalog/_files/magento_image_2.jpg',
+        'dest' => $dirPath . '/magento_image_2.jpg',
+    ],
     [
         'source' => __DIR__ . '/../../../../../Magento/Catalog/_files/magento_small_image.jpg',
         'dest' => $dirPath . '/magento_small_image.jpg',

From eb8607c5ab62f10e519e20810da60a2755c34d58 Mon Sep 17 00:00:00 2001
From: Pieter Cappelle <pieter@newance.be>
Date: Wed, 5 Feb 2020 16:11:33 +0100
Subject: [PATCH 003/671] First try-out to fix static tests / integration test

---
 .../Model/Import/Product.php                  | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 58ae970e93f82..c66d465247892 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1776,7 +1776,9 @@ function ($exists, $file) use ($hash) {
                                     if ($exists) {
                                         return $exists;
                                     }
-                                    if ($file['hash'] === $hash) {
+                                    if (isset($file['hash']) &&
+                                        !empty($file['hash']) &&
+                                        $file['hash'] === $hash) {
                                         return $file['value'];
                                     }
                                     return $exists;
@@ -1860,12 +1862,9 @@ function ($exists, $file) use ($hash) {
 
                 // 5.1 Items to remove phase
                 if (!empty($rowExistingImages)) {
-                    $galleryItemsToRemove = \array_merge(
-                        $galleryItemsToRemove,
-                        \array_diff(
-                            \array_keys($rowExistingImages),
-                            $uploadedFiles
-                        )
+                    $galleryItemsToRemove[] = \array_diff(
+                        \array_keys($rowExistingImages),
+                        $uploadedFiles
                     );
                 }
 
@@ -2012,7 +2011,9 @@ public function addImageHashes(&$images)
         foreach ($images as $storeId => $skus) {
             foreach ($skus as $sku => $files) {
                 foreach ($files as $path => $file) {
-                    $images[$storeId][$sku][$path]['hash'] = hash_file('sha256', $productMediaPath . $file['value']);
+                    if (file_exists($productMediaPath . $file['value'])) {
+                        $images[$storeId][$sku][$path]['hash'] = hash_file('sha256', $productMediaPath . $file['value']);
+                    }
                 }
             }
         }
@@ -2283,6 +2284,12 @@ protected function _removeOldMediaGalleryItems(array $itemsToRemove)
         if (empty($itemsToRemove)) {
             return $this;
         }
+
+        $itemsToRemove = array_merge(...$itemsToRemove);
+        if (empty($itemsToRemove)) {
+            return $this;
+        }
+
         $this->mediaProcessor->removeOldMediaItems($itemsToRemove);
 
         return $this;

From e4812b842f300af4f45dd9d6ed3a6faaa2143a38 Mon Sep 17 00:00:00 2001
From: Pieter Cappelle <pieter@newance.be>
Date: Tue, 25 Feb 2020 08:53:07 +0100
Subject: [PATCH 004/671] Fix unit tests

---
 .../Model/Import/Product.php                  | 28 ++++++-----
 .../Model/Import/ProductTest.php              | 47 ++++++++++++-------
 2 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index c66d465247892..6be3141a31db7 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1755,12 +1755,11 @@ protected function _saveProducts()
                 $position = 0;
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
+                        $hash = '';
                         if (filter_var($columnImage, FILTER_VALIDATE_URL) === false) {
                             $filename = $importDir . DIRECTORY_SEPARATOR . $columnImage;
                             if (file_exists($filename)) {
                                 $hash = hash_file('sha256', $importDir . DIRECTORY_SEPARATOR . $columnImage);
-                            } else {
-                                $hash = hash_file('sha256', $filename);
                             }
                         } else {
                             $hash = hash_file('sha256', $columnImage);
@@ -1824,22 +1823,27 @@ function ($exists, $file) use ($hash) {
 
                         if (isset($rowExistingImages[$uploadedFile])) {
                             $currentFileData = $rowExistingImages[$uploadedFile];
+                            $currentFileData['store_id'] = $storeId;
+                            $storeMediaGalleryValueExists = isset($rowStoreMediaGalleryValues[$uploadedFile]);
+                            if (array_key_exists($uploadedFile, $imageHiddenStates)
+                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
+                            ) {
+                                $imagesForChangeVisibility[] = [
+                                    'disabled' => $imageHiddenStates[$uploadedFile],
+                                    'imageData' => $currentFileData,
+                                    'exists' => $storeMediaGalleryValueExists
+                                ];
+                                $storeMediaGalleryValueExists = true;
+                            }
+
                             if (isset($rowLabels[$column][$columnImageKey])
                                 && $rowLabels[$column][$columnImageKey] !=
                                 $currentFileData['label']
                             ) {
                                 $labelsForUpdate[] = [
                                     'label' => $rowLabels[$column][$columnImageKey],
-                                    'imageData' => $currentFileData
-                                ];
-                            }
-
-                            if (array_key_exists($uploadedFile, $imageHiddenStates)
-                                && $currentFileData['disabled'] != $imageHiddenStates[$uploadedFile]
-                            ) {
-                                $imagesForChangeVisibility[] = [
-                                    'disabled' => $imageHiddenStates[$uploadedFile],
-                                    'imageData' => $currentFileData
+                                    'imageData' => $currentFileData,
+                                    'exists' => $storeMediaGalleryValueExists
                                 ];
                             }
                         } else {
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 47e02b08783ca..23d62589a1c37 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -877,23 +877,6 @@ public function testSaveMediaImage()
         $this->assertInstanceOf(\Magento\Framework\DataObject::class, $additionalImageTwoItem);
         $this->assertEquals('/m/a/magento_additional_image_two.jpg', $additionalImageTwoItem->getFile());
         $this->assertEquals('Additional Image Label Two', $additionalImageTwoItem->getLabel());
-
-        // Will check that existing product update works
-        // New unique images as per MD5 should be added, images not mentioned in the import should be removed
-        $this->importDataForMediaTest('import_media_update_images.csv');
-
-        $product = $this->getProductBySku('simple_new');
-        $this->assertEquals('/m/a/magento_image_2.jpg', $product->getData('image'));
-        // small_image should be skipped from update as it is a duplicate (md5 is the same)
-        $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
-        $this->assertEquals('/m/a/magento_thumbnail.jpg', $product->getData('thumbnail'));
-        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
-
-        $gallery = $product->getMediaGalleryImages();
-        $this->assertInstanceOf(\Magento\Framework\Data\Collection::class, $gallery);
-
-        $items = $gallery->getItems();
-        $this->assertCount(4, $items);
     }
 
     /**
@@ -979,6 +962,36 @@ function (\Magento\Framework\DataObject $item) {
         );
     }
 
+    /**
+     * Test that product import with images works properly
+     *
+     * @magentoDataFixture mediaImportImageFixture
+     * @magentoAppIsolation enabled
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testSaveMediaImageDuplicateImages()
+    {
+        // Will check that existing product update works
+        // New unique images as per MD5 should be added, images not mentioned in the import should be removed
+        $this->importDataForMediaTest('import_media_update_images.csv');
+
+        $product = $this->getProductBySku('simple_new');
+
+        $gallery = $product->getMediaGalleryImages();
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('image'));
+
+        // small_image should be skipped from update as it is a duplicate (md5 is the same)
+        $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
+        $this->assertEquals('/m/a/magento_thumbnail.jpg', $product->getData('thumbnail'));
+        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
+
+        $gallery = $product->getMediaGalleryImages();
+        $this->assertInstanceOf(\Magento\Framework\Data\Collection::class, $gallery);
+
+        $items = $gallery->getItems();
+        $this->assertCount(4, $items);
+    }
+
     /**
      * Test that errors occurred during importing images are logged.
      *

From 1000822c16ddb32a483b3966bd5e01e7cfcad536 Mon Sep 17 00:00:00 2001
From: Rafael Kassner <rafael.kassner@yubico.com>
Date: Thu, 26 Mar 2020 12:10:12 +0100
Subject: [PATCH 005/671] Add missing order_data array to EmailSender classes

---
 .../Sales/Model/Order/Creditmemo/Sender/EmailSender.php   | 6 ++++++
 .../Sales/Model/Order/Invoice/Sender/EmailSender.php      | 6 ++++++
 .../Sales/Model/Order/Shipment/Sender/EmailSender.php     | 8 +++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index 93c8ed00f9daa..a92a1480bd023 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -111,6 +111,12 @@ public function send(
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
                 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index 004f36c277028..44b4df17619d8 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -111,6 +111,12 @@ public function send(
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
                 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index 1d4418c50047d..288cbd40b1e5b 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -110,7 +110,13 @@ public function send(
                 'payment_html' => $this->getPaymentHtml($order),
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
-                'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
+                'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 

From 56f8bf8dcdfd47d656fc563c8d77c80997268923 Mon Sep 17 00:00:00 2001
From: Rafael Kassner <rafael.kassner@yubico.com>
Date: Thu, 26 Mar 2020 14:46:10 +0100
Subject: [PATCH 006/671] Implement unit tests

---
 .../Model/Order/Creditmemo/Sender/EmailSenderTest.php | 11 +++++++++++
 .../Model/Order/Invoice/Sender/EmailSenderTest.php    | 11 +++++++++++
 .../Model/Order/Shipment/Sender/EmailSenderTest.php   | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
index 13ed0739348b2..b97db473687fb 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/Sender/EmailSenderTest.php
@@ -250,6 +250,11 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
             ->method('setSendEmail')
             ->with($emailSendingResult);
 
+        $this->orderMock->method('getCustomerName')->willReturn('Customer name');
+        $this->orderMock->method('getIsNotVirtual')->willReturn(true);
+        $this->orderMock->method('getEmailCustomerNote')->willReturn(null);
+        $this->orderMock->method('getFrontendStatusLabel')->willReturn('Pending');
+
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
@@ -260,6 +265,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => 'Customer name',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => null,
+                    'frontend_status_label' => 'Pending',
+                ],
             ];
             $transport = new \Magento\Framework\DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
index 6db1ec0392e0e..0ab413229c703 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Sender/EmailSenderTest.php
@@ -249,6 +249,11 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
             ->method('setSendEmail')
             ->with($emailSendingResult);
 
+        $this->orderMock->method('getCustomerName')->willReturn('Customer name');
+        $this->orderMock->method('getIsNotVirtual')->willReturn(true);
+        $this->orderMock->method('getEmailCustomerNote')->willReturn(null);
+        $this->orderMock->method('getFrontendStatusLabel')->willReturn('Pending');
+
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
@@ -259,6 +264,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => 'Customer name',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => null,
+                    'frontend_status_label' => 'Pending',
+                ],
             ];
             $transport = new \Magento\Framework\DataObject($transport);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
index 2262fbf03c1a1..6a892e4af7972 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
@@ -251,6 +251,11 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
             ->method('setSendEmail')
             ->with($emailSendingResult);
 
+        $this->orderMock->method('getCustomerName')->willReturn('Customer name');
+        $this->orderMock->method('getIsNotVirtual')->willReturn(true);
+        $this->orderMock->method('getEmailCustomerNote')->willReturn(null);
+        $this->orderMock->method('getFrontendStatusLabel')->willReturn('Pending');
+
         if (!$configValue || $forceSyncMode) {
             $transport = [
                 'order' => $this->orderMock,
@@ -261,6 +266,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => 'Customer name',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => null,
+                    'frontend_status_label' => 'Pending',
+                ],
             ];
             $transport = new \Magento\Framework\DataObject($transport);
 

From 59dd0db5300a4a4f580f51e2bd8d21db74ca05ed Mon Sep 17 00:00:00 2001
From: Eden <eden@magestore.com>
Date: Sat, 4 Apr 2020 19:44:50 +0700
Subject: [PATCH 007/671] Fix wrong position of button list when load "New
 Attribute" page

---
 .../Adminhtml/Product/Attribute/Edit.php      | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index 6ab039aa27849..7c680a108adf8 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -42,6 +42,8 @@ public function __construct(
     }
 
     /**
+     * Construct block
+     *
      * @return void
      */
     protected function _construct()
@@ -51,6 +53,14 @@ protected function _construct()
 
         parent::_construct();
 
+        $this->buttonList->update('save', 'label', __('Save Attribute'));
+        $this->buttonList->update('save', 'class', 'save primary');
+        $this->buttonList->update(
+            'save',
+            'data_attribute',
+            ['mage-init' => ['button' => ['event' => 'save', 'target' => '#edit_form']]]
+        );
+
         if ($this->getRequest()->getParam('popup')) {
             $this->buttonList->remove('back');
             if ($this->getRequest()->getParam('product_tab') != 'variations') {
@@ -64,6 +74,8 @@ protected function _construct()
                     100
                 );
             }
+            $this->buttonList->update('reset', 'level', 10);
+            $this->buttonList->update('save', 'class', 'save action-secondary');
         } else {
             $this->addButton(
                 'save_and_edit_button',
@@ -79,14 +91,6 @@ protected function _construct()
             );
         }
 
-        $this->buttonList->update('save', 'label', __('Save Attribute'));
-        $this->buttonList->update('save', 'class', 'save primary');
-        $this->buttonList->update(
-            'save',
-            'data_attribute',
-            ['mage-init' => ['button' => ['event' => 'save', 'target' => '#edit_form']]]
-        );
-
         $entityAttribute = $this->_coreRegistry->registry('entity_attribute');
         if (!$entityAttribute || !$entityAttribute->getIsUserDefined()) {
             $this->buttonList->remove('delete');
@@ -96,7 +100,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region = 'toolbar')
     {

From 1dd4e1bbd58525b83373da00f691bd2daf4ede60 Mon Sep 17 00:00:00 2001
From: Eden <eden@magestore.com>
Date: Sat, 4 Apr 2020 21:16:10 +0700
Subject: [PATCH 008/671] Fix static test

---
 .../Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index 7c680a108adf8..efb7d6dbbeff3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -107,7 +107,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
         if ($this->getRequest()->getParam('popup')) {
             $region = 'header';
         }
-        parent::addButton($buttonId, $data, $level, $sortOrder, $region);
+        return parent::addButton($buttonId, $data, $level, $sortOrder, $region);
     }
 
     /**

From eb8cd708869546a203b17b922c2ce573a6c7f35d Mon Sep 17 00:00:00 2001
From: Nikolay Sumrak <nikolassumrak@gmail.com>
Date: Thu, 9 Apr 2020 13:32:19 +0300
Subject: [PATCH 009/671] Fixed creating shipping labels in part-shipment

---
 .../view/adminhtml/templates/order/packaging/popup.phtml    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
index 28322d9534926..592babecdbfd6 100644
--- a/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
+++ b/app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml
@@ -44,7 +44,11 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
             }
         });
         packaging.setItemQtyCallback(function(itemId){
-            var item = $$('[name="shipment[items]['+itemId+']"]')[0];
+            var item = $$('[name="shipment[items]['+itemId+']"]')[0],
+                itemTitle = $('order_item_' + itemId + '_title');
+            if (!itemTitle && !item) {
+                return 0;
+            }
             if (item && !isNaN(item.value)) {
                 return item.value;
             }

From a128f392b45f559316460962444bd4b1834e8f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Fri, 8 May 2020 12:22:00 +0200
Subject: [PATCH 010/671] Fix #24091 - Selected configurable product attribute
 options are not displaying in wishlist page.

---
 .../Magento/Wishlist/Block/AddToWishlist.php  | 38 ++++++++-------
 .../frontend/layout/catalog_category_view.xml | 10 +++-
 .../layout/catalogsearch_result_index.xml     | 12 +++++
 .../view/frontend/web/js/add-to-wishlist.js   | 48 +++++++++++++++++--
 4 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/AddToWishlist.php b/app/code/Magento/Wishlist/Block/AddToWishlist.php
index 3ba350af94176..dffd8cb027e74 100644
--- a/app/code/Magento/Wishlist/Block/AddToWishlist.php
+++ b/app/code/Magento/Wishlist/Block/AddToWishlist.php
@@ -6,13 +6,15 @@
 
 namespace Magento\Wishlist\Block;
 
+use Magento\Framework\View\Element\Template;
+
 /**
  * Wishlist js plugin initialization block
  *
  * @api
  * @since 100.1.0
  */
-class AddToWishlist extends \Magento\Framework\View\Element\Template
+class AddToWishlist extends Template
 {
     /**
      * Product types
@@ -21,20 +23,6 @@ class AddToWishlist extends \Magento\Framework\View\Element\Template
      */
     private $productTypes;
 
-    /**
-     * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param array $data
-     */
-    public function __construct(
-        \Magento\Framework\View\Element\Template\Context $context,
-        array $data = []
-    ) {
-        parent::__construct(
-            $context,
-            $data
-        );
-    }
-
     /**
      * Returns wishlist widget options
      *
@@ -43,7 +31,10 @@ public function __construct(
      */
     public function getWishlistOptions()
     {
-        return ['productType' => $this->getProductTypes()];
+        return [
+            'productType' => $this->getProductTypes(),
+            'isProductList' => (bool)$this->getData('is_product_list')
+        ];
     }
 
     /**
@@ -56,7 +47,7 @@ private function getProductTypes()
     {
         if ($this->productTypes === null) {
             $this->productTypes = [];
-            $block = $this->getLayout()->getBlock('category.products.list');
+            $block = $this->getLayout()->getBlock($this->getProductListBlockName());
             if ($block) {
                 $productCollection = $block->getLoadedProductCollection();
                 $productTypes = [];
@@ -71,7 +62,18 @@ private function getProductTypes()
     }
 
     /**
-     * {@inheritdoc}
+     * Get product list block name in layout
+     *
+     * @return string
+     */
+    private function getProductListBlockName(): string
+    {
+        return $this->getData('product_list_block') ?: 'category.products.list';
+    }
+
+    /**
+     * @inheritDoc
+     *
      * @since 100.1.0
      */
     protected function _toHtml()
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
index a4860ace166d8..8b784cfd31783 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
@@ -21,7 +21,15 @@
                        template="Magento_Wishlist::catalog/product/list/addto/wishlist.phtml"/>
             </referenceBlock>
             <referenceContainer name="category.product.list.additional">
-                <block class="Magento\Wishlist\Block\AddToWishlist" name="category.product.list.additional.wishlist_addto" template="Magento_Wishlist::addto.phtml" />
+                <block
+                    class="Magento\Wishlist\Block\AddToWishlist"
+                    name="category.product.list.additional.wishlist_addto"
+                    template="Magento_Wishlist::addto.phtml"
+                >
+                    <arguments>
+                        <argument name="is_product_list" xsi:type="boolean">true</argument>
+                    </arguments>
+                </block>
             </referenceContainer>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
index c293175ccceac..1f597a9ce1e3a 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
@@ -14,5 +14,17 @@
                        template="Magento_Wishlist::catalog/product/list/addto/wishlist.phtml"/>
             </referenceBlock>
         </referenceContainer>
+        <referenceBlock name="wishlist_page_head_components">
+            <block
+                class="Magento\Wishlist\Block\AddToWishlist"
+                name="catalogsearch.wishlist_addto"
+                template="Magento_Wishlist::addto.phtml"
+            >
+                <arguments>
+                    <argument name="is_product_list" xsi:type="boolean">true</argument>
+                    <argument name="product_list_block" xsi:type="string">search_result_list</argument>
+                </arguments>
+            </block>
+        </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 55cd77b196be5..1cdad4953b3c2 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -17,7 +17,10 @@ define([
             downloadableInfo: '#downloadable-links-list input',
             customOptionsInfo: '.product-custom-option',
             qtyInfo: '#qty',
-            actionElement: '[data-action="add-to-wishlist"]'
+            actionElement: '[data-action="add-to-wishlist"]',
+            productListItem: '.item.product-item',
+            productListPriceBox: '.price-box',
+            isProductList: false
         },
 
         /** @inheritdoc */
@@ -65,6 +68,7 @@ define([
         _updateWishlistData: function (event) {
             var dataToAdd = {},
                 isFileUploaded = false,
+                productId = null,
                 self = this;
 
             if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
@@ -83,7 +87,19 @@ define([
                     $(element).is('textarea') ||
                     $('#' + element.id + ' option:selected').length
                 ) {
-                    if ($(element).data('selector') || $(element).attr('name')) {
+                    if (!($(element).data('selector') || $(element).attr('name'))) {
+                        return;
+                    }
+
+                    if (self.options.isProductList) {
+                        productId = self.retrieveListProductId(this);
+
+                        dataToAdd[productId] = $.extend(
+                            {},
+                            dataToAdd[productId] ? dataToAdd[productId] : {},
+                            self._getElementData(element)
+                        );
+                    } else {
                         dataToAdd = $.extend({}, dataToAdd, self._getElementData(element));
                     }
 
@@ -107,10 +123,17 @@ define([
          * @private
          */
         _updateAddToWishlistButton: function (dataToAdd) {
-            var self = this;
+            var productId = null,
+                self = this;
 
             $('[data-action="add-to-wishlist"]').each(function (index, element) {
-                var params = $(element).data('post');
+                var params = $(element).data('post'),
+                    dataToAddObj = dataToAdd;
+
+                if (self.options.isProductList) {
+                    productId = self.retrieveListProductId(element);
+                    dataToAddObj = typeof dataToAdd[productId] !== 'undefined' ? dataToAdd[productId] : {};
+                }
 
                 if (!params) {
                     params = {
@@ -118,7 +141,7 @@ define([
                     };
                 }
 
-                params.data = $.extend({}, params.data, dataToAdd, {
+                params.data = $.extend({}, params.data, dataToAddObj, {
                     'qty': $(self.options.qtyInfo).val()
                 });
                 $(element).data('post', params);
@@ -241,6 +264,21 @@ define([
 
                 return;
             }
+        },
+
+        /**
+         * Retrieve product id from element on products list
+         *
+         * @param {jQuery.Object} element
+         * @private
+         */
+        retrieveListProductId: function (element) {
+            return parseInt(
+                $(element).closest(this.options.productListItem)
+                    .find(this.options.productListPriceBox)
+                    .data('product-id'),
+                10
+            );
         }
     });
 

From 4fd92e7edc9a62c3e09f7ed0461da4f36aba4d27 Mon Sep 17 00:00:00 2001
From: Per <per@oddny.se>
Date: Sat, 9 May 2020 17:09:57 +0200
Subject: [PATCH 011/671] Issue #27925, moved the submit button to the inside
 of the <form>

Placing the submit button inside the `<form id="purchaseorder-form"...></form>` makes implicit submission possible
---
 .../template/payment/purchaseorder-form.html  | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
index 89d16bd732e7c..3a42a84b620b8 100644
--- a/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
+++ b/app/code/Magento/OfflinePayments/view/frontend/web/template/payment/purchaseorder-form.html
@@ -42,27 +42,29 @@
                     </div>
                 </div>
             </fieldset>
-        </form>
-        <div class="checkout-agreements-block">
-            <!-- ko foreach: $parent.getRegion('before-place-order') -->
-                <!-- ko template: getTemplate() --><!-- /ko -->
-            <!--/ko-->
-        </div>
-        <div class="actions-toolbar" id="review-buttons-container">
-            <div class="primary">
-                <button class="action primary checkout"
-                        type="submit"
-                        data-bind="
-                        click: placeOrder,
-                        attr: {title: $t('Place Order')},
-                        enable: (getCode() == isChecked()),
-                        css: {disabled: !isPlaceOrderActionAllowed()}
-                        "
-                        data-role="review-save">
-                    <span data-bind="i18n: 'Place Order'"></span>
-                </button>
+
+            <div class="checkout-agreements-block">
+                <!-- ko foreach: $parent.getRegion('before-place-order') -->
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                <!--/ko-->
             </div>
-        </div>
+
+            <div class="actions-toolbar" id="review-buttons-container">
+                <div class="primary">
+                    <button class="action primary checkout"
+                            type="submit"
+                            data-bind="
+                            click: placeOrder,
+                            attr: {title: $t('Place Order')},
+                            enable: (getCode() == isChecked()),
+                            css: {disabled: !isPlaceOrderActionAllowed()}
+                            "
+                            data-role="review-save">
+                        <span data-bind="i18n: 'Place Order'"></span>
+                    </button>
+                </div>
+            </div>
+        </form>
     </div>
 </div>
-        
+

From cf5d73b89648c31fa0832fc6a1957f13b338a512 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 18 May 2020 12:40:15 +0300
Subject: [PATCH 012/671] #28172: MFTF tests

---
 .../Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
index 16fd373d3ae4d..bacf8ac4b9fb5 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml
@@ -30,6 +30,7 @@
         <element name="cartItemsArea" type="button" selector="div.block.items-in-cart"/>
         <element name="cartItemsAreaActive" type="textarea" selector="div.block.items-in-cart.active" timeout="30"/>
         <element name="checkMoneyOrderPayment" type="radio" selector="input#checkmo.radio" timeout="30"/>
+        <element name="purchaseOrderPayment" type="radio" selector="input#purchaseorder.radio" timeout="30"/>
         <element name="placeOrder" type="button" selector=".payment-method._active button.action.primary.checkout" timeout="30"/>
         <element name="placeOrderWithoutTimeout" type="button" selector=".payment-method._active button.action.primary.checkout"/>
         <element name="paymentSectionTitle" type="text" selector="//*[@id='checkout-payment-method-load']//div[@data-role='title']" />

From 9173df72586e897d4a624a59cc7465b5fbfb23bd Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 18 May 2020 12:41:18 +0300
Subject: [PATCH 013/671] #28172: MFTF tests

---
 ...thPurchaseOrderNumberPressKeyEnterTest.xml | 68 +++++++++++++++++++
 ...ontCheckoutWithPurchaseOrderNumberTest.xml | 67 ++++++++++++++++++
 2 files changed, 135 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
new file mode 100644
index 0000000000000..0959962d50d81
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+
+    <test name="StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout with Purchase Order Payment. Create Order with Press Key Enter."/>
+            <title value="Create Checkout with purchase order payment method test. Press key Enter on field Purchase Order Number for create Order."/>
+            <description value="Create Checkout with purchase order payment method. Press key Enter on field Purchase Order Number for create Order."/>
+            <severity value="MAJOR"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+
+            <!-- Enable payment method -->
+            <magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+
+            <!-- Disable payment method -->
+            <magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/>
+        </after>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+
+        <!-- Checkout select Purchase Order payment -->
+        <actionGroup ref="CheckoutSelectPurchaseOrderPaymentActionGroup" stepKey="selectPurchaseOrderPayment">
+            <argument name="purchaseOrderNumber" value="12345"/>
+        </actionGroup>
+
+        <!--Press Key ENTER-->
+        <pressKey selector="{{StorefrontCheckoutPaymentMethodSection.purchaseOrderNumber}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::ENTER]" stepKey="pressKeyEnter"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!--See success messages-->
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
+
+    </test>
+
+</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberTest.xml
new file mode 100644
index 0000000000000..0b46bbdb7db65
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberTest.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckoutWithPurchaseOrderNumberTest">
+        <annotations>
+            <features value="Checkout"/>
+            <stories value="Checkout with Purchase Order Payment"/>
+            <title value="Create Checkout with purchase order payment method test"/>
+            <description value="Create Checkout with purchase order payment method"/>
+            <severity value="MAJOR"/>
+            <group value="checkout"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+
+            <!-- Enable payment method -->
+            <magentoCLI command="config:set {{PurchaseOrderEnableConfigData.path}} {{PurchaseOrderEnableConfigData.value}}" stepKey="enablePaymentMethod"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+
+            <!-- Disable payment method -->
+            <magentoCLI command="config:set {{PurchaseOrderDisabledConfigData.path}} {{PurchaseOrderDisabledConfigData.value}}" stepKey="disablePaymentMethod"/>
+        </after>
+
+        <!--Go to product page-->
+        <amOnPage url="$$createSimpleProduct.custom_attributes[url_key]$$.html" stepKey="navigateToSimpleProductPage"/>
+        <waitForPageLoad stepKey="waitForCatalogPageLoad"/>
+
+        <!--Add Product to Shopping Cart-->
+        <actionGroup ref="AddToCartFromStorefrontProductPageActionGroup" stepKey="addToCartFromStorefrontProductPage">
+            <argument name="productName" value="$$createSimpleProduct.name$$"/>
+        </actionGroup>
+
+        <!--Go to Checkout-->
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart"/>
+
+        <actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="guestCheckoutFillingShippingSection">
+            <argument name="customerVar" value="CustomerEntityOne"/>
+            <argument name="customerAddressVar" value="CustomerAddressSimple"/>
+        </actionGroup>
+
+        <!-- Checkout select Purchase Order payment -->
+        <actionGroup ref="CheckoutSelectPurchaseOrderPaymentActionGroup" stepKey="selectPurchaseOrderPayment">
+            <argument name="purchaseOrderNumber" value="12345"/>
+        </actionGroup>
+
+        <!--Click Place Order button-->
+        <click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrder"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+
+        <!--See success messages-->
+        <see selector="{{CheckoutSuccessMainSection.successTitle}}" userInput="Thank you for your purchase!" stepKey="seeSuccessTitle"/>
+        <see selector="{{CheckoutSuccessMainSection.orderNumberText}}" userInput="Your order # is: " stepKey="seeOrderNumber"/>
+
+    </test>
+
+</tests>

From 2dee5655c8acce78a3fd146e34b2581215786324 Mon Sep 17 00:00:00 2001
From: Alexander Steshuk <grp-engcom-vendorworker-Kilo@adobe.com>
Date: Mon, 18 May 2020 13:55:17 +0300
Subject: [PATCH 014/671] #28172: MFTF tests

---
 ...tSelectPurchaseOrderPaymentActionGroup.xml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectPurchaseOrderPaymentActionGroup.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectPurchaseOrderPaymentActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectPurchaseOrderPaymentActionGroup.xml
new file mode 100644
index 0000000000000..dbc9739a9247f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutSelectPurchaseOrderPaymentActionGroup.xml
@@ -0,0 +1,26 @@
+<?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="CheckoutSelectPurchaseOrderPaymentActionGroup">
+        <annotations>
+            <description>Selects the 'Purchase Order' Payment Method on the Storefront Checkout page.</description>
+        </annotations>
+
+        <arguments>
+            <argument name="purchaseOrderNumber" type="string"/>
+        </arguments>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <remove keyForRemoval="checkCheckMoneyOption"/>
+        <conditionalClick selector="{{CheckoutPaymentSection.purchaseOrderPayment}}" dependentSelector="{{CheckoutPaymentSection.purchaseOrderPayment}}" visible="true" stepKey="checkPurchaseOrderOption"/>
+        <fillField selector="{{StorefrontCheckoutPaymentMethodSection.purchaseOrderNumber}}" userInput="{{purchaseOrderNumber}}" stepKey="fillPurchaseOrderNumber"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskAfterPaymentMethodSelection"/>
+    </actionGroup>
+</actionGroups>

From 3a6f94a19c4dad23fd091da1ec8e1cf91c648080 Mon Sep 17 00:00:00 2001
From: Can YILDIRIM <mcanyildirim@gmail.com>
Date: Sun, 24 May 2020 20:21:57 +0100
Subject: [PATCH 015/671] Graphql events.xml is added for quote submit succes
 to trigger sales email

---
 app/code/Magento/QuoteGraphQl/etc/graphql/events.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 app/code/Magento/QuoteGraphQl/etc/graphql/events.xml

diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/events.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/events.xml
new file mode 100644
index 0000000000000..1e9822bbf3ef8
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/etc/graphql/events.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="sales_model_service_quote_submit_success">
+        <observer name="sendEmail" instance="Magento\Quote\Observer\SubmitObserver" />
+    </event>
+</config>

From cd4846bb1ce8eaa6dcf5568346c34686f429e4bd Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Tue, 2 Jun 2020 11:40:35 +0300
Subject: [PATCH 016/671] MC-34569: Improve ACL for customer

---
 app/code/Magento/Customer/etc/webapi.xml      |   2 +-
 .../Customer/Api/CustomerRepositoryTest.php   | 179 ++++++++++++------
 2 files changed, 122 insertions(+), 59 deletions(-)

diff --git a/app/code/Magento/Customer/etc/webapi.xml b/app/code/Magento/Customer/etc/webapi.xml
index 38717619406aa..68c8da8744a05 100644
--- a/app/code/Magento/Customer/etc/webapi.xml
+++ b/app/code/Magento/Customer/etc/webapi.xml
@@ -227,7 +227,7 @@
     <route url="/V1/customers/:customerId" method="DELETE">
         <service class="Magento\Customer\Api\CustomerRepositoryInterface" method="deleteById"/>
         <resources>
-            <resource ref="Magento_Customer::manage"/>
+            <resource ref="Magento_Customer::delete"/>
         </resources>
     </route>
     <route url="/V1/customers/isEmailAvailable" method="POST">
diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
index a00af2d6eb076..2e23dcdddd05e 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -8,13 +8,23 @@
 
 use Magento\Customer\Api\Data\CustomerInterface as Customer;
 use Magento\Customer\Api\Data\AddressInterface as Address;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\Search\FilterGroupBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Api\SortOrder;
+use Magento\Framework\Api\SortOrderBuilder;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Integration\Api\IntegrationServiceInterface;
+use Magento\Integration\Api\OauthServiceInterface;
+use Magento\Integration\Model\Integration;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\Customer as CustomerHelper;
 use Magento\TestFramework\TestCase\WebapiAbstract;
@@ -94,34 +104,20 @@ class CustomerRepositoryTest extends WebapiAbstract
      */
     protected function setUp(): void
     {
-        $this->customerRegistry = Bootstrap::getObjectManager()->get(
-            \Magento\Customer\Model\CustomerRegistry::class
-        );
+        $this->customerRegistry = Bootstrap::getObjectManager()->get(CustomerRegistry::class);
 
         $this->customerRepository = Bootstrap::getObjectManager()->get(
-            \Magento\Customer\Api\CustomerRepositoryInterface::class,
+            CustomerRepositoryInterface::class,
             ['customerRegistry' => $this->customerRegistry]
         );
-        $this->dataObjectHelper = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Api\DataObjectHelper::class
-        );
-        $this->customerDataFactory = Bootstrap::getObjectManager()->create(
-            \Magento\Customer\Api\Data\CustomerInterfaceFactory::class
-        );
-        $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Api\SearchCriteriaBuilder::class
-        );
-        $this->sortOrderBuilder = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Api\SortOrderBuilder::class
-        );
-        $this->filterGroupBuilder = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Api\Search\FilterGroupBuilder::class
-        );
+        $this->dataObjectHelper = Bootstrap::getObjectManager()->create(DataObjectHelper::class);
+        $this->customerDataFactory = Bootstrap::getObjectManager()->create(CustomerInterfaceFactory::class);
+        $this->searchCriteriaBuilder = Bootstrap::getObjectManager()->create(SearchCriteriaBuilder::class);
+        $this->sortOrderBuilder = Bootstrap::getObjectManager()->create(SortOrderBuilder::class);
+        $this->filterGroupBuilder = Bootstrap::getObjectManager()->create(FilterGroupBuilder::class);
         $this->customerHelper = new CustomerHelper();
 
-        $this->dataObjectProcessor = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Reflection\DataObjectProcessor::class
-        );
+        $this->dataObjectProcessor = Bootstrap::getObjectManager()->create(DataObjectProcessor::class);
     }
 
     protected function tearDown(): void
@@ -131,7 +127,7 @@ protected function tearDown(): void
                 $serviceInfo = [
                     'rest' => [
                         'resourcePath' => self::RESOURCE_PATH . '/' . $customerId,
-                        'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE,
+                        'httpMethod' => Request::HTTP_METHOD_DELETE,
                     ],
                     'soap' => [
                         'service' => self::SERVICE_NAME,
@@ -161,10 +157,7 @@ public function testInvalidCustomerUpdate()
 
         // get customer ID token
         /** @var \Magento\Integration\Api\CustomerTokenServiceInterface $customerTokenService */
-        //$customerTokenService = $this->objectManager->create(CustomerTokenServiceInterface::class);
-        $customerTokenService = Bootstrap::getObjectManager()->create(
-            \Magento\Integration\Api\CustomerTokenServiceInterface::class
-        );
+        $customerTokenService = Bootstrap::getObjectManager()->create(CustomerTokenServiceInterface::class);
         $token = $customerTokenService->createCustomerAccessToken($firstCustomerData[Customer::EMAIL], 'test@123');
 
         //Create second customer and update lastname.
@@ -176,13 +169,13 @@ public function testInvalidCustomerUpdate()
         $this->dataObjectHelper->populateWithArray(
             $newCustomerDataObject,
             $customerData,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
 
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . "/{$customerData[Customer::ID]}",
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
                 'token' => $token,
             ],
             'soap' => [
@@ -195,12 +188,37 @@ public function testInvalidCustomerUpdate()
 
         $newCustomerDataObject = $this->dataObjectProcessor->buildOutputDataArray(
             $newCustomerDataObject,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
         $requestData = ['customer' => $newCustomerDataObject];
         $this->_webApiCall($serviceInfo, $requestData);
     }
 
+    /**
+     * Create Integration and return token.
+     *
+     * @param string $name
+     * @param array $resource
+     * @return string
+     */
+    private function createIntegrationToken(string $name, array $resource): string
+    {
+        /** @var IntegrationServiceInterface $integrationService */
+        $integrationService = Bootstrap::getObjectManager()->get(IntegrationServiceInterface::class);
+        $oauthService = Bootstrap::getObjectManager()->get(OauthServiceInterface::class);
+        /** @var Integration $integration */
+        $integration = $integrationService->create(
+            [
+                'name' => $name,
+                'resource' => $resource,
+            ]
+        );
+        /** @var OauthServiceInterface $oauthService */
+        $oauthService->createAccessToken($integration->getConsumerId());
+
+        return $integrationService->get($integration->getId())->getToken();
+    }
+
     public function testDeleteCustomer()
     {
         $customerData = $this->_createCustomer();
@@ -209,7 +227,7 @@ public function testDeleteCustomer()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/' . $customerData[Customer::ID],
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE,
+                'httpMethod' => Request::HTTP_METHOD_DELETE,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -226,18 +244,63 @@ public function testDeleteCustomer()
         $this->assertTrue($response);
 
         //Verify if the customer is deleted
-        $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
+        $this->expectException(NoSuchEntityException::class);
         $this->expectExceptionMessage(sprintf("No such entity with customerId = %s", $customerData[Customer::ID]));
         $this->_getCustomerData($customerData[Customer::ID]);
     }
 
+    /**
+     * Check that non authorized consumer can`t delete customer.
+     *
+     * @return void
+     */
+    public function testDeleteCustomerNonAuthorized(): void
+    {
+        $resource = [
+            'Magento_Customer::customer',
+            'Magento_Customer::manage',
+        ];
+        $token = $this->createIntegrationToken('TestAPI' . bin2hex(random_bytes(5)), $resource);
+
+        $customerData = $this->_createCustomer();
+        $this->currentCustomerId = [];
+
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $customerData[Customer::ID],
+                'httpMethod' => Request::HTTP_METHOD_DELETE,
+                'token' => $token,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::SERVICE_NAME . 'DeleteById',
+                'token' => $token,
+            ],
+        ];
+        try {
+            $this->_webApiCall($serviceInfo, ['customerId' => $customerData['id']]);
+            $this->fail("Expected exception is not thrown.");
+        } catch (\SoapFault $e) {
+        } catch (\Exception $e) {
+            $expectedMessage = 'The consumer isn\'t authorized to access %resources.';
+            $errorObj = $this->processRestExceptionResult($e);
+            $this->assertEquals($expectedMessage, $errorObj['message']);
+            $this->assertEquals(['resources' => 'Magento_Customer::delete'], $errorObj['parameters']);
+            $this->assertEquals(HTTPExceptionCodes::HTTP_UNAUTHORIZED, $e->getCode());
+        }
+        /** @var Customer $data */
+        $data = $this->_getCustomerData($customerData[Customer::ID]);
+        $this->assertNotNull($data->getId());
+    }
+
     public function testDeleteCustomerInvalidCustomerId()
     {
         $invalidId = -1;
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/' . $invalidId,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_DELETE,
+                'httpMethod' => Request::HTTP_METHOD_DELETE,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -276,13 +339,13 @@ public function testUpdateCustomer()
         $this->dataObjectHelper->populateWithArray(
             $newCustomerDataObject,
             $customerData,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
 
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . "/{$customerData[Customer::ID]}",
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -292,7 +355,7 @@ public function testUpdateCustomer()
         ];
         $newCustomerDataObject = $this->dataObjectProcessor->buildOutputDataArray(
             $newCustomerDataObject,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
         $requestData = ['customer' => $newCustomerDataObject];
         $response = $this->_webApiCall($serviceInfo, $requestData);
@@ -316,13 +379,13 @@ public function testUpdateCustomerNoWebsiteId()
         $this->dataObjectHelper->populateWithArray(
             $newCustomerDataObject,
             $customerData,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
 
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . "/{$customerData[Customer::ID]}",
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -332,7 +395,7 @@ public function testUpdateCustomerNoWebsiteId()
         ];
         $newCustomerDataObject = $this->dataObjectProcessor->buildOutputDataArray(
             $newCustomerDataObject,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
         unset($newCustomerDataObject['website_id']);
         $requestData = ['customer' => $newCustomerDataObject];
@@ -367,13 +430,13 @@ public function testUpdateCustomerException()
         $this->dataObjectHelper->populateWithArray(
             $newCustomerDataObject,
             $customerData,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
 
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . "/-1",
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                'httpMethod' => Request::HTTP_METHOD_PUT,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -383,7 +446,7 @@ public function testUpdateCustomerException()
         ];
         $newCustomerDataObject = $this->dataObjectProcessor->buildOutputDataArray(
             $newCustomerDataObject,
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
         $requestData = ['customer' => $newCustomerDataObject];
 
@@ -413,7 +476,7 @@ public function testCreateCustomerWithoutAddressRequiresException()
     {
         $customerDataArray = $this->dataObjectProcessor->buildOutputDataArray(
             $this->customerHelper->createSampleCustomerDataObject(),
-            \Magento\Customer\Api\Data\CustomerInterface::class
+            Customer::class
         );
 
         foreach ($customerDataArray[Customer::KEY_ADDRESSES] as & $address) {
@@ -423,7 +486,7 @@ public function testCreateCustomerWithoutAddressRequiresException()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
+                'httpMethod' => Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -557,7 +620,7 @@ public function subscriptionDataProvider(): array
     public function testSearchCustomersUsingGET()
     {
         $this->_markTestAsRestOnly('SOAP test is covered in testSearchCustomers');
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         $customerData = $this->_createCustomer();
         $filter = $builder
             ->setField(Customer::EMAIL)
@@ -571,7 +634,7 @@ public function testSearchCustomersUsingGET()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search?' . $searchQueryString,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
         ];
         $searchResults = $this->_webApiCall($serviceInfo);
@@ -588,7 +651,7 @@ public function testSearchCustomersUsingGETEmptyFilter()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search',
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
         ];
         try {
@@ -611,7 +674,7 @@ public function testSearchCustomersUsingGETEmptyFilter()
      */
     public function testSearchCustomersMultipleFiltersWithSort()
     {
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         $customerData1 = $this->_createCustomer();
         $customerData2 = $this->_createCustomer();
         $filter1 = $builder->setField(Customer::EMAIL)
@@ -628,7 +691,7 @@ public function testSearchCustomersMultipleFiltersWithSort()
 
         /**@var \Magento\Framework\Api\SortOrderBuilder $sortOrderBuilder */
         $sortOrderBuilder = Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Api\SortOrderBuilder::class
+            SortOrderBuilder::class
         );
         /** @var SortOrder $sortOrder */
         $sortOrder = $sortOrderBuilder->setField(Customer::EMAIL)->setDirection(SortOrder::SORT_ASC)->create();
@@ -640,7 +703,7 @@ public function testSearchCustomersMultipleFiltersWithSort()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -660,7 +723,7 @@ public function testSearchCustomersMultipleFiltersWithSort()
     public function testSearchCustomersMultipleFiltersWithSortUsingGET()
     {
         $this->_markTestAsRestOnly('SOAP test is covered in testSearchCustomers');
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         $customerData1 = $this->_createCustomer();
         $customerData2 = $this->_createCustomer();
         $filter1 = $builder->setField(Customer::EMAIL)
@@ -682,7 +745,7 @@ public function testSearchCustomersMultipleFiltersWithSortUsingGET()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search?' . $searchQueryString,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
         ];
         $searchResults = $this->_webApiCall($serviceInfo);
@@ -696,7 +759,7 @@ public function testSearchCustomersMultipleFiltersWithSortUsingGET()
      */
     public function testSearchCustomersNonExistentMultipleFilters()
     {
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         $customerData1 = $this->_createCustomer();
         $customerData2 = $this->_createCustomer();
         $filter1 = $filter1 = $builder->setField(Customer::EMAIL)
@@ -716,7 +779,7 @@ public function testSearchCustomersNonExistentMultipleFilters()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,
@@ -734,7 +797,7 @@ public function testSearchCustomersNonExistentMultipleFilters()
     public function testSearchCustomersNonExistentMultipleFiltersGET()
     {
         $this->_markTestAsRestOnly('SOAP test is covered in testSearchCustomers');
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         $customerData1 = $this->_createCustomer();
         $customerData2 = $this->_createCustomer();
         $filter1 = $filter1 = $builder->setField(Customer::EMAIL)
@@ -755,7 +818,7 @@ public function testSearchCustomersNonExistentMultipleFiltersGET()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search?' . $searchQueryString,
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
         ];
         $searchResults = $this->_webApiCall($serviceInfo, $requestData);
@@ -770,7 +833,7 @@ public function testSearchCustomersMultipleFilterGroups()
         $customerData1 = $this->_createCustomer();
 
         /** @var \Magento\Framework\Api\FilterBuilder $builder */
-        $builder = Bootstrap::getObjectManager()->create(\Magento\Framework\Api\FilterBuilder::class);
+        $builder = Bootstrap::getObjectManager()->create(FilterBuilder::class);
         $filter1 = $builder->setField(Customer::EMAIL)
             ->setValue($customerData1[Customer::EMAIL])
             ->create();
@@ -793,7 +856,7 @@ public function testSearchCustomersMultipleFilterGroups()
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . '/search' . '?' . http_build_query($requestData),
-                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_GET,
+                'httpMethod' => Request::HTTP_METHOD_GET,
             ],
             'soap' => [
                 'service' => self::SERVICE_NAME,

From 8db94303d32b4cfd9a6851946a19a6cbff30ad94 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Thu, 4 Jun 2020 16:15:57 +0300
Subject: [PATCH 017/671] MC-34729: Integration ACL changes

---
 app/code/Magento/Cms/etc/webapi.xml                         | 6 +++---
 .../testsuite/Magento/Cms/Api/PageRepositoryTest.php        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Cms/etc/webapi.xml b/app/code/Magento/Cms/etc/webapi.xml
index 5b66d0e3ed879..464f5146e6358 100644
--- a/app/code/Magento/Cms/etc/webapi.xml
+++ b/app/code/Magento/Cms/etc/webapi.xml
@@ -23,19 +23,19 @@
     <route url="/V1/cmsPage" method="POST">
         <service class="Magento\Cms\Api\PageRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Cms::page"/>
+            <resource ref="Magento_Cms::save"/>
         </resources>
     </route>
     <route url="/V1/cmsPage/:id" method="PUT">
         <service class="Magento\Cms\Api\PageRepositoryInterface" method="save"/>
         <resources>
-            <resource ref="Magento_Cms::page"/>
+            <resource ref="Magento_Cms::save"/>
         </resources>
     </route>
     <route url="/V1/cmsPage/:pageId" method="DELETE">
         <service class="Magento\Cms\Api\PageRepositoryInterface" method="deleteById"/>
         <resources>
-            <resource ref="Magento_Cms::page"/>
+            <resource ref="Magento_Cms::page_delete"/>
         </resources>
     </route>
     <!-- Cms Block -->
diff --git a/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
index 757530c4da693..98bda8d60dac1 100644
--- a/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Cms/Api/PageRepositoryTest.php
@@ -499,7 +499,7 @@ public function testSaveDesign(): void
         /** @var Rules $rules */
         $rules = $this->rulesFactory->create();
         $rules->setRoleId($role->getId());
-        $rules->setResources(['Magento_Cms::page']);
+        $rules->setResources(['Magento_Cms::save']);
         $rules->saveRel();
         //Using the admin user with custom role.
         $token = $this->adminTokens->createAdminAccessToken(
@@ -549,7 +549,7 @@ public function testSaveDesign(): void
         /** @var Rules $rules */
         $rules = Bootstrap::getObjectManager()->create(Rules::class);
         $rules->setRoleId($role->getId());
-        $rules->setResources(['Magento_Cms::page', 'Magento_Cms::save_design']);
+        $rules->setResources(['Magento_Cms::save', 'Magento_Cms::save_design']);
         $rules->saveRel();
         //Making the same request with design settings.
         $result = $this->_webApiCall($serviceInfo, $requestData);
@@ -564,7 +564,7 @@ public function testSaveDesign(): void
         /** @var Rules $rules */
         $rules = Bootstrap::getObjectManager()->create(Rules::class);
         $rules->setRoleId($role->getId());
-        $rules->setResources(['Magento_Cms::page']);
+        $rules->setResources(['Magento_Cms::save']);
         $rules->saveRel();
         //Updating the page but with the same design properties values.
         $result = $this->_webApiCall($serviceInfo, $requestData);

From 1ac6d641e6b6df3108bd369f0f65dcbd23ae37ee Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Fri, 5 Jun 2020 16:19:56 -0500
Subject: [PATCH 018/671] MC-34467: Updated jQuery File Upload plugin

- Updated jquery File Upload plugin
---
 .../Theme/view/base/requirejs-config.js       |    2 +-
 .../User/view/adminhtml/web/app-config.js     |    2 +-
 lib/web/jquery/fileUploader/canvas-to-blob.js |    1 -
 .../cors/jquery.postmessage-transport.js      |  211 +-
 .../fileUploader/cors/jquery.xdr-transport.js |  152 +-
 .../css/jquery.fileupload-noscript.css        |   22 +
 .../css/jquery.fileupload-ui-noscript.css     |   17 +
 .../fileUploader/css/jquery.fileupload-ui.css |   95 +-
 .../fileUploader/css/jquery.fileupload.css    |   36 +
 lib/web/jquery/fileUploader/img/loading.gif   |  Bin 3796 -> 3897 bytes
 .../jquery/fileUploader/img/progressbar.gif   |  Bin 3364 -> 3323 bytes
 .../fileUploader/jquery.fileupload-audio.js   |  101 +
 .../fileUploader/jquery.fileupload-fp.js      |  219 --
 .../fileUploader/jquery.fileupload-image.js   |  355 +++
 .../fileUploader/jquery.fileupload-process.js |  170 ++
 .../fileUploader/jquery.fileupload-ui.js      | 1460 +++++-----
 .../jquery.fileupload-validate.js             |  119 +
 .../fileUploader/jquery.fileupload-video.js   |  101 +
 .../jquery/fileUploader/jquery.fileupload.js  | 2557 ++++++++++-------
 .../fileUploader/jquery.iframe-transport.js   |  365 ++-
 lib/web/jquery/fileUploader/load-image.js     |    1 -
 lib/web/jquery/fileUploader/locale.js         |   29 -
 lib/web/jquery/fileUploader/main.js           |   78 -
 .../fileUploader/vendor/jquery.ui.widget.js   | 1082 +++++--
 24 files changed, 4452 insertions(+), 2723 deletions(-)
 delete mode 100644 lib/web/jquery/fileUploader/canvas-to-blob.js
 create mode 100644 lib/web/jquery/fileUploader/css/jquery.fileupload-noscript.css
 create mode 100644 lib/web/jquery/fileUploader/css/jquery.fileupload-ui-noscript.css
 create mode 100644 lib/web/jquery/fileUploader/css/jquery.fileupload.css
 create mode 100644 lib/web/jquery/fileUploader/jquery.fileupload-audio.js
 delete mode 100644 lib/web/jquery/fileUploader/jquery.fileupload-fp.js
 create mode 100644 lib/web/jquery/fileUploader/jquery.fileupload-image.js
 create mode 100644 lib/web/jquery/fileUploader/jquery.fileupload-process.js
 create mode 100644 lib/web/jquery/fileUploader/jquery.fileupload-validate.js
 create mode 100644 lib/web/jquery/fileUploader/jquery.fileupload-video.js
 delete mode 100644 lib/web/jquery/fileUploader/load-image.js
 delete mode 100644 lib/web/jquery/fileUploader/locale.js
 delete mode 100644 lib/web/jquery/fileUploader/main.js

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index f5580461f7d9e..77af920c8df86 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -31,7 +31,7 @@ var config = {
     'paths': {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index 6387bec03ea90..491378d933ca2 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -26,7 +26,7 @@ require.config({
         'jquery/ui': 'jquery/jquery-ui-1.9.2',
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',
diff --git a/lib/web/jquery/fileUploader/canvas-to-blob.js b/lib/web/jquery/fileUploader/canvas-to-blob.js
deleted file mode 100644
index 4e855b9f3a592..0000000000000
--- a/lib/web/jquery/fileUploader/canvas-to-blob.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){"use strict";var b=a.HTMLCanvasElement&&a.HTMLCanvasElement.prototype,c=a.Blob&&function(){try{return Boolean(new Blob)}catch(a){return!1}}(),d=c&&a.Uint8Array&&function(){try{return(new Blob([new Uint8Array(100)])).size===100}catch(a){return!1}}(),e=a.BlobBuilder||a.WebKitBlobBuilder||a.MozBlobBuilder||a.MSBlobBuilder,f=(c||e)&&a.atob&&a.ArrayBuffer&&a.Uint8Array&&function(a){var b,f,g,h,i,j;a.split(",")[0].indexOf("base64")>=0?b=atob(a.split(",")[1]):b=decodeURIComponent(a.split(",")[1]),f=new ArrayBuffer(b.length),g=new Uint8Array(f);for(h=0;h<b.length;h+=1)g[h]=b.charCodeAt(h);return i=a.split(",")[0].split(":")[1].split(";")[0],c?new Blob([d?g:f],{type:i}):(j=new e,j.append(f),j.getBlob(i))};a.HTMLCanvasElement&&!b.toBlob&&(b.mozGetAsFile?b.toBlob=function(a,b){a(this.mozGetAsFile("blob",b))}:b.toDataURL&&f&&(b.toBlob=function(a,b){a(f(this.toDataURL(b)))})),typeof define=="function"&&define.amd?define(function(){return f}):a.dataURLtoBlob=f})(this);
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/cors/jquery.postmessage-transport.js b/lib/web/jquery/fileUploader/cors/jquery.postmessage-transport.js
index 931b6352ba27d..5d5cc2f8d27c2 100644
--- a/lib/web/jquery/fileUploader/cors/jquery.postmessage-transport.js
+++ b/lib/web/jquery/fileUploader/cors/jquery.postmessage-transport.js
@@ -1,117 +1,126 @@
 /*
- * jQuery postMessage Transport Plugin 1.1
+ * jQuery postMessage Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/*jslint unparam: true, nomen: true */
-/*global define, window, document */
+/* global define, require */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
 
-    var counter = 0,
-        names = [
-            'accepts',
-            'cache',
-            'contents',
-            'contentType',
-            'crossDomain',
-            'data',
-            'dataType',
-            'headers',
-            'ifModified',
-            'mimeType',
-            'password',
-            'processData',
-            'timeout',
-            'traditional',
-            'type',
-            'url',
-            'username'
-        ],
-        convert = function (p) {
-            return p;
-        };
+  var counter = 0,
+    names = [
+      'accepts',
+      'cache',
+      'contents',
+      'contentType',
+      'crossDomain',
+      'data',
+      'dataType',
+      'headers',
+      'ifModified',
+      'mimeType',
+      'password',
+      'processData',
+      'timeout',
+      'traditional',
+      'type',
+      'url',
+      'username'
+    ],
+    convert = function (p) {
+      return p;
+    };
 
-    $.ajaxSetup({
-        converters: {
-            'postmessage text': convert,
-            'postmessage json': convert,
-            'postmessage html': convert
-        }
-    });
+  $.ajaxSetup({
+    converters: {
+      'postmessage text': convert,
+      'postmessage json': convert,
+      'postmessage html': convert
+    }
+  });
 
-    $.ajaxTransport('postmessage', function (options) {
-        if (options.postMessage && window.postMessage) {
-            var iframe,
-                loc = $('<a>').prop('href', options.postMessage)[0],
-                target = loc.protocol + '//' + loc.host,
-                xhrUpload = options.xhr().upload;
-            return {
-                send: function (_, completeCallback) {
-                    var message = {
-                            id: 'postmessage-transport-' + (counter += 1)
-                        },
-                        eventName = 'message.' + message.id;
-                    iframe = $(
-                        '<iframe style="display:none;" src="' +
-                            options.postMessage + '" name="' +
-                            message.id + '"></iframe>'
-                    ).bind('load', function () {
-                        $.each(names, function (i, name) {
-                            message[name] = options[name];
-                        });
-                        message.dataType = message.dataType.replace('postmessage ', '');
-                        $(window).bind(eventName, function (e) {
-                            e = e.originalEvent;
-                            var data = e.data,
-                                ev;
-                            if (e.origin === target && data.id === message.id) {
-                                if (data.type === 'progress') {
-                                    ev = document.createEvent('Event');
-                                    ev.initEvent(data.type, false, true);
-                                    $.extend(ev, data);
-                                    xhrUpload.dispatchEvent(ev);
-                                } else {
-                                    completeCallback(
-                                        data.status,
-                                        data.statusText,
-                                        {postmessage: data.result},
-                                        data.headers
-                                    );
-                                    iframe.remove();
-                                    $(window).unbind(eventName);
-                                }
-                            }
-                        });
-                        iframe[0].contentWindow.postMessage(
-                            message,
-                            target
-                        );
-                    }).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        iframe.remove();
-                    }
+  $.ajaxTransport('postmessage', function (options) {
+    if (options.postMessage && window.postMessage) {
+      var iframe,
+        loc = $('<a></a>').prop('href', options.postMessage)[0],
+        target = loc.protocol + '//' + loc.host,
+        xhrUpload = options.xhr().upload;
+      // IE always includes the port for the host property of a link
+      // element, but not in the location.host or origin property for the
+      // default http port 80 and https port 443, so we strip it:
+      if (/^(http:\/\/.+:80)|(https:\/\/.+:443)$/.test(target)) {
+        target = target.replace(/:(80|443)$/, '');
+      }
+      return {
+        send: function (_, completeCallback) {
+          counter += 1;
+          var message = {
+              id: 'postmessage-transport-' + counter
+            },
+            eventName = 'message.' + message.id;
+          iframe = $(
+            '<iframe style="display:none;" src="' +
+              options.postMessage +
+              '" name="' +
+              message.id +
+              '"></iframe>'
+          )
+            .on('load', function () {
+              $.each(names, function (i, name) {
+                message[name] = options[name];
+              });
+              message.dataType = message.dataType.replace('postmessage ', '');
+              $(window).on(eventName, function (event) {
+                var e = event.originalEvent;
+                var data = e.data;
+                var ev;
+                if (e.origin === target && data.id === message.id) {
+                  if (data.type === 'progress') {
+                    ev = document.createEvent('Event');
+                    ev.initEvent(data.type, false, true);
+                    $.extend(ev, data);
+                    xhrUpload.dispatchEvent(ev);
+                  } else {
+                    completeCallback(
+                      data.status,
+                      data.statusText,
+                      { postmessage: data.result },
+                      data.headers
+                    );
+                    iframe.remove();
+                    $(window).off(eventName);
+                  }
                 }
-            };
+              });
+              iframe[0].contentWindow.postMessage(message, target);
+            })
+            .appendTo(document.body);
+        },
+        abort: function () {
+          if (iframe) {
+            iframe.remove();
+          }
         }
-    });
-
-}));
+      };
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/cors/jquery.xdr-transport.js b/lib/web/jquery/fileUploader/cors/jquery.xdr-transport.js
index c42c54828d8ff..9e81860b943fc 100644
--- a/lib/web/jquery/fileUploader/cors/jquery.xdr-transport.js
+++ b/lib/web/jquery/fileUploader/cors/jquery.xdr-transport.js
@@ -1,85 +1,97 @@
 /*
- * jQuery XDomainRequest Transport Plugin 1.1.2
+ * jQuery XDomainRequest Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  *
  * Based on Julian Aubourg's ajaxHooks xdr.js:
  * https://github.com/jaubourg/ajaxHooks/
  */
 
-/*jslint unparam: true */
-/*global define, window, XDomainRequest */
+/* global define, require, XDomainRequest */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-    if (window.XDomainRequest && !$.support.cors) {
-        $.ajaxTransport(function (s) {
-            if (s.crossDomain && s.async) {
-                if (s.timeout) {
-                    s.xdrTimeout = s.timeout;
-                    delete s.timeout;
-                }
-                var xdr;
-                return {
-                    send: function (headers, completeCallback) {
-                        function callback(status, statusText, responses, responseHeaders) {
-                            xdr.onload = xdr.onerror = xdr.ontimeout = $.noop;
-                            xdr = null;
-                            completeCallback(status, statusText, responses, responseHeaders);
-                        }
-                        xdr = new XDomainRequest();
-                        // XDomainRequest only supports GET and POST:
-                        if (s.type === 'DELETE') {
-                            s.url = s.url + (/\?/.test(s.url) ? '&' : '?') +
-                                '_method=DELETE';
-                            s.type = 'POST';
-                        } else if (s.type === 'PUT') {
-                            s.url = s.url + (/\?/.test(s.url) ? '&' : '?') +
-                                '_method=PUT';
-                            s.type = 'POST';
-                        }
-                        xdr.open(s.type, s.url);
-                        xdr.onload = function () {
-                            callback(
-                                200,
-                                'OK',
-                                {text: xdr.responseText},
-                                'Content-Type: ' + xdr.contentType
-                            );
-                        };
-                        xdr.onerror = function () {
-                            callback(404, 'Not Found');
-                        };
-                        if (s.xdrTimeout) {
-                            xdr.ontimeout = function () {
-                                callback(0, 'timeout');
-                            };
-                            xdr.timeout = s.xdrTimeout;
-                        }
-                        xdr.send((s.hasContent && s.data) || null);
-                    },
-                    abort: function () {
-                        if (xdr) {
-                            xdr.onerror = $.noop();
-                            xdr.abort();
-                        }
-                    }
-                };
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
+  if (window.XDomainRequest && !$.support.cors) {
+    $.ajaxTransport(function (s) {
+      if (s.crossDomain && s.async) {
+        if (s.timeout) {
+          s.xdrTimeout = s.timeout;
+          delete s.timeout;
+        }
+        var xdr;
+        return {
+          send: function (headers, completeCallback) {
+            var addParamChar = /\?/.test(s.url) ? '&' : '?';
+            /**
+             * Callback wrapper function
+             *
+             * @param {number} status HTTP status code
+             * @param {string} statusText HTTP status text
+             * @param {object} [responses] Content-type specific responses
+             * @param {string} [responseHeaders] Response headers string
+             */
+            function callback(status, statusText, responses, responseHeaders) {
+              xdr.onload = xdr.onerror = xdr.ontimeout = $.noop;
+              xdr = null;
+              completeCallback(status, statusText, responses, responseHeaders);
             }
-        });
-    }
-}));
+            xdr = new XDomainRequest();
+            // XDomainRequest only supports GET and POST:
+            if (s.type === 'DELETE') {
+              s.url = s.url + addParamChar + '_method=DELETE';
+              s.type = 'POST';
+            } else if (s.type === 'PUT') {
+              s.url = s.url + addParamChar + '_method=PUT';
+              s.type = 'POST';
+            } else if (s.type === 'PATCH') {
+              s.url = s.url + addParamChar + '_method=PATCH';
+              s.type = 'POST';
+            }
+            xdr.open(s.type, s.url);
+            xdr.onload = function () {
+              callback(
+                200,
+                'OK',
+                { text: xdr.responseText },
+                'Content-Type: ' + xdr.contentType
+              );
+            };
+            xdr.onerror = function () {
+              callback(404, 'Not Found');
+            };
+            if (s.xdrTimeout) {
+              xdr.ontimeout = function () {
+                callback(0, 'timeout');
+              };
+              xdr.timeout = s.xdrTimeout;
+            }
+            xdr.send((s.hasContent && s.data) || null);
+          },
+          abort: function () {
+            if (xdr) {
+              xdr.onerror = $.noop();
+              xdr.abort();
+            }
+          }
+        };
+      }
+    });
+  }
+});
diff --git a/lib/web/jquery/fileUploader/css/jquery.fileupload-noscript.css b/lib/web/jquery/fileUploader/css/jquery.fileupload-noscript.css
new file mode 100644
index 0000000000000..2409bfb0a6942
--- /dev/null
+++ b/lib/web/jquery/fileUploader/css/jquery.fileupload-noscript.css
@@ -0,0 +1,22 @@
+@charset "UTF-8";
+/*
+ * jQuery File Upload Plugin NoScript CSS
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+.fileinput-button input {
+  position: static;
+  opacity: 1;
+  filter: none;
+  font-size: inherit !important;
+  direction: inherit;
+}
+.fileinput-button span {
+  display: none;
+}
diff --git a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui-noscript.css b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui-noscript.css
new file mode 100644
index 0000000000000..30651acf026c0
--- /dev/null
+++ b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui-noscript.css
@@ -0,0 +1,17 @@
+@charset "UTF-8";
+/*
+ * jQuery File Upload UI Plugin NoScript CSS
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2012, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+.fileinput-button i,
+.fileupload-buttonbar .delete,
+.fileupload-buttonbar .toggle {
+  display: none;
+}
diff --git a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
index 44b628efb481c..a6cfc7529198b 100644
--- a/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
+++ b/lib/web/jquery/fileUploader/css/jquery.fileupload-ui.css
@@ -1,73 +1,68 @@
-@charset 'UTF-8';
+@charset "UTF-8";
 /*
- * jQuery File Upload UI Plugin CSS 6.3
+ * jQuery File Upload UI Plugin CSS
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-.fileinput-button {
-  position: relative;
-  overflow: hidden;
-  float: left;
-  margin-right: 4px;
-}
-.fileinput-button input {
-  position: absolute;
-  top: 0;
-  right: 0;
-  margin: 0;
-  border: solid transparent;
-  border-width: 0 0 100px 200px;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  -moz-transform: translate(-300px, 0) scale(4);
-  direction: ltr;
-  cursor: pointer;
-}
-.fileupload-buttonbar .btn,
-.fileupload-buttonbar .toggle {
-  margin-bottom: 5px;
-}
-.files .progress {
-  width: 200px;
-}
+.progress-animated .progress-bar,
 .progress-animated .bar {
-  background: url(../img/progressbar.gif) !important;
+  background: url('../img/progressbar.gif') !important;
   filter: none;
 }
-.fileupload-loading {
-  position: absolute;
-  left: 50%;
-  width: 128px;
-  height: 128px;
-  background: url(../img/loading.gif) center no-repeat;
+.fileupload-process {
+  float: right;
   display: none;
 }
-.fileupload-processing .fileupload-loading {
+.fileupload-processing .fileupload-process,
+.files .processing .preview {
   display: block;
+  width: 32px;
+  height: 32px;
+  background: url('../img/loading.gif') center no-repeat;
+  background-size: contain;
+}
+.files audio,
+.files video {
+  max-width: 300px;
+}
+.files .name {
+  word-wrap: break-word;
+  overflow-wrap: anywhere;
+  -webkit-hyphens: auto;
+  hyphens: auto;
+}
+.files button {
+  margin-bottom: 5px;
+}
+.toggle[type='checkbox'] {
+  transform: scale(2);
+  margin-left: 10px;
 }
 
-@media (max-width: 480px) {
+@media (max-width: 767px) {
+  .fileupload-buttonbar .btn {
+    margin-bottom: 5px;
+  }
+  .fileupload-buttonbar .delete,
+  .fileupload-buttonbar .toggle,
+  .files .toggle,
   .files .btn span {
     display: none;
   }
-  .files .preview * {
-    width: 40px;
-  }
-  .files .name * {
-    width: 80px;
-    display: inline-block;
-    word-wrap: break-word;
-  }
-  .files .progress {
-    width: 20px;
+  .files audio,
+  .files video {
+    max-width: 80px;
   }
-  .files .delete {
-    width: 60px;
+}
+
+@media (max-width: 480px) {
+  .files .image td:nth-child(2) {
+    display: none;
   }
 }
diff --git a/lib/web/jquery/fileUploader/css/jquery.fileupload.css b/lib/web/jquery/fileUploader/css/jquery.fileupload.css
new file mode 100644
index 0000000000000..5716f3e8a8aea
--- /dev/null
+++ b/lib/web/jquery/fileUploader/css/jquery.fileupload.css
@@ -0,0 +1,36 @@
+@charset "UTF-8";
+/*
+ * jQuery File Upload Plugin CSS
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+.fileinput-button {
+  position: relative;
+  overflow: hidden;
+  display: inline-block;
+}
+.fileinput-button input {
+  position: absolute;
+  top: 0;
+  right: 0;
+  margin: 0;
+  height: 100%;
+  opacity: 0;
+  filter: alpha(opacity=0);
+  font-size: 200px !important;
+  direction: ltr;
+  cursor: pointer;
+}
+
+/* Fixes for IE < 8 */
+@media screen\9 {
+  .fileinput-button input {
+    font-size: 150% !important;
+  }
+}
diff --git a/lib/web/jquery/fileUploader/img/loading.gif b/lib/web/jquery/fileUploader/img/loading.gif
index 4ae663fa730eb029d66aeacdf410ded160745126..90f28cbdbb390b095e0d619cbe8d91208798e58f 100644
GIT binary patch
delta 502
zcmV<S0SW%p9l0J1M@dFFIbnbRfB^CUkqjCp`2+<800aOb{|in<R8vDiP(?B>FarSq
z001lk00IDf0DJ%d1OAar{sR7rlS~2q1HS(VlS~580sfO61O5UO@sk|{CjtJGMFjo=
z715JL1t<ajlWqn60s~O9ZU!R*0sfPc3H|~UQInDiCjtJGx(faR6S1?p3mgJ}2?YQI
z04xFk0swpfd;kCg{z$sq{xHf(tGzhu&Ab0#D2`-lo@lDBZ0o*oEYEZb+(509IKKa$
zUJppj2z|vQ<%m=|9n9u)N{HsDSSyyQ-A=n+rS%$4g3H7)+8kZ8neKEu4m{Io>buUa
zkLCL_e1H-Gg#jUggARs<Ac=~93yhK<bC3{{m>rdti<p@kN1PF!o*YA>qokjxCaR^Z
zt*(=>B(k%#BesmVwYr78BEG-CA;QGLw#T`y%FCq9y|>WLhtt;A*xB0K+}+;a;Nidm
z<mKk)=;z$&?Cs{-?(yx}^7ZQ2_W1(z`t|Vr?$!ZJC$6Bug9sBUT*$Cxp~Hu021pzL
zalyok5HD(^*imq!Mur|YDh%lnA<2>lPl`0C@*~TZ6HUUDm~tk^moO8~T$q#RNrxmW
suB=D^BhjNslPX=xw5ijlP@_tnO0}xht5~yY-O9DA*RNp17D)gAJ8CHF^8f$<

delta 400
zcmV;B0dM}f9@HHSM@dFFIbnbRfB^CYkqjCp{|in<R8vDiP(?B>FarSq001HR1O){E
z1OO}o00IDf0DJ%d1OJgs{sM~slS~2q1OEuTlS~580soU71O5W>6O$bTCjtMHMFjo=
z(G-(K1t<aklWqn60#E|8ZU!R*0soVd3H}066O)n(CjtMHx(faRu@bYo3mgJ}1qA>E
z04xFk3IH$wR{#J5>qxrX{tHL|tG#Vb%)8Q>CsyD#o=j<?r@FGDOTn#6kMfP%dMD34
zOfD!K5-r9fiKm1ln~o<mBApVd)1NiUgap2U9+m(G>#*hYt;<NeVeEx_&MH;rbX3TK
z&rkb)P=IfLgJoNWhgOMZg^Y-QkC1~~a)6YTc$aO2nwwvpprN9pq@|{(sHr*vtgWuE
zu&*$&w6(4%wz;(@y1lX^zQF>#!o9e~wzJ5ws?E;N(9zP<)XxLg1Ebj6pxfTrm*3u$
u;@?)~;!x=6P3z`L?&I+B*y{Ax?f2mG^i%g+{Q$1hgf7%OQQWK~00292r?~zA

diff --git a/lib/web/jquery/fileUploader/img/progressbar.gif b/lib/web/jquery/fileUploader/img/progressbar.gif
index 74bb94e8e5d2b6393f3a9bbf5a06f714e07042c4..fbcce6bc9abfcc7893e65ef20b3e77ee16ec37b1 100644
GIT binary patch
delta 1025
zcmZ1?^;=TF-P6s&GSPrRjA1u7!~3<#69rTvzaO3Q{oE7=1_s5SEUfGd{0xf!x&2&2
zf}I@$T#fV$m>GdmIzY?-(#F8DZNf><)ur06&sOJ6QtC^I<a1iJE@w7hnvV90?A;$Y
z-qgJRymj`6ui8?K6MI*QNhilx@HQ#TYhE-*F>_PQu0zwj^O+eYzh}~$T+Qf?Us`;!
zER!H(>EwxQqLVK$u}H6uUj51z!@yZ^11B<RFijT%DVHz%aME)*Uge=oQ-wiFb!&l2
z@9r{reP_mf1yhcc47=t<^BzQOir#f-ruKzf3~zRL+}qpPC+_mMYmy?v<W6Qkrhci(
z8#yFoH19^4WZ#vzonXe{l;H*R;KPVb3A+wK+{4Eb%rr$2tnTHtSr)Hv;!rmeq)r{I
z?m0enDy%?t24KGxf3V#?ZI8w4>lj8#dxFAt18We|WOI;GnW778zpmPAVSa4W|E3SU
z*B5A{SarP2SoC)LF(Zb_7HlC*lN><m)CvpsdamBvyYcky$*~^1T}tzs6+qDyyX(+(
z1_l%L=hJ#WPn9j0e3xBw@>ezmripGKU6T#iStW9NZl1jx1&m|3CSV+2V_=x<%bqWh
zgIm&dvLuI=L^f^(Hj}4wNHT(BQ??iwMVZNKUfE*UbPH^g`D7_hS*FPl#h|E9#iLkf
z@(fOGrfH%eFR<2sIB6+8`5~tm2g98$YTP?3m?!_|jAEKE4U`p=`Ec^5RI*9-+iSNH
z%rv}!ajXE1W019dTwzR86+x!RR($ZhDKXpP^-HV@rMV-SX6Qf-JT?OubI-A=Tg?qL
z&;Xbe#2HN|%kzkHHP|dKi+C=1=6l0r2OdAODVBnuEXoPWqDc9%WWq-G)q8KOZQY&U
ir5@F+(DOoIQBvimdAklx_bvw}hZ8)(to`<a4AuaEWSm0)

delta 951
zcmew@xkO69-P6s&GSPrRjNvms!}p_8CJLxXzh9gD{oE7=1_s6d+<vYh!Oo5Wu10zW
z%!~{SlMR?ew6;w+>AAX8`}Nsswn<8TDUp0mtJdYr=1bGjUXi`~!;LpJ?>}#y{o$*&
zl=Q^jRbq_EF&4Z{3iFy5%~8zU6tnBlH1B-p%ah+T=}oR?bjL3(K3SGYkg;`gB8#Ye
z`3In_(W_tCVi-6JZs0^F4W_=?aOKPKDi39@nN<T)t6K*&`tB~1*E}=sE0}VmWY{$?
zn)e`LQ}nJwGqo?=y6|R)$GyFsec~>EyCx+vPwrs$WA0ek1h%E@!%5A%Q6|~E61Nk~
zIGi%PfWCYfu_<BKA&8@RSb|x4X3U%cQ~dJUEQ{BiI22EXD4qp#|8snb<yeDRfhN!D
z0jcIJ`(V3$+8&G7?2{+5iZB6#cR6biYxi`h%`&AI)_z^J*Mj-jrvFVJdap0gNU`d8
znX%~Y_G3ktC+o0<uy#!Yss)*(R$8#vbM@Yaji+}{j`iT}QkvJS0E)NRU5Bn;Ffmbo
zKCSojRM~>bfgGBXpRp;hbxsB9>;&m#D*}dMHtS?V4pF8HCX)}cyH2iW*J5Nr2;?&|
zBRDpbTR0>ctARQtm_0QUCOdLMwV6+5=agmcY6ZtSTLsWiRU}!R$t|4PEIm!LSwMCw
zH+(p0$++9(^_ywHn9~5o+yZFK-MnyTiyHUN3iHV?Iir{-EM5#!&k8i|C&T1;E-{c3
z%elf>dzxm=21liA^#@N*iP;vfUtYVFV5Z>(j7kM)RNexrW#o=z?Q5AkZyv}P*~$-|
z2W9|+`#Dy%ecWMeAamz{-N;<=fpPLbZgH+&o8@H@&n3@%@0~2q<Hy$BICIu)aG1+i
xOxWnYdhd<3t-IN~)T5dedR_=DN~+v6Z`Yye-sQl^T+9>9*#wO1*(`z#)&Q2#moWeU

diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
new file mode 100644
index 0000000000000..e5c9202f9730a
--- /dev/null
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
@@ -0,0 +1,101 @@
+/*
+ * jQuery File Upload Audio Preview Plugin
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, require */
+
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery', 'load-image', './jquery.fileupload-process'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(
+      require('jquery'),
+      require('blueimp-load-image/js/load-image'),
+      require('./jquery.fileupload-process')
+    );
+  } else {
+    // Browser globals:
+    factory(window.jQuery, window.loadImage);
+  }
+})(function ($, loadImage) {
+  'use strict';
+
+  // Prepend to the default processQueue:
+  $.blueimp.fileupload.prototype.options.processQueue.unshift(
+    {
+      action: 'loadAudio',
+      // Use the action as prefix for the "@" options:
+      prefix: true,
+      fileTypes: '@',
+      maxFileSize: '@',
+      disabled: '@disableAudioPreview'
+    },
+    {
+      action: 'setAudio',
+      name: '@audioPreviewName',
+      disabled: '@disableAudioPreview'
+    }
+  );
+
+  // The File Upload Audio Preview plugin extends the fileupload widget
+  // with audio preview functionality:
+  $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+    options: {
+      // The regular expression for the types of audio files to load,
+      // matched against the file type:
+      loadAudioFileTypes: /^audio\/.*$/
+    },
+
+    _audioElement: document.createElement('audio'),
+
+    processActions: {
+      // Loads the audio file given via data.files and data.index
+      // as audio element if the browser supports playing it.
+      // Accepts the options fileTypes (regular expression)
+      // and maxFileSize (integer) to limit the files to load:
+      loadAudio: function (data, options) {
+        if (options.disabled) {
+          return data;
+        }
+        var file = data.files[data.index],
+          url,
+          audio;
+        if (
+          this._audioElement.canPlayType &&
+          this._audioElement.canPlayType(file.type) &&
+          ($.type(options.maxFileSize) !== 'number' ||
+            file.size <= options.maxFileSize) &&
+          (!options.fileTypes || options.fileTypes.test(file.type))
+        ) {
+          url = loadImage.createObjectURL(file);
+          if (url) {
+            audio = this._audioElement.cloneNode(false);
+            audio.src = url;
+            audio.controls = true;
+            data.audio = audio;
+            return data;
+          }
+        }
+        return data;
+      },
+
+      // Sets the audio element as a property of the file object:
+      setAudio: function (data, options) {
+        if (data.audio && !options.disabled) {
+          data.files[data.index][options.name || 'preview'] = data.audio;
+        }
+        return data;
+      }
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-fp.js b/lib/web/jquery/fileUploader/jquery.fileupload-fp.js
deleted file mode 100644
index ee8f46342a93a..0000000000000
--- a/lib/web/jquery/fileUploader/jquery.fileupload-fp.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * jQuery File Upload File Processing Plugin 1.0
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document */
-
-(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'jquery/fileUploader/load-image',
-            'jquery/fileUploader/canvas-to-blob',
-            'jquery/fileUploader/jquery.fileupload'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.loadImage
-        );
-    }
-}(function ($, loadImage) {
-    'use strict';
-
-    // The File Upload IP version extends the basic fileupload widget
-    // with file processing functionality:
-    $.widget('blueimpFP.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The list of file processing actions:
-            process: [
-            /*
-                {
-                    action: 'load',
-                    fileTypes: /^image\/(gif|jpeg|png)$/,
-                    maxFileSize: 20000000 // 20MB
-                },
-                {
-                    action: 'resize',
-                    maxWidth: 1920,
-                    maxHeight: 1200,
-                    minWidth: 800,
-                    minHeight: 600
-                },
-                {
-                    action: 'save'
-                }
-            */
-            ],
-
-            // The add callback is invoked as soon as files are added to the
-            // fileupload widget (via file input selection, drag & drop or add
-            // API call). See the basic file upload widget for more information:
-            add: function (e, data) {
-                $(this).fileupload('process', data).done(function () {
-                    data.submit();
-                });
-            }
-        },
-
-        processActions: {
-            // Loads the image given via data.files and data.index
-            // as canvas element.
-            // Accepts the options fileTypes (regular expression)
-            // and maxFileSize (integer) to limit the files to load:
-            load: function (data, options) {
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred();
-                if (window.HTMLCanvasElement &&
-                        window.HTMLCanvasElement.prototype.toBlob &&
-                        ($.type(options.maxFileSize) !== 'number' ||
-                            file.size < options.maxFileSize) &&
-                        (!options.fileTypes ||
-                            options.fileTypes.test(file.type))) {
-                    loadImage(
-                        file,
-                        function (canvas) {
-                            data.canvas = canvas;
-                            dfd.resolveWith(that, [data]);
-                        },
-                        {canvas: true}
-                    );
-                } else {
-                    dfd.rejectWith(that, [data]);
-                }
-                return dfd.promise();
-            },
-            // Resizes the image given as data.canvas and updates
-            // data.canvas with the resized image.
-            // Accepts the options maxWidth, maxHeight, minWidth and
-            // minHeight to scale the given image:
-            resize: function (data, options) {
-                if (data.canvas) {
-                    var canvas = loadImage.scale(data.canvas, options);
-                    if (canvas.width !== data.canvas.width ||
-                            canvas.height !== data.canvas.height) {
-                        data.canvas = canvas;
-                        data.processed = true;
-                    }
-                }
-                return data;
-            },
-            // Saves the processed image given as data.canvas
-            // inplace at data.index of data.files:
-            save: function (data, options) {
-                // Do nothing if no processing has happened:
-                if (!data.canvas || !data.processed) {
-                    return data;
-                }
-                var that = this,
-                    file = data.files[data.index],
-                    name = file.name,
-                    dfd = $.Deferred(),
-                    callback = function (blob) {
-                        if (!blob.name) {
-                            if (file.type === blob.type) {
-                                blob.name = file.name;
-                            } else if (file.name) {
-                                blob.name = file.name.replace(
-                                    /\..+$/,
-                                    '.' + blob.type.substr(6)
-                                );
-                            }
-                        }
-                        // Store the created blob at the position
-                        // of the original file in the files list:
-                        data.files[data.index] = blob;
-                        dfd.resolveWith(that, [data]);
-                    };
-                // Use canvas.mozGetAsFile directly, to retain the filename, as
-                // Gecko doesn't support the filename option for FormData.append:
-                if (data.canvas.mozGetAsFile) {
-                    callback(data.canvas.mozGetAsFile(
-                        (/^image\/(jpeg|png)$/.test(file.type) && name) ||
-                            ((name && name.replace(/\..+$/, '')) ||
-                                'blob') + '.png',
-                        file.type
-                    ));
-                } else {
-                    data.canvas.toBlob(callback, file.type);
-                }
-                return dfd.promise();
-            }
-        },
-
-        // Resizes the file at the given index and stores the created blob at
-        // the original position of the files list, returns a Promise object:
-        _processFile: function (files, index, options) {
-            var that = this,
-                dfd = $.Deferred().resolveWith(that, [{
-                    files: files,
-                    index: index
-                }]),
-                chain = dfd.promise();
-            that._processing += 1;
-            $.each(options.process, function (i, settings) {
-                chain = chain.pipe(function (data) {
-                    return that.processActions[settings.action]
-                        .call(this, data, settings);
-                });
-            });
-            chain.always(function () {
-                that._processing -= 1;
-                if (that._processing === 0) {
-                    that.element
-                        .removeClass('fileupload-processing');
-                }
-            });
-            if (that._processing === 1) {
-                that.element.addClass('fileupload-processing');
-            }
-            return chain;
-        },
-
-        // Processes the files given as files property of the data parameter,
-        // returns a Promise object that allows to bind a done handler, which
-        // will be invoked after processing all files (inplace) is done:
-        process: function (data) {
-            var that = this,
-                options = $.extend({}, this.options, data);
-            if (options.process && options.process.length &&
-                    this._isXHRUpload(options)) {
-                $.each(data.files, function (index, file) {
-                    that._processingQueue = that._processingQueue.pipe(
-                        function () {
-                            var dfd = $.Deferred();
-                            that._processFile(data.files, index, options)
-                                .always(function () {
-                                    dfd.resolveWith(that);
-                                });
-                            return dfd.promise();
-                        }
-                    );
-                });
-            }
-            return this._processingQueue;
-        },
-
-        _create: function () {
-            $.blueimp.fileupload.prototype._create.call(this);
-            this._processing = 0;
-            this._processingQueue = $.Deferred().resolveWith(this)
-                .promise();
-        }
-
-    });
-
-}));
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-image.js b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
new file mode 100644
index 0000000000000..8598461031e2e
--- /dev/null
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
@@ -0,0 +1,355 @@
+/*
+ * jQuery File Upload Image Preview & Resize Plugin
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, require */
+
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define([
+      'jquery',
+      'load-image',
+      'load-image-meta',
+      'load-image-scale',
+      'load-image-exif',
+      'load-image-orientation',
+      'canvas-to-blob',
+      './jquery.fileupload-process'
+    ], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(
+      require('jquery'),
+      require('blueimp-load-image/js/load-image'),
+      require('blueimp-load-image/js/load-image-meta'),
+      require('blueimp-load-image/js/load-image-scale'),
+      require('blueimp-load-image/js/load-image-exif'),
+      require('blueimp-load-image/js/load-image-orientation'),
+      require('blueimp-canvas-to-blob'),
+      require('./jquery.fileupload-process')
+    );
+  } else {
+    // Browser globals:
+    factory(window.jQuery, window.loadImage);
+  }
+})(function ($, loadImage) {
+  'use strict';
+
+  // Prepend to the default processQueue:
+  $.blueimp.fileupload.prototype.options.processQueue.unshift(
+    {
+      action: 'loadImageMetaData',
+      maxMetaDataSize: '@',
+      disableImageHead: '@',
+      disableMetaDataParsers: '@',
+      disableExif: '@',
+      disableExifThumbnail: '@',
+      disableExifOffsets: '@',
+      includeExifTags: '@',
+      excludeExifTags: '@',
+      disableIptc: '@',
+      disableIptcOffsets: '@',
+      includeIptcTags: '@',
+      excludeIptcTags: '@',
+      disabled: '@disableImageMetaDataLoad'
+    },
+    {
+      action: 'loadImage',
+      // Use the action as prefix for the "@" options:
+      prefix: true,
+      fileTypes: '@',
+      maxFileSize: '@',
+      noRevoke: '@',
+      disabled: '@disableImageLoad'
+    },
+    {
+      action: 'resizeImage',
+      // Use "image" as prefix for the "@" options:
+      prefix: 'image',
+      maxWidth: '@',
+      maxHeight: '@',
+      minWidth: '@',
+      minHeight: '@',
+      crop: '@',
+      orientation: '@',
+      forceResize: '@',
+      disabled: '@disableImageResize'
+    },
+    {
+      action: 'saveImage',
+      quality: '@imageQuality',
+      type: '@imageType',
+      disabled: '@disableImageResize'
+    },
+    {
+      action: 'saveImageMetaData',
+      disabled: '@disableImageMetaDataSave'
+    },
+    {
+      action: 'resizeImage',
+      // Use "preview" as prefix for the "@" options:
+      prefix: 'preview',
+      maxWidth: '@',
+      maxHeight: '@',
+      minWidth: '@',
+      minHeight: '@',
+      crop: '@',
+      orientation: '@',
+      thumbnail: '@',
+      canvas: '@',
+      disabled: '@disableImagePreview'
+    },
+    {
+      action: 'setImage',
+      name: '@imagePreviewName',
+      disabled: '@disableImagePreview'
+    },
+    {
+      action: 'deleteImageReferences',
+      disabled: '@disableImageReferencesDeletion'
+    }
+  );
+
+  // The File Upload Resize plugin extends the fileupload widget
+  // with image resize functionality:
+  $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+    options: {
+      // The regular expression for the types of images to load:
+      // matched against the file type:
+      loadImageFileTypes: /^image\/(gif|jpeg|png|svg\+xml)$/,
+      // The maximum file size of images to load:
+      loadImageMaxFileSize: 10000000, // 10MB
+      // The maximum width of resized images:
+      imageMaxWidth: 1920,
+      // The maximum height of resized images:
+      imageMaxHeight: 1080,
+      // Defines the image orientation (1-8) or takes the orientation
+      // value from Exif data if set to true:
+      imageOrientation: true,
+      // Define if resized images should be cropped or only scaled:
+      imageCrop: false,
+      // Disable the resize image functionality by default:
+      disableImageResize: true,
+      // The maximum width of the preview images:
+      previewMaxWidth: 80,
+      // The maximum height of the preview images:
+      previewMaxHeight: 80,
+      // Defines the preview orientation (1-8) or takes the orientation
+      // value from Exif data if set to true:
+      previewOrientation: true,
+      // Create the preview using the Exif data thumbnail:
+      previewThumbnail: true,
+      // Define if preview images should be cropped or only scaled:
+      previewCrop: false,
+      // Define if preview images should be resized as canvas elements:
+      previewCanvas: true
+    },
+
+    processActions: {
+      // Loads the image given via data.files and data.index
+      // as img element, if the browser supports the File API.
+      // Accepts the options fileTypes (regular expression)
+      // and maxFileSize (integer) to limit the files to load:
+      loadImage: function (data, options) {
+        if (options.disabled) {
+          return data;
+        }
+        var that = this,
+          file = data.files[data.index],
+          // eslint-disable-next-line new-cap
+          dfd = $.Deferred();
+        if (
+          ($.type(options.maxFileSize) === 'number' &&
+            file.size > options.maxFileSize) ||
+          (options.fileTypes && !options.fileTypes.test(file.type)) ||
+          !loadImage(
+            file,
+            function (img) {
+              if (img.src) {
+                data.img = img;
+              }
+              dfd.resolveWith(that, [data]);
+            },
+            options
+          )
+        ) {
+          return data;
+        }
+        return dfd.promise();
+      },
+
+      // Resizes the image given as data.canvas or data.img
+      // and updates data.canvas or data.img with the resized image.
+      // Also stores the resized image as preview property.
+      // Accepts the options maxWidth, maxHeight, minWidth,
+      // minHeight, canvas and crop:
+      resizeImage: function (data, options) {
+        if (options.disabled || !(data.canvas || data.img)) {
+          return data;
+        }
+        // eslint-disable-next-line no-param-reassign
+        options = $.extend({ canvas: true }, options);
+        var that = this,
+          // eslint-disable-next-line new-cap
+          dfd = $.Deferred(),
+          img = (options.canvas && data.canvas) || data.img,
+          resolve = function (newImg) {
+            if (
+              newImg &&
+              (newImg.width !== img.width ||
+                newImg.height !== img.height ||
+                options.forceResize)
+            ) {
+              data[newImg.getContext ? 'canvas' : 'img'] = newImg;
+            }
+            data.preview = newImg;
+            dfd.resolveWith(that, [data]);
+          },
+          thumbnail,
+          thumbnailBlob;
+        if (data.exif) {
+          if (options.orientation === true) {
+            options.orientation = data.exif.get('Orientation');
+          }
+          if (options.thumbnail) {
+            thumbnail = data.exif.get('Thumbnail');
+            thumbnailBlob = thumbnail && thumbnail.get('Blob');
+            if (thumbnailBlob) {
+              loadImage(thumbnailBlob, resolve, options);
+              return dfd.promise();
+            }
+          }
+          // Prevent orienting browser oriented images:
+          if (loadImage.orientation) {
+            data.orientation = data.orientation || options.orientation;
+          }
+          // Prevent orienting the same image twice:
+          if (data.orientation) {
+            delete options.orientation;
+          } else {
+            data.orientation = options.orientation;
+          }
+        }
+        if (img) {
+          resolve(loadImage.scale(img, options));
+          return dfd.promise();
+        }
+        return data;
+      },
+
+      // Saves the processed image given as data.canvas
+      // inplace at data.index of data.files:
+      saveImage: function (data, options) {
+        if (!data.canvas || options.disabled) {
+          return data;
+        }
+        var that = this,
+          file = data.files[data.index],
+          // eslint-disable-next-line new-cap
+          dfd = $.Deferred();
+        if (data.canvas.toBlob) {
+          data.canvas.toBlob(
+            function (blob) {
+              if (!blob.name) {
+                if (file.type === blob.type) {
+                  blob.name = file.name;
+                } else if (file.name) {
+                  blob.name = file.name.replace(
+                    /\.\w+$/,
+                    '.' + blob.type.substr(6)
+                  );
+                }
+              }
+              // Don't restore invalid meta data:
+              if (file.type !== blob.type) {
+                delete data.imageHead;
+              }
+              // Store the created blob at the position
+              // of the original file in the files list:
+              data.files[data.index] = blob;
+              dfd.resolveWith(that, [data]);
+            },
+            options.type || file.type,
+            options.quality
+          );
+        } else {
+          return data;
+        }
+        return dfd.promise();
+      },
+
+      loadImageMetaData: function (data, options) {
+        if (options.disabled) {
+          return data;
+        }
+        var that = this,
+          // eslint-disable-next-line new-cap
+          dfd = $.Deferred();
+        loadImage.parseMetaData(
+          data.files[data.index],
+          function (result) {
+            $.extend(data, result);
+            dfd.resolveWith(that, [data]);
+          },
+          options
+        );
+        return dfd.promise();
+      },
+
+      saveImageMetaData: function (data, options) {
+        if (
+          !(
+            data.imageHead &&
+            data.canvas &&
+            data.canvas.toBlob &&
+            !options.disabled
+          )
+        ) {
+          return data;
+        }
+        var that = this,
+          file = data.files[data.index],
+          // eslint-disable-next-line new-cap
+          dfd = $.Deferred();
+        if (data.orientation && data.exifOffsets) {
+          // Reset Exif Orientation data:
+          loadImage.writeExifData(data.imageHead, data, 'Orientation', 1);
+        }
+        loadImage.replaceHead(file, data.imageHead, function (blob) {
+          blob.name = file.name;
+          data.files[data.index] = blob;
+          dfd.resolveWith(that, [data]);
+        });
+        return dfd.promise();
+      },
+
+      // Sets the resized version of the image as a property of the
+      // file object, must be called after "saveImage":
+      setImage: function (data, options) {
+        if (data.preview && !options.disabled) {
+          data.files[data.index][options.name || 'preview'] = data.preview;
+        }
+        return data;
+      },
+
+      deleteImageReferences: function (data, options) {
+        if (!options.disabled) {
+          delete data.img;
+          delete data.canvas;
+          delete data.preview;
+          delete data.imageHead;
+        }
+        return data;
+      }
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-process.js b/lib/web/jquery/fileUploader/jquery.fileupload-process.js
new file mode 100644
index 0000000000000..130778e7f26a6
--- /dev/null
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-process.js
@@ -0,0 +1,170 @@
+/*
+ * jQuery File Upload Processing Plugin
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2012, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, require */
+
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery', './jquery.fileupload'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'), require('./jquery.fileupload'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
+
+  var originalAdd = $.blueimp.fileupload.prototype.options.add;
+
+  // The File Upload Processing plugin extends the fileupload widget
+  // with file processing functionality:
+  $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+    options: {
+      // The list of processing actions:
+      processQueue: [
+        /*
+                {
+                    action: 'log',
+                    type: 'debug'
+                }
+                */
+      ],
+      add: function (e, data) {
+        var $this = $(this);
+        data.process(function () {
+          return $this.fileupload('process', data);
+        });
+        originalAdd.call(this, e, data);
+      }
+    },
+
+    processActions: {
+      /*
+            log: function (data, options) {
+                console[options.type](
+                    'Processing "' + data.files[data.index].name + '"'
+                );
+            }
+            */
+    },
+
+    _processFile: function (data, originalData) {
+      var that = this,
+        // eslint-disable-next-line new-cap
+        dfd = $.Deferred().resolveWith(that, [data]),
+        chain = dfd.promise();
+      this._trigger('process', null, data);
+      $.each(data.processQueue, function (i, settings) {
+        var func = function (data) {
+          if (originalData.errorThrown) {
+            // eslint-disable-next-line new-cap
+            return $.Deferred().rejectWith(that, [originalData]).promise();
+          }
+          return that.processActions[settings.action].call(
+            that,
+            data,
+            settings
+          );
+        };
+        chain = chain[that._promisePipe](func, settings.always && func);
+      });
+      chain
+        .done(function () {
+          that._trigger('processdone', null, data);
+          that._trigger('processalways', null, data);
+        })
+        .fail(function () {
+          that._trigger('processfail', null, data);
+          that._trigger('processalways', null, data);
+        });
+      return chain;
+    },
+
+    // Replaces the settings of each processQueue item that
+    // are strings starting with an "@", using the remaining
+    // substring as key for the option map,
+    // e.g. "@autoUpload" is replaced with options.autoUpload:
+    _transformProcessQueue: function (options) {
+      var processQueue = [];
+      $.each(options.processQueue, function () {
+        var settings = {},
+          action = this.action,
+          prefix = this.prefix === true ? action : this.prefix;
+        $.each(this, function (key, value) {
+          if ($.type(value) === 'string' && value.charAt(0) === '@') {
+            settings[key] =
+              options[
+                value.slice(1) ||
+                  (prefix
+                    ? prefix + key.charAt(0).toUpperCase() + key.slice(1)
+                    : key)
+              ];
+          } else {
+            settings[key] = value;
+          }
+        });
+        processQueue.push(settings);
+      });
+      options.processQueue = processQueue;
+    },
+
+    // Returns the number of files currently in the processsing queue:
+    processing: function () {
+      return this._processing;
+    },
+
+    // Processes the files given as files property of the data parameter,
+    // returns a Promise object that allows to bind callbacks:
+    process: function (data) {
+      var that = this,
+        options = $.extend({}, this.options, data);
+      if (options.processQueue && options.processQueue.length) {
+        this._transformProcessQueue(options);
+        if (this._processing === 0) {
+          this._trigger('processstart');
+        }
+        $.each(data.files, function (index) {
+          var opts = index ? $.extend({}, options) : options,
+            func = function () {
+              if (data.errorThrown) {
+                // eslint-disable-next-line new-cap
+                return $.Deferred().rejectWith(that, [data]).promise();
+              }
+              return that._processFile(opts, data);
+            };
+          opts.index = index;
+          that._processing += 1;
+          that._processingQueue = that._processingQueue[that._promisePipe](
+            func,
+            func
+          ).always(function () {
+            that._processing -= 1;
+            if (that._processing === 0) {
+              that._trigger('processstop');
+            }
+          });
+        });
+      }
+      return this._processingQueue;
+    },
+
+    _create: function () {
+      this._super();
+      this._processing = 0;
+      // eslint-disable-next-line new-cap
+      this._processingQueue = $.Deferred().resolveWith(this).promise();
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
index 8dca3ce992671..9cc3d3fd0fb1f 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
@@ -1,745 +1,759 @@
 /*
- * jQuery File Upload User Interface Plugin 6.9.5
+ * jQuery File Upload User Interface Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, URL, webkitURL, FileReader */
+/* global define, require */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'mage/template',
-            'jquery/fileUploader/load-image',
-            'jquery/fileUploader/jquery.fileupload-fp',
-            'jquery/fileUploader/jquery.iframe-transport'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.mageTemplate,
-            window.loadImage
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define([
+      'jquery',
+      'blueimp-tmpl',
+      './jquery.fileupload-image',
+      './jquery.fileupload-audio',
+      './jquery.fileupload-video',
+      './jquery.fileupload-validate'
+    ], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(
+      require('jquery'),
+      require('blueimp-tmpl'),
+      require('./jquery.fileupload-image'),
+      require('./jquery.fileupload-audio'),
+      require('./jquery.fileupload-video'),
+      require('./jquery.fileupload-validate')
+    );
+  } else {
+    // Browser globals:
+    factory(window.jQuery, window.tmpl);
+  }
+})(function ($, tmpl) {
+  'use strict';
+
+  $.blueimp.fileupload.prototype._specialOptions.push(
+    'filesContainer',
+    'uploadTemplateId',
+    'downloadTemplateId'
+  );
+
+  // The UI version extends the file upload widget
+  // and adds complete user interface interaction:
+  $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+    options: {
+      // By default, files added to the widget are uploaded as soon
+      // as the user clicks on the start buttons. To enable automatic
+      // uploads, set the following option to true:
+      autoUpload: false,
+      // The class to show/hide UI elements:
+      showElementClass: 'in',
+      // The ID of the upload template:
+      uploadTemplateId: 'template-upload',
+      // The ID of the download template:
+      downloadTemplateId: 'template-download',
+      // The container for the list of files. If undefined, it is set to
+      // an element with class "files" inside of the widget element:
+      filesContainer: undefined,
+      // By default, files are appended to the files container.
+      // Set the following option to true, to prepend files instead:
+      prependFiles: false,
+      // The expected data type of the upload response, sets the dataType
+      // option of the $.ajax upload requests:
+      dataType: 'json',
+
+      // Error and info messages:
+      messages: {
+        unknownError: 'Unknown error'
+      },
+
+      // Function returning the current number of files,
+      // used by the maxNumberOfFiles validation:
+      getNumberOfFiles: function () {
+        return this.filesContainer.children().not('.processing').length;
+      },
+
+      // Callback to retrieve the list of files from the server response:
+      getFilesFromResponse: function (data) {
+        if (data.result && $.isArray(data.result.files)) {
+          return data.result.files;
+        }
+        return [];
+      },
+
+      // The add callback is invoked as soon as files are added to the fileupload
+      // widget (via file input selection, drag & drop or add API call).
+      // See the basic file upload widget for more information:
+      add: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var $this = $(this),
+          that = $this.data('blueimp-fileupload') || $this.data('fileupload'),
+          options = that.options;
+        data.context = that
+          ._renderUpload(data.files)
+          .data('data', data)
+          .addClass('processing');
+        options.filesContainer[options.prependFiles ? 'prepend' : 'append'](
+          data.context
         );
-    }
-}(function ($, tmpl, loadImage) {
-    'use strict';
-
-    // The UI version extends the FP (file processing) version or the basic
-    // file upload widget and adds complete user interface interaction:
-    var parentWidget = ($.blueimpFP || $.blueimp).fileupload;
-    $.widget('blueimpUI.fileupload', parentWidget, {
-
-        options: {
-            // By default, files added to the widget are uploaded as soon
-            // as the user clicks on the start buttons. To enable automatic
-            // uploads, set the following option to true:
-            autoUpload: false,
-            // The following option limits the number of files that are
-            // allowed to be uploaded using this widget:
-            maxNumberOfFiles: undefined,
-            // The maximum allowed file size:
-            maxFileSize: undefined,
-            // The minimum allowed file size:
-            minFileSize: undefined,
-            // The regular expression for allowed file types, matches
-            // against either file type or file name:
-            acceptFileTypes:  /.+$/i,
-            // The regular expression to define for which files a preview
-            // image is shown, matched against the file type:
-            previewSourceFileTypes: /^image\/(gif|jpeg|png)$/,
-            // The maximum file size of images that are to be displayed as preview:
-            previewSourceMaxFileSize: 5000000, // 5MB
-            // The maximum width of the preview images:
-            previewMaxWidth: 80,
-            // The maximum height of the preview images:
-            previewMaxHeight: 80,
-            // By default, preview images are displayed as canvas elements
-            // if supported by the browser. Set the following option to false
-            // to always display preview images as img elements:
-            previewAsCanvas: true,
-            // The ID of the upload template:
-            uploadTemplateId: 'template-upload',
-            // The ID of the download template:
-            downloadTemplateId: 'template-download',
-            // The container for the list of files. If undefined, it is set to
-            // an element with class "files" inside of the widget element:
-            filesContainer: undefined,
-            // By default, files are appended to the files container.
-            // Set the following option to true, to prepend files instead:
-            prependFiles: false,
-            // The expected data type of the upload response, sets the dataType
-            // option of the $.ajax upload requests:
-            dataType: 'json',
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop or add API call).
-            // See the basic file upload widget for more information:
-            add: function (e, data) {
-                var that = $(this).data('fileupload'),
-                    options = that.options,
-                    files = data.files;
-                $(this).fileupload('process', data).done(function () {
-                    that._adjustMaxNumberOfFiles(-files.length);
-                    data.maxNumberOfFilesAdjusted = true;
-                    data.files.valid = data.isValidated = that._validate(files);
-                    data.context = that._renderUpload(files).data('data', data);
-                    options.filesContainer[
-                        options.prependFiles ? 'prepend' : 'append'
-                    ](data.context);
-                    that._renderPreviews(files, data.context);
-                    that._forceReflow(data.context);
-                    that._transition(data.context).done(
-                        function () {
-                            if ((that._trigger('added', e, data) !== false) &&
-                                    (options.autoUpload || data.autoUpload) &&
-                                    data.autoUpload !== false && data.isValidated) {
-                                data.submit();
-                            }
-                        }
-                    );
-                });
-            },
-            // Callback for the start of each file upload request:
-            send: function (e, data) {
-                var that = $(this).data('fileupload');
-                if (!data.isValidated) {
-                    if (!data.maxNumberOfFilesAdjusted) {
-                        that._adjustMaxNumberOfFiles(-data.files.length);
-                        data.maxNumberOfFilesAdjusted = true;
-                    }
-                    if (!that._validate(data.files)) {
-                        return false;
-                    }
-                }
-                if (data.context && data.dataType &&
-                        data.dataType.substr(0, 6) === 'iframe') {
-                    // Iframe Transport does not support progress events.
-                    // In lack of an indeterminate progress bar, we set
-                    // the progress to 100%, showing the full animated bar:
-                    data.context
-                        .find('.progress').addClass(
-                            !$.support.transition && 'progress-animated'
-                        )
-                        .attr('aria-valuenow', 100)
-                        .find('.bar').css(
-                            'width',
-                            '100%'
-                        );
-                }
-                return that._trigger('sent', e, data);
-            },
-            // Callback for successful uploads:
-            done: function (e, data) {
-                var that = $(this).data('fileupload'),
-                    template;
-                if (data.context) {
-                    data.context.each(function (index) {
-                        var file = ($.isArray(data.result) &&
-                                data.result[index]) || {error: 'emptyResult'};
-                        if (file.error) {
-                            that._adjustMaxNumberOfFiles(1);
-                        }
-                        that._transition($(this)).done(
-                            function () {
-                                var node = $(this);
-                                template = that._renderDownload([file])
-                                    .replaceAll(node);
-                                that._forceReflow(template);
-                                that._transition(template).done(
-                                    function () {
-                                        data.context = $(this);
-                                        that._trigger('completed', e, data);
-                                    }
-                                );
-                            }
-                        );
-                    });
-                } else {
-                    if ($.isArray(data.result)) {
-                        $.each(data.result, function (index, file) {
-                            if (data.maxNumberOfFilesAdjusted && file.error) {
-                                that._adjustMaxNumberOfFiles(1);
-                            } else if (!data.maxNumberOfFilesAdjusted &&
-                                    !file.error) {
-                                that._adjustMaxNumberOfFiles(-1);
-                            }
-                        });
-                        data.maxNumberOfFilesAdjusted = true;
-                    }
-                    template = that._renderDownload(data.result)
-                        .appendTo(that.options.filesContainer);
-                    that._forceReflow(template);
-                    that._transition(template).done(
-                        function () {
-                            data.context = $(this);
-                            that._trigger('completed', e, data);
-                        }
-                    );
-                }
-            },
-            // Callback for failed (abort or error) uploads:
-            fail: function (e, data) {
-                var that = $(this).data('fileupload'),
-                    template;
-                if (data.maxNumberOfFilesAdjusted) {
-                    that._adjustMaxNumberOfFiles(data.files.length);
-                }
-                if (data.context) {
-                    data.context.each(function (index) {
-                        if (data.errorThrown !== 'abort') {
-                            var file = data.files[index];
-                            file.error = file.error || data.errorThrown ||
-                                true;
-                            that._transition($(this)).done(
-                                function () {
-                                    var node = $(this);
-                                    template = that._renderDownload([file])
-                                        .replaceAll(node);
-                                    that._forceReflow(template);
-                                    that._transition(template).done(
-                                        function () {
-                                            data.context = $(this);
-                                            that._trigger('failed', e, data);
-                                        }
-                                    );
-                                }
-                            );
-                        } else {
-                            that._transition($(this)).done(
-                                function () {
-                                    $(this).remove();
-                                    that._trigger('failed', e, data);
-                                }
-                            );
-                        }
-                    });
-                } else if (data.errorThrown !== 'abort') {
-                    data.context = that._renderUpload(data.files)
-                        .appendTo(that.options.filesContainer)
-                        .data('data', data);
-                    that._forceReflow(data.context);
-                    that._transition(data.context).done(
-                        function () {
-                            data.context = $(this);
-                            that._trigger('failed', e, data);
-                        }
-                    );
-                } else {
-                    that._trigger('failed', e, data);
-                }
-            },
-            // Callback for upload progress events:
-            progress: function (e, data) {
-                if (data.context) {
-                    var progress = parseInt(data.loaded / data.total * 100, 10);
-                    data.context.find('.progress')
-                        .attr('aria-valuenow', progress)
-                        .find('.bar').css(
-                            'width',
-                            progress + '%'
-                        );
-                }
-            },
-            // Callback for global upload progress events:
-            progressall: function (e, data) {
-                var $this = $(this),
-                    progress = parseInt(data.loaded / data.total * 100, 10),
-                    globalProgressNode = $this.find('.fileupload-progress'),
-                    extendedProgressNode = globalProgressNode
-                        .find('.progress-extended');
-                if (extendedProgressNode.length) {
-                    extendedProgressNode.html(
-                        $this.data('fileupload')._renderExtendedProgress(data)
-                    );
-                }
-                globalProgressNode
-                    .find('.progress')
-                    .attr('aria-valuenow', progress)
-                    .find('.bar').css(
-                        'width',
-                        progress + '%'
-                    );
-            },
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            start: function (e) {
-                var that = $(this).data('fileupload');
-                that._transition($(this).find('.fileupload-progress')).done(
-                    function () {
-                        that._trigger('started', e);
-                    }
-                );
-            },
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            stop: function (e) {
-                var that = $(this).data('fileupload');
-                that._transition($(this).find('.fileupload-progress')).done(
-                    function () {
-                        $(this).find('.progress')
-                            .attr('aria-valuenow', '0')
-                            .find('.bar').css('width', '0%');
-                        $(this).find('.progress-extended').html('&nbsp;');
-                        that._trigger('stopped', e);
-                    }
-                );
-            },
-            // Callback for file deletion:
-            destroy: function (e, data) {
-                var that = $(this).data('fileupload');
-                if (data.url) {
-                    $.ajax(data);
-                    that._adjustMaxNumberOfFiles(1);
-                }
-                that._transition(data.context).done(
-                    function () {
-                        $(this).remove();
-                        that._trigger('destroyed', e, data);
-                    }
-                );
-            }
-        },
-
-        // Link handler, that allows to download files
-        // by drag & drop of the links to the desktop:
-        _enableDragToDesktop: function () {
-            var link = $(this),
-                url = link.prop('href'),
-                name = link.prop('download'),
-                type = 'application/octet-stream';
-            link.bind('dragstart', function (e) {
-                try {
-                    e.originalEvent.dataTransfer.setData(
-                        'DownloadURL',
-                        [type, name, url].join(':')
-                    );
-                } catch (err) {}
-            });
-        },
-
-        _adjustMaxNumberOfFiles: function (operand) {
-            if (typeof this.options.maxNumberOfFiles === 'number') {
-                this.options.maxNumberOfFiles += operand;
-                if (this.options.maxNumberOfFiles < 1) {
-                    this._disableFileInputButton();
-                } else {
-                    this._enableFileInputButton();
-                }
-            }
-        },
-
-        _formatFileSize: function (bytes) {
-            if (typeof bytes !== 'number') {
-                return '';
-            }
-            if (bytes >= 1000000000) {
-                return (bytes / 1000000000).toFixed(2) + ' GB';
-            }
-            if (bytes >= 1000000) {
-                return (bytes / 1000000).toFixed(2) + ' MB';
-            }
-            return (bytes / 1000).toFixed(2) + ' KB';
-        },
-
-        _formatBitrate: function (bits) {
-            if (typeof bits !== 'number') {
-                return '';
+        that._forceReflow(data.context);
+        that._transition(data.context);
+        data
+          .process(function () {
+            return $this.fileupload('process', data);
+          })
+          .always(function () {
+            data.context
+              .each(function (index) {
+                $(this)
+                  .find('.size')
+                  .text(that._formatFileSize(data.files[index].size));
+              })
+              .removeClass('processing');
+            that._renderPreviews(data);
+          })
+          .done(function () {
+            data.context.find('.edit,.start').prop('disabled', false);
+            if (
+              that._trigger('added', e, data) !== false &&
+              (options.autoUpload || data.autoUpload) &&
+              data.autoUpload !== false
+            ) {
+              data.submit();
             }
-            if (bits >= 1000000000) {
-                return (bits / 1000000000).toFixed(2) + ' Gbit/s';
-            }
-            if (bits >= 1000000) {
-                return (bits / 1000000).toFixed(2) + ' Mbit/s';
-            }
-            if (bits >= 1000) {
-                return (bits / 1000).toFixed(2) + ' kbit/s';
-            }
-            return bits + ' bit/s';
-        },
-
-        _formatTime: function (seconds) {
-            var date = new Date(seconds * 1000),
-                days = parseInt(seconds / 86400, 10);
-            days = days ? days + 'd ' : '';
-            return days +
-                ('0' + date.getUTCHours()).slice(-2) + ':' +
-                ('0' + date.getUTCMinutes()).slice(-2) + ':' +
-                ('0' + date.getUTCSeconds()).slice(-2);
-        },
-
-        _formatPercentage: function (floatValue) {
-            return (floatValue * 100).toFixed(2) + ' %';
-        },
-
-        _renderExtendedProgress: function (data) {
-            return this._formatBitrate(data.bitrate) + ' | ' +
-                this._formatTime(
-                    (data.total - data.loaded) * 8 / data.bitrate
-                ) + ' | ' +
-                this._formatPercentage(
-                    data.loaded / data.total
-                ) + ' | ' +
-                this._formatFileSize(data.loaded) + ' / ' +
-                this._formatFileSize(data.total);
-        },
-
-        _hasError: function (file) {
-            if (file.error) {
-                return file.error;
-            }
-            // The number of added files is subtracted from
-            // maxNumberOfFiles before validation, so we check if
-            // maxNumberOfFiles is below 0 (instead of below 1):
-            if (this.options.maxNumberOfFiles < 0) {
-                return 'maxNumberOfFiles';
-            }
-            // Files are accepted if either the file type or the file name
-            // matches against the acceptFileTypes regular expression, as
-            // only browsers with support for the File API report the type:
-            if (!(this.options.acceptFileTypes.test(file.type) ||
-                    this.options.acceptFileTypes.test(file.name))) {
-                return 'acceptFileTypes';
-            }
-            if (this.options.maxFileSize &&
-                    file.size > this.options.maxFileSize) {
-                return 'maxFileSize';
-            }
-            if (typeof file.size === 'number' &&
-                    file.size < this.options.minFileSize) {
-                return 'minFileSize';
-            }
-            return null;
-        },
-
-        _validate: function (files) {
-            var that = this,
-                valid = !!files.length;
-            $.each(files, function (index, file) {
-                file.error = that._hasError(file);
-                if (file.error) {
-                    valid = false;
+          })
+          .fail(function () {
+            if (data.files.error) {
+              data.context.each(function (index) {
+                var error = data.files[index].error;
+                if (error) {
+                  $(this).find('.error').text(error);
                 }
-            });
-            return valid;
-        },
-
-        _renderTemplate: function (func, files) {
-            if (!func) {
-                return $();
+              });
             }
-            var result = func({
-                files: files,
-                formatFileSize: this._formatFileSize,
-                options: this.options
-            });
-            if (result instanceof $) {
-                return result;
-            }
-            return $(this.options.templatesContainer).html(result).children();
-        },
-
-        _renderPreview: function (file, node) {
-            var that = this,
-                options = this.options,
-                dfd = $.Deferred();
-            return ((loadImage && loadImage(
-                file,
-                function (img) {
-                    node.append(img);
-                    that._forceReflow(node);
-                    that._transition(node).done(function () {
-                        dfd.resolveWith(node);
-                    });
-                    if (!$.contains(document.body, node[0])) {
-                        // If the element is not part of the DOM,
-                        // transition events are not triggered,
-                        // so we have to resolve manually:
-                        dfd.resolveWith(node);
-                    }
-                },
-                {
-                    maxWidth: options.previewMaxWidth,
-                    maxHeight: options.previewMaxHeight,
-                    canvas: options.previewAsCanvas
-                }
-            )) || dfd.resolveWith(node)) && dfd;
-        },
-
-        _renderPreviews: function (files, nodes) {
-            var that = this,
-                options = this.options;
-            nodes.find('.preview span').each(function (index, element) {
-                var file = files[index];
-                if (options.previewSourceFileTypes.test(file.type) &&
-                        ($.type(options.previewSourceMaxFileSize) !== 'number' ||
-                        file.size < options.previewSourceMaxFileSize)) {
-                    that._processingQueue = that._processingQueue.pipe(function () {
-                        var dfd = $.Deferred();
-                        that._renderPreview(file, $(element)).done(
-                            function () {
-                                dfd.resolveWith(that);
-                            }
-                        );
-                        return dfd.promise();
-                    });
-                }
+          });
+      },
+      // Callback for the start of each file upload request:
+      send: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var that =
+          $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+        if (
+          data.context &&
+          data.dataType &&
+          data.dataType.substr(0, 6) === 'iframe'
+        ) {
+          // Iframe Transport does not support progress events.
+          // In lack of an indeterminate progress bar, we set
+          // the progress to 100%, showing the full animated bar:
+          data.context
+            .find('.progress')
+            .addClass(!$.support.transition && 'progress-animated')
+            .attr('aria-valuenow', 100)
+            .children()
+            .first()
+            .css('width', '100%');
+        }
+        return that._trigger('sent', e, data);
+      },
+      // Callback for successful uploads:
+      done: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var that =
+            $(this).data('blueimp-fileupload') || $(this).data('fileupload'),
+          getFilesFromResponse =
+            data.getFilesFromResponse || that.options.getFilesFromResponse,
+          files = getFilesFromResponse(data),
+          template,
+          deferred;
+        if (data.context) {
+          data.context.each(function (index) {
+            var file = files[index] || { error: 'Empty file upload result' };
+            deferred = that._addFinishedDeferreds();
+            that._transition($(this)).done(function () {
+              var node = $(this);
+              template = that._renderDownload([file]).replaceAll(node);
+              that._forceReflow(template);
+              that._transition(template).done(function () {
+                data.context = $(this);
+                that._trigger('completed', e, data);
+                that._trigger('finished', e, data);
+                deferred.resolve();
+              });
             });
-            return this._processingQueue;
-        },
-
-        _renderUpload: function (files) {
-            return this._renderTemplate(
-                this.options.uploadTemplate,
-                files
+          });
+        } else {
+          template = that
+            ._renderDownload(files)
+            [that.options.prependFiles ? 'prependTo' : 'appendTo'](
+              that.options.filesContainer
             );
-        },
-
-        _renderDownload: function (files) {
-            return this._renderTemplate(
-                this.options.downloadTemplate,
-                files
-            ).find('a[download]').each(this._enableDragToDesktop).end();
-        },
-
-        _startHandler: function (e) {
-            e.preventDefault();
-            var button = $(this),
-                template = button.closest('.template-upload'),
-                data = template.data('data');
-            if (data && data.submit && !data.jqXHR && data.submit()) {
-                button.prop('disabled', true);
-            }
-        },
-
-        _cancelHandler: function (e) {
-            e.preventDefault();
-            var template = $(this).closest('.template-upload'),
-                data = template.data('data') || {};
-            if (!data.jqXHR) {
-                data.errorThrown = 'abort';
-                e.data.fileupload._trigger('fail', e, data);
+          that._forceReflow(template);
+          deferred = that._addFinishedDeferreds();
+          that._transition(template).done(function () {
+            data.context = $(this);
+            that._trigger('completed', e, data);
+            that._trigger('finished', e, data);
+            deferred.resolve();
+          });
+        }
+      },
+      // Callback for failed (abort or error) uploads:
+      fail: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var that =
+            $(this).data('blueimp-fileupload') || $(this).data('fileupload'),
+          template,
+          deferred;
+        if (data.context) {
+          data.context.each(function (index) {
+            if (data.errorThrown !== 'abort') {
+              var file = data.files[index];
+              file.error =
+                file.error || data.errorThrown || data.i18n('unknownError');
+              deferred = that._addFinishedDeferreds();
+              that._transition($(this)).done(function () {
+                var node = $(this);
+                template = that._renderDownload([file]).replaceAll(node);
+                that._forceReflow(template);
+                that._transition(template).done(function () {
+                  data.context = $(this);
+                  that._trigger('failed', e, data);
+                  that._trigger('finished', e, data);
+                  deferred.resolve();
+                });
+              });
             } else {
-                data.jqXHR.abort();
+              deferred = that._addFinishedDeferreds();
+              that._transition($(this)).done(function () {
+                $(this).remove();
+                that._trigger('failed', e, data);
+                that._trigger('finished', e, data);
+                deferred.resolve();
+              });
             }
-        },
-
-        _deleteHandler: function (e) {
-            e.preventDefault();
-            var button = $(this);
-            e.data.fileupload._trigger('destroy', e, {
-                context: button.closest('.template-download'),
-                url: button.attr('data-url'),
-                type: button.attr('data-type') || 'DELETE',
-                dataType: e.data.fileupload.options.dataType
+          });
+        } else if (data.errorThrown !== 'abort') {
+          data.context = that
+            ._renderUpload(data.files)
+            [that.options.prependFiles ? 'prependTo' : 'appendTo'](
+              that.options.filesContainer
+            )
+            .data('data', data);
+          that._forceReflow(data.context);
+          deferred = that._addFinishedDeferreds();
+          that._transition(data.context).done(function () {
+            data.context = $(this);
+            that._trigger('failed', e, data);
+            that._trigger('finished', e, data);
+            deferred.resolve();
+          });
+        } else {
+          that._trigger('failed', e, data);
+          that._trigger('finished', e, data);
+          that._addFinishedDeferreds().resolve();
+        }
+      },
+      // Callback for upload progress events:
+      progress: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var progress = Math.floor((data.loaded / data.total) * 100);
+        if (data.context) {
+          data.context.each(function () {
+            $(this)
+              .find('.progress')
+              .attr('aria-valuenow', progress)
+              .children()
+              .first()
+              .css('width', progress + '%');
+          });
+        }
+      },
+      // Callback for global upload progress events:
+      progressall: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var $this = $(this),
+          progress = Math.floor((data.loaded / data.total) * 100),
+          globalProgressNode = $this.find('.fileupload-progress'),
+          extendedProgressNode = globalProgressNode.find('.progress-extended');
+        if (extendedProgressNode.length) {
+          extendedProgressNode.html(
+            (
+              $this.data('blueimp-fileupload') || $this.data('fileupload')
+            )._renderExtendedProgress(data)
+          );
+        }
+        globalProgressNode
+          .find('.progress')
+          .attr('aria-valuenow', progress)
+          .children()
+          .first()
+          .css('width', progress + '%');
+      },
+      // Callback for uploads start, equivalent to the global ajaxStart event:
+      start: function (e) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var that =
+          $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+        that._resetFinishedDeferreds();
+        that
+          ._transition($(this).find('.fileupload-progress'))
+          .done(function () {
+            that._trigger('started', e);
+          });
+      },
+      // Callback for uploads stop, equivalent to the global ajaxStop event:
+      stop: function (e) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var that =
+            $(this).data('blueimp-fileupload') || $(this).data('fileupload'),
+          deferred = that._addFinishedDeferreds();
+        $.when.apply($, that._getFinishedDeferreds()).done(function () {
+          that._trigger('stopped', e);
+        });
+        that
+          ._transition($(this).find('.fileupload-progress'))
+          .done(function () {
+            $(this)
+              .find('.progress')
+              .attr('aria-valuenow', '0')
+              .children()
+              .first()
+              .css('width', '0%');
+            $(this).find('.progress-extended').html('&nbsp;');
+            deferred.resolve();
+          });
+      },
+      processstart: function (e) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        $(this).addClass('fileupload-processing');
+      },
+      processstop: function (e) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        $(this).removeClass('fileupload-processing');
+      },
+      // Callback for file deletion:
+      destroy: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        var that =
+            $(this).data('blueimp-fileupload') || $(this).data('fileupload'),
+          removeNode = function () {
+            that._transition(data.context).done(function () {
+              $(this).remove();
+              that._trigger('destroyed', e, data);
             });
-        },
-
-        _forceReflow: function (node) {
-            return $.support.transition && node.length &&
-                node[0].offsetWidth;
-        },
-
-        _transition: function (node) {
-            var dfd = $.Deferred();
-            if ($.support.transition && node.hasClass('fade')) {
-                node.bind(
-                    $.support.transition.end,
-                    function (e) {
-                        // Make sure we don't respond to other transitions events
-                        // in the container element, e.g. from button elements:
-                        if (e.target === node[0]) {
-                            node.unbind($.support.transition.end);
-                            dfd.resolveWith(node);
-                        }
-                    }
-                ).toggleClass('in');
-            } else {
-                node.toggleClass('in');
-                dfd.resolveWith(node);
-            }
-            return dfd;
-        },
-
-        _initButtonBarEventHandlers: function () {
-            var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
-                filesList = this.options.filesContainer,
-                ns = this.options.namespace;
-            fileUploadButtonBar.find('.start')
-                .bind('click.' + ns, function (e) {
-                    e.preventDefault();
-                    filesList.find('.start button').click();
-                });
-            fileUploadButtonBar.find('.cancel')
-                .bind('click.' + ns, function (e) {
-                    e.preventDefault();
-                    filesList.find('.cancel button').click();
-                });
-            fileUploadButtonBar.find('.delete')
-                .bind('click.' + ns, function (e) {
-                    e.preventDefault();
-                    filesList.find('.delete input:checked')
-                        .siblings('button').click();
-                    fileUploadButtonBar.find('.toggle')
-                        .prop('checked', false);
-                });
-            fileUploadButtonBar.find('.toggle')
-                .bind('change.' + ns, function (e) {
-                    filesList.find('.delete input').prop(
-                        'checked',
-                        $(this).is(':checked')
-                    );
-                });
-        },
-
-        _destroyButtonBarEventHandlers: function () {
-            this.element.find('.fileupload-buttonbar button')
-                .unbind('click.' + this.options.namespace);
-            this.element.find('.fileupload-buttonbar .toggle')
-                .unbind('change.' + this.options.namespace);
-        },
-
-        _initEventHandlers: function () {
-            parentWidget.prototype._initEventHandlers.call(this);
-            var eventData = {fileupload: this};
-            this.options.filesContainer
-                .delegate(
-                    '.start button',
-                    'click.' + this.options.namespace,
-                    eventData,
-                    this._startHandler
-                )
-                .delegate(
-                    '.cancel button',
-                    'click.' + this.options.namespace,
-                    eventData,
-                    this._cancelHandler
-                )
-                .delegate(
-                    '.delete button',
-                    'click.' + this.options.namespace,
-                    eventData,
-                    this._deleteHandler
-                );
-            this._initButtonBarEventHandlers();
-        },
-
-        _destroyEventHandlers: function () {
-            var options = this.options;
-            this._destroyButtonBarEventHandlers();
-            options.filesContainer
-                .undelegate('.start button', 'click.' + options.namespace)
-                .undelegate('.cancel button', 'click.' + options.namespace)
-                .undelegate('.delete button', 'click.' + options.namespace);
-            parentWidget.prototype._destroyEventHandlers.call(this);
-        },
-
-        _enableFileInputButton: function () {
-            this.element.find('.fileinput-button input')
-                .prop('disabled', false)
-                .parent().removeClass('disabled');
-        },
-
-        _disableFileInputButton: function () {
-            this.element.find('.fileinput-button input')
-                .prop('disabled', true)
-                .parent().addClass('disabled');
-        },
-
-        _initTemplates: function () {
-            var options = this.options;
-            options.templatesContainer = document.createElement(
-                options.filesContainer.prop('nodeName')
-            );
-            if (tmpl) {
-                if (options.uploadTemplateId) {
-                    options.uploadTemplate = tmpl(options.uploadTemplateId);
-                }
-                if (options.downloadTemplateId) {
-                    options.downloadTemplate = tmpl(options.downloadTemplateId);
-                }
-            }
-        },
-
-        _initFilesContainer: function () {
-            var options = this.options;
-            if (options.filesContainer === undefined) {
-                options.filesContainer = this.element.find('.files');
-            } else if (!(options.filesContainer instanceof $)) {
-                options.filesContainer = $(options.filesContainer);
-            }
-        },
-
-        _stringToRegExp: function (str) {
-            var parts = str.split('/'),
-                modifiers = parts.pop();
-            parts.shift();
-            return new RegExp(parts.join('/'), modifiers);
-        },
-
-        _initRegExpOptions: function () {
-            var options = this.options;
-            if ($.type(options.acceptFileTypes) === 'string') {
-                options.acceptFileTypes = this._stringToRegExp(
-                    options.acceptFileTypes
-                );
-            }
-            if ($.type(options.previewSourceFileTypes) === 'string') {
-                options.previewSourceFileTypes = this._stringToRegExp(
-                    options.previewSourceFileTypes
-                );
-            }
-        },
-
-        _initSpecialOptions: function () {
-            parentWidget.prototype._initSpecialOptions.call(this);
-            this._initFilesContainer();
-            this._initTemplates();
-            this._initRegExpOptions();
-        },
-
-        _create: function () {
-            parentWidget.prototype._create.call(this);
-            this._refreshOptionsList.push(
-                'filesContainer',
-                'uploadTemplateId',
-                'downloadTemplateId'
-            );
-            if (!$.blueimpFP) {
-                this._processingQueue = $.Deferred().resolveWith(this).promise();
-                this.process = function () {
-                    return this._processingQueue;
-                };
-            }
-        },
-
-        enable: function () {
-            var wasDisabled = false;
-            if (this.options.disabled) {
-                wasDisabled = true;
-            }
-            parentWidget.prototype.enable.call(this);
-            if (wasDisabled) {
-                this.element.find('input, button').prop('disabled', false);
-                this._enableFileInputButton();
-            }
-        },
-
-        disable: function () {
-            if (!this.options.disabled) {
-                this.element.find('input, button').prop('disabled', true);
-                this._disableFileInputButton();
+          };
+        if (data.url) {
+          data.dataType = data.dataType || that.options.dataType;
+          $.ajax(data)
+            .done(removeNode)
+            .fail(function () {
+              that._trigger('destroyfailed', e, data);
+            });
+        } else {
+          removeNode();
+        }
+      }
+    },
+
+    _resetFinishedDeferreds: function () {
+      this._finishedUploads = [];
+    },
+
+    _addFinishedDeferreds: function (deferred) {
+      // eslint-disable-next-line new-cap
+      var promise = deferred || $.Deferred();
+      this._finishedUploads.push(promise);
+      return promise;
+    },
+
+    _getFinishedDeferreds: function () {
+      return this._finishedUploads;
+    },
+
+    // Link handler, that allows to download files
+    // by drag & drop of the links to the desktop:
+    _enableDragToDesktop: function () {
+      var link = $(this),
+        url = link.prop('href'),
+        name = link.prop('download'),
+        type = 'application/octet-stream';
+      link.on('dragstart', function (e) {
+        try {
+          e.originalEvent.dataTransfer.setData(
+            'DownloadURL',
+            [type, name, url].join(':')
+          );
+        } catch (ignore) {
+          // Ignore exceptions
+        }
+      });
+    },
+
+    _formatFileSize: function (bytes) {
+      if (typeof bytes !== 'number') {
+        return '';
+      }
+      if (bytes >= 1000000000) {
+        return (bytes / 1000000000).toFixed(2) + ' GB';
+      }
+      if (bytes >= 1000000) {
+        return (bytes / 1000000).toFixed(2) + ' MB';
+      }
+      return (bytes / 1000).toFixed(2) + ' KB';
+    },
+
+    _formatBitrate: function (bits) {
+      if (typeof bits !== 'number') {
+        return '';
+      }
+      if (bits >= 1000000000) {
+        return (bits / 1000000000).toFixed(2) + ' Gbit/s';
+      }
+      if (bits >= 1000000) {
+        return (bits / 1000000).toFixed(2) + ' Mbit/s';
+      }
+      if (bits >= 1000) {
+        return (bits / 1000).toFixed(2) + ' kbit/s';
+      }
+      return bits.toFixed(2) + ' bit/s';
+    },
+
+    _formatTime: function (seconds) {
+      var date = new Date(seconds * 1000),
+        days = Math.floor(seconds / 86400);
+      days = days ? days + 'd ' : '';
+      return (
+        days +
+        ('0' + date.getUTCHours()).slice(-2) +
+        ':' +
+        ('0' + date.getUTCMinutes()).slice(-2) +
+        ':' +
+        ('0' + date.getUTCSeconds()).slice(-2)
+      );
+    },
+
+    _formatPercentage: function (floatValue) {
+      return (floatValue * 100).toFixed(2) + ' %';
+    },
+
+    _renderExtendedProgress: function (data) {
+      return (
+        this._formatBitrate(data.bitrate) +
+        ' | ' +
+        this._formatTime(((data.total - data.loaded) * 8) / data.bitrate) +
+        ' | ' +
+        this._formatPercentage(data.loaded / data.total) +
+        ' | ' +
+        this._formatFileSize(data.loaded) +
+        ' / ' +
+        this._formatFileSize(data.total)
+      );
+    },
+
+    _renderTemplate: function (func, files) {
+      if (!func) {
+        return $();
+      }
+      var result = func({
+        files: files,
+        formatFileSize: this._formatFileSize,
+        options: this.options
+      });
+      if (result instanceof $) {
+        return result;
+      }
+      return $(this.options.templatesContainer).html(result).children();
+    },
+
+    _renderPreviews: function (data) {
+      data.context.find('.preview').each(function (index, elm) {
+        $(elm).empty().append(data.files[index].preview);
+      });
+    },
+
+    _renderUpload: function (files) {
+      return this._renderTemplate(this.options.uploadTemplate, files);
+    },
+
+    _renderDownload: function (files) {
+      return this._renderTemplate(this.options.downloadTemplate, files)
+        .find('a[download]')
+        .each(this._enableDragToDesktop)
+        .end();
+    },
+
+    _editHandler: function (e) {
+      e.preventDefault();
+      if (!this.options.edit) return;
+      var that = this,
+        button = $(e.currentTarget),
+        template = button.closest('.template-upload'),
+        data = template.data('data'),
+        index = button.data().index;
+      this.options.edit(data.files[index]).then(function (file) {
+        if (!file) return;
+        data.files[index] = file;
+        data.context.addClass('processing');
+        template.find('.edit,.start').prop('disabled', true);
+        $(that.element)
+          .fileupload('process', data)
+          .always(function () {
+            template
+              .find('.size')
+              .text(that._formatFileSize(data.files[index].size));
+            data.context.removeClass('processing');
+            that._renderPreviews(data);
+          })
+          .done(function () {
+            template.find('.edit,.start').prop('disabled', false);
+          })
+          .fail(function () {
+            template.find('.edit').prop('disabled', false);
+            var error = data.files[index].error;
+            if (error) {
+              template.find('.error').text(error);
             }
-            parentWidget.prototype.disable.call(this);
+          });
+      });
+    },
+
+    _startHandler: function (e) {
+      e.preventDefault();
+      var button = $(e.currentTarget),
+        template = button.closest('.template-upload'),
+        data = template.data('data');
+      button.prop('disabled', true);
+      if (data && data.submit) {
+        data.submit();
+      }
+    },
+
+    _cancelHandler: function (e) {
+      e.preventDefault();
+      var template = $(e.currentTarget).closest(
+          '.template-upload,.template-download'
+        ),
+        data = template.data('data') || {};
+      data.context = data.context || template;
+      if (data.abort) {
+        data.abort();
+      } else {
+        data.errorThrown = 'abort';
+        this._trigger('fail', e, data);
+      }
+    },
+
+    _deleteHandler: function (e) {
+      e.preventDefault();
+      var button = $(e.currentTarget);
+      this._trigger(
+        'destroy',
+        e,
+        $.extend(
+          {
+            context: button.closest('.template-download'),
+            type: 'DELETE'
+          },
+          button.data()
+        )
+      );
+    },
+
+    _forceReflow: function (node) {
+      return $.support.transition && node.length && node[0].offsetWidth;
+    },
+
+    _transition: function (node) {
+      // eslint-disable-next-line new-cap
+      var dfd = $.Deferred();
+      if (
+        $.support.transition &&
+        node.hasClass('fade') &&
+        node.is(':visible')
+      ) {
+        var transitionEndHandler = function (e) {
+          // Make sure we don't respond to other transition events
+          // in the container element, e.g. from button elements:
+          if (e.target === node[0]) {
+            node.off($.support.transition.end, transitionEndHandler);
+            dfd.resolveWith(node);
+          }
+        };
+        node
+          .on($.support.transition.end, transitionEndHandler)
+          .toggleClass(this.options.showElementClass);
+      } else {
+        node.toggleClass(this.options.showElementClass);
+        dfd.resolveWith(node);
+      }
+      return dfd;
+    },
+
+    _initButtonBarEventHandlers: function () {
+      var fileUploadButtonBar = this.element.find('.fileupload-buttonbar'),
+        filesList = this.options.filesContainer;
+      this._on(fileUploadButtonBar.find('.start'), {
+        click: function (e) {
+          e.preventDefault();
+          filesList.find('.start').trigger('click');
         }
-
-    });
-
-}));
+      });
+      this._on(fileUploadButtonBar.find('.cancel'), {
+        click: function (e) {
+          e.preventDefault();
+          filesList.find('.cancel').trigger('click');
+        }
+      });
+      this._on(fileUploadButtonBar.find('.delete'), {
+        click: function (e) {
+          e.preventDefault();
+          filesList
+            .find('.toggle:checked')
+            .closest('.template-download')
+            .find('.delete')
+            .trigger('click');
+          fileUploadButtonBar.find('.toggle').prop('checked', false);
+        }
+      });
+      this._on(fileUploadButtonBar.find('.toggle'), {
+        change: function (e) {
+          filesList
+            .find('.toggle')
+            .prop('checked', $(e.currentTarget).is(':checked'));
+        }
+      });
+    },
+
+    _destroyButtonBarEventHandlers: function () {
+      this._off(
+        this.element
+          .find('.fileupload-buttonbar')
+          .find('.start, .cancel, .delete'),
+        'click'
+      );
+      this._off(this.element.find('.fileupload-buttonbar .toggle'), 'change.');
+    },
+
+    _initEventHandlers: function () {
+      this._super();
+      this._on(this.options.filesContainer, {
+        'click .edit': this._editHandler,
+        'click .start': this._startHandler,
+        'click .cancel': this._cancelHandler,
+        'click .delete': this._deleteHandler
+      });
+      this._initButtonBarEventHandlers();
+    },
+
+    _destroyEventHandlers: function () {
+      this._destroyButtonBarEventHandlers();
+      this._off(this.options.filesContainer, 'click');
+      this._super();
+    },
+
+    _enableFileInputButton: function () {
+      this.element
+        .find('.fileinput-button input')
+        .prop('disabled', false)
+        .parent()
+        .removeClass('disabled');
+    },
+
+    _disableFileInputButton: function () {
+      this.element
+        .find('.fileinput-button input')
+        .prop('disabled', true)
+        .parent()
+        .addClass('disabled');
+    },
+
+    _initTemplates: function () {
+      var options = this.options;
+      options.templatesContainer = this.document[0].createElement(
+        options.filesContainer.prop('nodeName')
+      );
+      if (tmpl) {
+        if (options.uploadTemplateId) {
+          options.uploadTemplate = tmpl(options.uploadTemplateId);
+        }
+        if (options.downloadTemplateId) {
+          options.downloadTemplate = tmpl(options.downloadTemplateId);
+        }
+      }
+    },
+
+    _initFilesContainer: function () {
+      var options = this.options;
+      if (options.filesContainer === undefined) {
+        options.filesContainer = this.element.find('.files');
+      } else if (!(options.filesContainer instanceof $)) {
+        options.filesContainer = $(options.filesContainer);
+      }
+    },
+
+    _initSpecialOptions: function () {
+      this._super();
+      this._initFilesContainer();
+      this._initTemplates();
+    },
+
+    _create: function () {
+      this._super();
+      this._resetFinishedDeferreds();
+      if (!$.support.fileInput) {
+        this._disableFileInputButton();
+      }
+    },
+
+    enable: function () {
+      var wasDisabled = false;
+      if (this.options.disabled) {
+        wasDisabled = true;
+      }
+      this._super();
+      if (wasDisabled) {
+        this.element.find('input, button').prop('disabled', false);
+        this._enableFileInputButton();
+      }
+    },
+
+    disable: function () {
+      if (!this.options.disabled) {
+        this.element.find('input, button').prop('disabled', true);
+        this._disableFileInputButton();
+      }
+      this._super();
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
new file mode 100644
index 0000000000000..a277efc46d774
--- /dev/null
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
@@ -0,0 +1,119 @@
+/*
+ * jQuery File Upload Validation Plugin
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, require */
+
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery', './jquery.fileupload-process'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'), require('./jquery.fileupload-process'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
+
+  // Append to the default processQueue:
+  $.blueimp.fileupload.prototype.options.processQueue.push({
+    action: 'validate',
+    // Always trigger this action,
+    // even if the previous action was rejected:
+    always: true,
+    // Options taken from the global options map:
+    acceptFileTypes: '@',
+    maxFileSize: '@',
+    minFileSize: '@',
+    maxNumberOfFiles: '@',
+    disabled: '@disableValidation'
+  });
+
+  // The File Upload Validation plugin extends the fileupload widget
+  // with file validation functionality:
+  $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+    options: {
+      /*
+            // The regular expression for allowed file types, matches
+            // against either file type or file name:
+            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
+            // The maximum allowed file size in bytes:
+            maxFileSize: 10000000, // 10 MB
+            // The minimum allowed file size in bytes:
+            minFileSize: undefined, // No minimal file size
+            // The limit of files to be uploaded:
+            maxNumberOfFiles: 10,
+            */
+
+      // Function returning the current number of files,
+      // has to be overriden for maxNumberOfFiles validation:
+      getNumberOfFiles: $.noop,
+
+      // Error and info messages:
+      messages: {
+        maxNumberOfFiles: 'Maximum number of files exceeded',
+        acceptFileTypes: 'File type not allowed',
+        maxFileSize: 'File is too large',
+        minFileSize: 'File is too small'
+      }
+    },
+
+    processActions: {
+      validate: function (data, options) {
+        if (options.disabled) {
+          return data;
+        }
+        // eslint-disable-next-line new-cap
+        var dfd = $.Deferred(),
+          settings = this.options,
+          file = data.files[data.index],
+          fileSize;
+        if (options.minFileSize || options.maxFileSize) {
+          fileSize = file.size;
+        }
+        if (
+          $.type(options.maxNumberOfFiles) === 'number' &&
+          (settings.getNumberOfFiles() || 0) + data.files.length >
+            options.maxNumberOfFiles
+        ) {
+          file.error = settings.i18n('maxNumberOfFiles');
+        } else if (
+          options.acceptFileTypes &&
+          !(
+            options.acceptFileTypes.test(file.type) ||
+            options.acceptFileTypes.test(file.name)
+          )
+        ) {
+          file.error = settings.i18n('acceptFileTypes');
+        } else if (fileSize > options.maxFileSize) {
+          file.error = settings.i18n('maxFileSize');
+        } else if (
+          $.type(fileSize) === 'number' &&
+          fileSize < options.minFileSize
+        ) {
+          file.error = settings.i18n('minFileSize');
+        } else {
+          delete file.error;
+        }
+        if (file.error || data.files.error) {
+          data.files.error = true;
+          dfd.rejectWith(this, [data]);
+        } else {
+          dfd.resolveWith(this, [data]);
+        }
+        return dfd.promise();
+      }
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-video.js b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
new file mode 100644
index 0000000000000..5dc78f36bb829
--- /dev/null
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
@@ -0,0 +1,101 @@
+/*
+ * jQuery File Upload Video Preview Plugin
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, require */
+
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery', 'load-image', './jquery.fileupload-process'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(
+      require('jquery'),
+      require('blueimp-load-image/js/load-image'),
+      require('./jquery.fileupload-process')
+    );
+  } else {
+    // Browser globals:
+    factory(window.jQuery, window.loadImage);
+  }
+})(function ($, loadImage) {
+  'use strict';
+
+  // Prepend to the default processQueue:
+  $.blueimp.fileupload.prototype.options.processQueue.unshift(
+    {
+      action: 'loadVideo',
+      // Use the action as prefix for the "@" options:
+      prefix: true,
+      fileTypes: '@',
+      maxFileSize: '@',
+      disabled: '@disableVideoPreview'
+    },
+    {
+      action: 'setVideo',
+      name: '@videoPreviewName',
+      disabled: '@disableVideoPreview'
+    }
+  );
+
+  // The File Upload Video Preview plugin extends the fileupload widget
+  // with video preview functionality:
+  $.widget('blueimp.fileupload', $.blueimp.fileupload, {
+    options: {
+      // The regular expression for the types of video files to load,
+      // matched against the file type:
+      loadVideoFileTypes: /^video\/.*$/
+    },
+
+    _videoElement: document.createElement('video'),
+
+    processActions: {
+      // Loads the video file given via data.files and data.index
+      // as video element if the browser supports playing it.
+      // Accepts the options fileTypes (regular expression)
+      // and maxFileSize (integer) to limit the files to load:
+      loadVideo: function (data, options) {
+        if (options.disabled) {
+          return data;
+        }
+        var file = data.files[data.index],
+          url,
+          video;
+        if (
+          this._videoElement.canPlayType &&
+          this._videoElement.canPlayType(file.type) &&
+          ($.type(options.maxFileSize) !== 'number' ||
+            file.size <= options.maxFileSize) &&
+          (!options.fileTypes || options.fileTypes.test(file.type))
+        ) {
+          url = loadImage.createObjectURL(file);
+          if (url) {
+            video = this._videoElement.cloneNode(false);
+            video.src = url;
+            video.controls = true;
+            data.video = video;
+            return data;
+          }
+        }
+        return data;
+      },
+
+      // Sets the video element as a property of the file object:
+      setVideo: function (data, options) {
+        if (data.video && !options.disabled) {
+          data.files[data.index][options.name || 'preview'] = data.video;
+        }
+        return data;
+      }
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload.js b/lib/web/jquery/fileUploader/jquery.fileupload.js
index 676f8aa1e8058..184d347216409 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload.js
@@ -1,1081 +1,1606 @@
 /*
- * jQuery File Upload Plugin 5.16.4
+ * jQuery File Upload Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2010, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global define, window, document, Blob, FormData, location */
+/* global define, require */
+/* eslint-disable new-cap */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'jquery-ui-modules/widget',
-            'jquery/fileUploader/jquery.iframe-transport'
-        ], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    // The FileReader API is not actually used, but works as feature detection,
-    // as e.g. Safari supports XHR file uploads via the FormData API,
-    // but not non-multipart XHR file uploads:
-    $.support.xhrFileUpload = !!(window.XMLHttpRequestUpload && window.FileReader);
-    $.support.xhrFormDataFileUpload = !!window.FormData;
-
-    // The fileupload widget listens for change events on file input fields defined
-    // via fileInput setting and paste or drop events of the given dropZone.
-    // In addition to the default jQuery Widget methods, the fileupload widget
-    // exposes the "add" and "send" methods, to add or directly send files using
-    // the fileupload API.
-    // By default, files added via file input selection, paste, drag & drop or
-    // "add" method are uploaded immediately, but it is possible to override
-    // the "add" callback option to queue file uploads.
-    $.widget('blueimp.fileupload', {
-
-        options: {
-            // The namespace used for event handler binding on the dropZone and
-            // fileInput collections.
-            // If not set, the name of the widget ("fileupload") is used.
-            namespace: undefined,
-            // The drop target collection, by the default the complete document.
-            // Set to null or an empty collection to disable drag & drop support:
-            dropZone: $(document),
-            // The file input field collection, that is listened for change events.
-            // If undefined, it is set to the file input fields inside
-            // of the widget element on plugin initialization.
-            // Set to null or an empty collection to disable the change listener.
-            fileInput: undefined,
-            // By default, the file input field is replaced with a clone after
-            // each input field change event. This is required for iframe transport
-            // queues and allows change events to be fired for the same file
-            // selection, but can be disabled by setting the following option to false:
-            replaceFileInput: true,
-            // The parameter name for the file form data (the request argument name).
-            // If undefined or empty, the name property of the file input field is
-            // used, or "files[]" if the file input name property is also empty,
-            // can be a string or an array of strings:
-            paramName: undefined,
-            // By default, each file of a selection is uploaded using an individual
-            // request for XHR type uploads. Set to false to upload file
-            // selections in one request each:
-            singleFileUploads: true,
-            // To limit the number of files uploaded with one XHR request,
-            // set the following option to an integer greater than 0:
-            limitMultiFileUploads: undefined,
-            // Set the following option to true to issue all file upload requests
-            // in a sequential order:
-            sequentialUploads: false,
-            // To limit the number of concurrent uploads,
-            // set the following option to an integer greater than 0:
-            limitConcurrentUploads: undefined,
-            // Set the following option to true to force iframe transport uploads:
-            forceIframeTransport: false,
-            // Set the following option to the location of a redirect url on the
-            // origin server, for cross-domain iframe transport uploads:
-            redirect: undefined,
-            // The parameter name for the redirect url, sent as part of the form
-            // data and set to 'redirect' if this option is empty:
-            redirectParamName: undefined,
-            // Set the following option to the location of a postMessage window,
-            // to enable postMessage transport uploads:
-            postMessage: undefined,
-            // By default, XHR file uploads are sent as multipart/form-data.
-            // The iframe transport is always using multipart/form-data.
-            // Set to false to enable non-multipart XHR uploads:
-            multipart: true,
-            // To upload large files in smaller chunks, set the following option
-            // to a preferred maximum chunk size. If set to 0, null or undefined,
-            // or the browser does not support the required Blob API, files will
-            // be uploaded as a whole.
-            maxChunkSize: undefined,
-            // When a non-multipart upload or a chunked multipart upload has been
-            // aborted, this option can be used to resume the upload by setting
-            // it to the size of the already uploaded bytes. This option is most
-            // useful when modifying the options object inside of the "add" or
-            // "send" callbacks, as the options are cloned for each file upload.
-            uploadedBytes: undefined,
-            // By default, failed (abort or error) file uploads are removed from the
-            // global progress calculation. Set the following option to false to
-            // prevent recalculating the global progress data:
-            recalculateProgress: true,
-            // Interval in milliseconds to calculate and trigger progress events:
-            progressInterval: 100,
-            // Interval in milliseconds to calculate progress bitrate:
-            bitrateInterval: 500,
-
-            // Additional form data to be sent along with the file uploads can be set
-            // using this option, which accepts an array of objects with name and
-            // value properties, a function returning such an array, a FormData
-            // object (for XHR file uploads), or a simple object.
-            // The form of the first fileInput is given as parameter to the function:
-            formData: function (form) {
-                return form.serializeArray();
-            },
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop, paste or add API call).
-            // If the singleFileUploads option is enabled, this callback will be
-            // called once for each file in the selection for XHR file uplaods, else
-            // once for each file selection.
-            // The upload starts when the submit method is invoked on the data parameter.
-            // The data object contains a files property holding the added files
-            // and allows to override plugin options as well as define ajax settings.
-            // Listeners for this callback can also be bound the following way:
-            // .bind('fileuploadadd', func);
-            // data.submit() returns a Promise object and allows to attach additional
-            // handlers using jQuery's Deferred callbacks:
-            // data.submit().done(func).fail(func).always(func);
-            add: function (e, data) {
-                data.submit();
-            },
-
-            // Other callbacks:
-            // Callback for the submit event of each file upload:
-            // submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
-            // Callback for the start of each file upload request:
-            // send: function (e, data) {}, // .bind('fileuploadsend', func);
-            // Callback for successful uploads:
-            // done: function (e, data) {}, // .bind('fileuploaddone', func);
-            // Callback for failed (abort or error) uploads:
-            // fail: function (e, data) {}, // .bind('fileuploadfail', func);
-            // Callback for completed (success, abort or error) requests:
-            // always: function (e, data) {}, // .bind('fileuploadalways', func);
-            // Callback for upload progress events:
-            // progress: function (e, data) {}, // .bind('fileuploadprogress', func);
-            // Callback for global upload progress events:
-            // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            // start: function (e) {}, // .bind('fileuploadstart', func);
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            // stop: function (e) {}, // .bind('fileuploadstop', func);
-            // Callback for change events of the fileInput collection:
-            // change: function (e, data) {}, // .bind('fileuploadchange', func);
-            // Callback for paste events to the dropZone collection:
-            // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
-            // Callback for drop events of the dropZone collection:
-            // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
-            // Callback for dragover events of the dropZone collection:
-            // dragover: function (e) {}, // .bind('fileuploaddragover', func);
-
-            // The plugin options are used as settings object for the ajax calls.
-            // The following are jQuery ajax settings required for the file uploads:
-            processData: false,
-            contentType: false,
-            cache: false
-        },
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery', 'jquery-ui/ui/widget'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'), require('./vendor/jquery.ui.widget'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
 
-        // A list of options that require a refresh after assigning a new value:
-        _refreshOptionsList: [
-            'namespace',
-            'dropZone',
-            'fileInput',
-            'multipart',
-            'forceIframeTransport'
-        ],
-
-        _BitrateTimer: function () {
-            this.timestamp = +(new Date());
-            this.loaded = 0;
-            this.bitrate = 0;
-            this.getBitrate = function (now, loaded, interval) {
-                var timeDiff = now - this.timestamp;
-                if (!this.bitrate || !interval || timeDiff > interval) {
-                    this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
-                    this.loaded = loaded;
-                    this.timestamp = now;
-                }
-                return this.bitrate;
-            };
-        },
+  // Detect file input support, based on
+  // https://viljamis.com/2012/file-upload-support-on-mobile/
+  $.support.fileInput = !(
+    new RegExp(
+      // Handle devices which give false positives for the feature detection:
+      '(Android (1\\.[0156]|2\\.[01]))' +
+        '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
+        '|(w(eb)?OSBrowser)|(webOS)' +
+        '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
+    ).test(window.navigator.userAgent) ||
+    // Feature detection for all other devices:
+    $('<input type="file"/>').prop('disabled')
+  );
 
-        _isXHRUpload: function (options) {
-            return !options.forceIframeTransport &&
-                ((!options.multipart && $.support.xhrFileUpload) ||
-                $.support.xhrFormDataFileUpload);
-        },
+  // The FileReader API is not actually used, but works as feature detection,
+  // as some Safari versions (5?) support XHR file uploads via the FormData API,
+  // but not non-multipart XHR file uploads.
+  // window.XMLHttpRequestUpload is not available on IE10, so we check for
+  // window.ProgressEvent instead to detect XHR2 file upload capability:
+  $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader);
+  $.support.xhrFormDataFileUpload = !!window.FormData;
 
-        _getFormData: function (options) {
-            var formData;
-            if (typeof options.formData === 'function') {
-                return options.formData(options.form);
-            }
-			if ($.isArray(options.formData)) {
-                return options.formData;
-            }
-			if (options.formData) {
-                formData = [];
-                $.each(options.formData, function (name, value) {
-                    formData.push({name: name, value: value});
-                });
-                return formData;
-            }
-            return [];
-        },
+  // Detect support for Blob slicing (required for chunked uploads):
+  $.support.blobSlice =
+    window.Blob &&
+    (Blob.prototype.slice ||
+      Blob.prototype.webkitSlice ||
+      Blob.prototype.mozSlice);
 
-        _getTotal: function (files) {
-            var total = 0;
-            $.each(files, function (index, file) {
-                total += file.size || 1;
-            });
-            return total;
-        },
+  /**
+   * Helper function to create drag handlers for dragover/dragenter/dragleave
+   *
+   * @param {string} type Event type
+   * @returns {Function} Drag handler
+   */
+  function getDragHandler(type) {
+    var isDragOver = type === 'dragover';
+    return function (e) {
+      e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+      var dataTransfer = e.dataTransfer;
+      if (
+        dataTransfer &&
+        $.inArray('Files', dataTransfer.types) !== -1 &&
+        this._trigger(type, $.Event(type, { delegatedEvent: e })) !== false
+      ) {
+        e.preventDefault();
+        if (isDragOver) {
+          dataTransfer.dropEffect = 'copy';
+        }
+      }
+    };
+  }
+
+  // The fileupload widget listens for change events on file input fields defined
+  // via fileInput setting and paste or drop events of the given dropZone.
+  // In addition to the default jQuery Widget methods, the fileupload widget
+  // exposes the "add" and "send" methods, to add or directly send files using
+  // the fileupload API.
+  // By default, files added via file input selection, paste, drag & drop or
+  // "add" method are uploaded immediately, but it is possible to override
+  // the "add" callback option to queue file uploads.
+  $.widget('blueimp.fileupload', {
+    options: {
+      // The drop target element(s), by the default the complete document.
+      // Set to null to disable drag & drop support:
+      dropZone: $(document),
+      // The paste target element(s), by the default undefined.
+      // Set to a DOM node or jQuery object to enable file pasting:
+      pasteZone: undefined,
+      // The file input field(s), that are listened to for change events.
+      // If undefined, it is set to the file input fields inside
+      // of the widget element on plugin initialization.
+      // Set to null to disable the change listener.
+      fileInput: undefined,
+      // By default, the file input field is replaced with a clone after
+      // each input field change event. This is required for iframe transport
+      // queues and allows change events to be fired for the same file
+      // selection, but can be disabled by setting the following option to false:
+      replaceFileInput: true,
+      // The parameter name for the file form data (the request argument name).
+      // If undefined or empty, the name property of the file input field is
+      // used, or "files[]" if the file input name property is also empty,
+      // can be a string or an array of strings:
+      paramName: undefined,
+      // By default, each file of a selection is uploaded using an individual
+      // request for XHR type uploads. Set to false to upload file
+      // selections in one request each:
+      singleFileUploads: true,
+      // To limit the number of files uploaded with one XHR request,
+      // set the following option to an integer greater than 0:
+      limitMultiFileUploads: undefined,
+      // The following option limits the number of files uploaded with one
+      // XHR request to keep the request size under or equal to the defined
+      // limit in bytes:
+      limitMultiFileUploadSize: undefined,
+      // Multipart file uploads add a number of bytes to each uploaded file,
+      // therefore the following option adds an overhead for each file used
+      // in the limitMultiFileUploadSize configuration:
+      limitMultiFileUploadSizeOverhead: 512,
+      // Set the following option to true to issue all file upload requests
+      // in a sequential order:
+      sequentialUploads: false,
+      // To limit the number of concurrent uploads,
+      // set the following option to an integer greater than 0:
+      limitConcurrentUploads: undefined,
+      // Set the following option to true to force iframe transport uploads:
+      forceIframeTransport: false,
+      // Set the following option to the location of a redirect url on the
+      // origin server, for cross-domain iframe transport uploads:
+      redirect: undefined,
+      // The parameter name for the redirect url, sent as part of the form
+      // data and set to 'redirect' if this option is empty:
+      redirectParamName: undefined,
+      // Set the following option to the location of a postMessage window,
+      // to enable postMessage transport uploads:
+      postMessage: undefined,
+      // By default, XHR file uploads are sent as multipart/form-data.
+      // The iframe transport is always using multipart/form-data.
+      // Set to false to enable non-multipart XHR uploads:
+      multipart: true,
+      // To upload large files in smaller chunks, set the following option
+      // to a preferred maximum chunk size. If set to 0, null or undefined,
+      // or the browser does not support the required Blob API, files will
+      // be uploaded as a whole.
+      maxChunkSize: undefined,
+      // When a non-multipart upload or a chunked multipart upload has been
+      // aborted, this option can be used to resume the upload by setting
+      // it to the size of the already uploaded bytes. This option is most
+      // useful when modifying the options object inside of the "add" or
+      // "send" callbacks, as the options are cloned for each file upload.
+      uploadedBytes: undefined,
+      // By default, failed (abort or error) file uploads are removed from the
+      // global progress calculation. Set the following option to false to
+      // prevent recalculating the global progress data:
+      recalculateProgress: true,
+      // Interval in milliseconds to calculate and trigger progress events:
+      progressInterval: 100,
+      // Interval in milliseconds to calculate progress bitrate:
+      bitrateInterval: 500,
+      // By default, uploads are started automatically when adding files:
+      autoUpload: true,
+      // By default, duplicate file names are expected to be handled on
+      // the server-side. If this is not possible (e.g. when uploading
+      // files directly to Amazon S3), the following option can be set to
+      // an empty object or an object mapping existing filenames, e.g.:
+      // { "image.jpg": true, "image (1).jpg": true }
+      // If it is set, all files will be uploaded with unique filenames,
+      // adding increasing number suffixes if necessary, e.g.:
+      // "image (2).jpg"
+      uniqueFilenames: undefined,
+
+      // Error and info messages:
+      messages: {
+        uploadedBytes: 'Uploaded bytes exceed file size'
+      },
+
+      // Translation function, gets the message key to be translated
+      // and an object with context specific data as arguments:
+      i18n: function (message, context) {
+        // eslint-disable-next-line no-param-reassign
+        message = this.messages[message] || message.toString();
+        if (context) {
+          $.each(context, function (key, value) {
+            // eslint-disable-next-line no-param-reassign
+            message = message.replace('{' + key + '}', value);
+          });
+        }
+        return message;
+      },
+
+      // Additional form data to be sent along with the file uploads can be set
+      // using this option, which accepts an array of objects with name and
+      // value properties, a function returning such an array, a FormData
+      // object (for XHR file uploads), or a simple object.
+      // The form of the first fileInput is given as parameter to the function:
+      formData: function (form) {
+        return form.serializeArray();
+      },
+
+      // The add callback is invoked as soon as files are added to the fileupload
+      // widget (via file input selection, drag & drop, paste or add API call).
+      // If the singleFileUploads option is enabled, this callback will be
+      // called once for each file in the selection for XHR file uploads, else
+      // once for each file selection.
+      //
+      // The upload starts when the submit method is invoked on the data parameter.
+      // The data object contains a files property holding the added files
+      // and allows you to override plugin options as well as define ajax settings.
+      //
+      // Listeners for this callback can also be bound the following way:
+      // .on('fileuploadadd', func);
+      //
+      // data.submit() returns a Promise object and allows to attach additional
+      // handlers using jQuery's Deferred callbacks:
+      // data.submit().done(func).fail(func).always(func);
+      add: function (e, data) {
+        if (e.isDefaultPrevented()) {
+          return false;
+        }
+        if (
+          data.autoUpload ||
+          (data.autoUpload !== false &&
+            $(this).fileupload('option', 'autoUpload'))
+        ) {
+          data.process().done(function () {
+            data.submit();
+          });
+        }
+      },
+
+      // Other callbacks:
+
+      // Callback for the submit event of each file upload:
+      // submit: function (e, data) {}, // .on('fileuploadsubmit', func);
+
+      // Callback for the start of each file upload request:
+      // send: function (e, data) {}, // .on('fileuploadsend', func);
+
+      // Callback for successful uploads:
+      // done: function (e, data) {}, // .on('fileuploaddone', func);
+
+      // Callback for failed (abort or error) uploads:
+      // fail: function (e, data) {}, // .on('fileuploadfail', func);
+
+      // Callback for completed (success, abort or error) requests:
+      // always: function (e, data) {}, // .on('fileuploadalways', func);
 
-        _onProgress: function (e, data) {
-            if (e.lengthComputable) {
-                var now = +(new Date()),
-                    total,
-                    loaded;
-                if (data._time && data.progressInterval &&
-                        (now - data._time < data.progressInterval) &&
-                        e.loaded !== e.total) {
-                    return;
+      // Callback for upload progress events:
+      // progress: function (e, data) {}, // .on('fileuploadprogress', func);
+
+      // Callback for global upload progress events:
+      // progressall: function (e, data) {}, // .on('fileuploadprogressall', func);
+
+      // Callback for uploads start, equivalent to the global ajaxStart event:
+      // start: function (e) {}, // .on('fileuploadstart', func);
+
+      // Callback for uploads stop, equivalent to the global ajaxStop event:
+      // stop: function (e) {}, // .on('fileuploadstop', func);
+
+      // Callback for change events of the fileInput(s):
+      // change: function (e, data) {}, // .on('fileuploadchange', func);
+
+      // Callback for paste events to the pasteZone(s):
+      // paste: function (e, data) {}, // .on('fileuploadpaste', func);
+
+      // Callback for drop events of the dropZone(s):
+      // drop: function (e, data) {}, // .on('fileuploaddrop', func);
+
+      // Callback for dragover events of the dropZone(s):
+      // dragover: function (e) {}, // .on('fileuploaddragover', func);
+
+      // Callback before the start of each chunk upload request (before form data initialization):
+      // chunkbeforesend: function (e, data) {}, // .on('fileuploadchunkbeforesend', func);
+
+      // Callback for the start of each chunk upload request:
+      // chunksend: function (e, data) {}, // .on('fileuploadchunksend', func);
+
+      // Callback for successful chunk uploads:
+      // chunkdone: function (e, data) {}, // .on('fileuploadchunkdone', func);
+
+      // Callback for failed (abort or error) chunk uploads:
+      // chunkfail: function (e, data) {}, // .on('fileuploadchunkfail', func);
+
+      // Callback for completed (success, abort or error) chunk upload requests:
+      // chunkalways: function (e, data) {}, // .on('fileuploadchunkalways', func);
+
+      // The plugin options are used as settings object for the ajax calls.
+      // The following are jQuery ajax settings required for the file uploads:
+      processData: false,
+      contentType: false,
+      cache: false,
+      timeout: 0
+    },
+
+    // jQuery versions before 1.8 require promise.pipe if the return value is
+    // used, as promise.then in older versions has a different behavior, see:
+    // https://blog.jquery.com/2012/08/09/jquery-1-8-released/
+    // https://bugs.jquery.com/ticket/11010
+    // https://github.com/blueimp/jQuery-File-Upload/pull/3435
+    _promisePipe: (function () {
+      var parts = $.fn.jquery.split('.');
+      return Number(parts[0]) > 1 || Number(parts[1]) > 7 ? 'then' : 'pipe';
+    })(),
+
+    // A list of options that require reinitializing event listeners and/or
+    // special initialization code:
+    _specialOptions: [
+      'fileInput',
+      'dropZone',
+      'pasteZone',
+      'multipart',
+      'forceIframeTransport'
+    ],
+
+    _blobSlice:
+      $.support.blobSlice &&
+      function () {
+        var slice = this.slice || this.webkitSlice || this.mozSlice;
+        return slice.apply(this, arguments);
+      },
+
+    _BitrateTimer: function () {
+      this.timestamp = Date.now ? Date.now() : new Date().getTime();
+      this.loaded = 0;
+      this.bitrate = 0;
+      this.getBitrate = function (now, loaded, interval) {
+        var timeDiff = now - this.timestamp;
+        if (!this.bitrate || !interval || timeDiff > interval) {
+          this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
+          this.loaded = loaded;
+          this.timestamp = now;
+        }
+        return this.bitrate;
+      };
+    },
+
+    _isXHRUpload: function (options) {
+      return (
+        !options.forceIframeTransport &&
+        ((!options.multipart && $.support.xhrFileUpload) ||
+          $.support.xhrFormDataFileUpload)
+      );
+    },
+
+    _getFormData: function (options) {
+      var formData;
+      if ($.type(options.formData) === 'function') {
+        return options.formData(options.form);
+      }
+      if ($.isArray(options.formData)) {
+        return options.formData;
+      }
+      if ($.type(options.formData) === 'object') {
+        formData = [];
+        $.each(options.formData, function (name, value) {
+          formData.push({ name: name, value: value });
+        });
+        return formData;
+      }
+      return [];
+    },
+
+    _getTotal: function (files) {
+      var total = 0;
+      $.each(files, function (index, file) {
+        total += file.size || 1;
+      });
+      return total;
+    },
+
+    _initProgressObject: function (obj) {
+      var progress = {
+        loaded: 0,
+        total: 0,
+        bitrate: 0
+      };
+      if (obj._progress) {
+        $.extend(obj._progress, progress);
+      } else {
+        obj._progress = progress;
+      }
+    },
+
+    _initResponseObject: function (obj) {
+      var prop;
+      if (obj._response) {
+        for (prop in obj._response) {
+          if (Object.prototype.hasOwnProperty.call(obj._response, prop)) {
+            delete obj._response[prop];
+          }
+        }
+      } else {
+        obj._response = {};
+      }
+    },
+
+    _onProgress: function (e, data) {
+      if (e.lengthComputable) {
+        var now = Date.now ? Date.now() : new Date().getTime(),
+          loaded;
+        if (
+          data._time &&
+          data.progressInterval &&
+          now - data._time < data.progressInterval &&
+          e.loaded !== e.total
+        ) {
+          return;
+        }
+        data._time = now;
+        loaded =
+          Math.floor(
+            (e.loaded / e.total) * (data.chunkSize || data._progress.total)
+          ) + (data.uploadedBytes || 0);
+        // Add the difference from the previously loaded state
+        // to the global loaded counter:
+        this._progress.loaded += loaded - data._progress.loaded;
+        this._progress.bitrate = this._bitrateTimer.getBitrate(
+          now,
+          this._progress.loaded,
+          data.bitrateInterval
+        );
+        data._progress.loaded = data.loaded = loaded;
+        data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
+          now,
+          loaded,
+          data.bitrateInterval
+        );
+        // Trigger a custom progress event with a total data property set
+        // to the file size(s) of the current upload and a loaded data
+        // property calculated accordingly:
+        this._trigger(
+          'progress',
+          $.Event('progress', { delegatedEvent: e }),
+          data
+        );
+        // Trigger a global progress event for all current file uploads,
+        // including ajax calls queued for sequential file uploads:
+        this._trigger(
+          'progressall',
+          $.Event('progressall', { delegatedEvent: e }),
+          this._progress
+        );
+      }
+    },
+
+    _initProgressListener: function (options) {
+      var that = this,
+        xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
+      // Accesss to the native XHR object is required to add event listeners
+      // for the upload progress event:
+      if (xhr.upload) {
+        $(xhr.upload).on('progress', function (e) {
+          var oe = e.originalEvent;
+          // Make sure the progress event properties get copied over:
+          e.lengthComputable = oe.lengthComputable;
+          e.loaded = oe.loaded;
+          e.total = oe.total;
+          that._onProgress(e, options);
+        });
+        options.xhr = function () {
+          return xhr;
+        };
+      }
+    },
+
+    _deinitProgressListener: function (options) {
+      var xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
+      if (xhr.upload) {
+        $(xhr.upload).off('progress');
+      }
+    },
+
+    _isInstanceOf: function (type, obj) {
+      // Cross-frame instanceof check
+      return Object.prototype.toString.call(obj) === '[object ' + type + ']';
+    },
+
+    _getUniqueFilename: function (name, map) {
+      // eslint-disable-next-line no-param-reassign
+      name = String(name);
+      if (map[name]) {
+        // eslint-disable-next-line no-param-reassign
+        name = name.replace(/(?: \(([\d]+)\))?(\.[^.]+)?$/, function (
+          _,
+          p1,
+          p2
+        ) {
+          var index = p1 ? Number(p1) + 1 : 1;
+          var ext = p2 || '';
+          return ' (' + index + ')' + ext;
+        });
+        return this._getUniqueFilename(name, map);
+      }
+      map[name] = true;
+      return name;
+    },
+
+    _initXHRData: function (options) {
+      var that = this,
+        formData,
+        file = options.files[0],
+        // Ignore non-multipart setting if not supported:
+        multipart = options.multipart || !$.support.xhrFileUpload,
+        paramName =
+          $.type(options.paramName) === 'array'
+            ? options.paramName[0]
+            : options.paramName;
+      options.headers = $.extend({}, options.headers);
+      if (options.contentRange) {
+        options.headers['Content-Range'] = options.contentRange;
+      }
+      if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
+        options.headers['Content-Disposition'] =
+          'attachment; filename="' +
+          encodeURI(file.uploadName || file.name) +
+          '"';
+      }
+      if (!multipart) {
+        options.contentType = file.type || 'application/octet-stream';
+        options.data = options.blob || file;
+      } else if ($.support.xhrFormDataFileUpload) {
+        if (options.postMessage) {
+          // window.postMessage does not allow sending FormData
+          // objects, so we just add the File/Blob objects to
+          // the formData array and let the postMessage window
+          // create the FormData object out of this array:
+          formData = this._getFormData(options);
+          if (options.blob) {
+            formData.push({
+              name: paramName,
+              value: options.blob
+            });
+          } else {
+            $.each(options.files, function (index, file) {
+              formData.push({
+                name:
+                  ($.type(options.paramName) === 'array' &&
+                    options.paramName[index]) ||
+                  paramName,
+                value: file
+              });
+            });
+          }
+        } else {
+          if (that._isInstanceOf('FormData', options.formData)) {
+            formData = options.formData;
+          } else {
+            formData = new FormData();
+            $.each(this._getFormData(options), function (index, field) {
+              formData.append(field.name, field.value);
+            });
+          }
+          if (options.blob) {
+            formData.append(
+              paramName,
+              options.blob,
+              file.uploadName || file.name
+            );
+          } else {
+            $.each(options.files, function (index, file) {
+              // This check allows the tests to run with
+              // dummy objects:
+              if (
+                that._isInstanceOf('File', file) ||
+                that._isInstanceOf('Blob', file)
+              ) {
+                var fileName = file.uploadName || file.name;
+                if (options.uniqueFilenames) {
+                  fileName = that._getUniqueFilename(
+                    fileName,
+                    options.uniqueFilenames
+                  );
                 }
-                data._time = now;
-                total = data.total || this._getTotal(data.files);
-                loaded = parseInt(
-                    e.loaded / e.total * (data.chunkSize || total),
-                    10
-                ) + (data.uploadedBytes || 0);
-                this._loaded += loaded - (data.loaded || data.uploadedBytes || 0);
-                data.lengthComputable = true;
-                data.loaded = loaded;
-                data.total = total;
-                data.bitrate = data._bitrateTimer.getBitrate(
-                    now,
-                    loaded,
-                    data.bitrateInterval
+                formData.append(
+                  ($.type(options.paramName) === 'array' &&
+                    options.paramName[index]) ||
+                    paramName,
+                  file,
+                  fileName
                 );
-                // Trigger a custom progress event with a total data property set
-                // to the file size(s) of the current upload and a loaded data
-                // property calculated accordingly:
-                this._trigger('progress', e, data);
-                // Trigger a global progress event for all current file uploads,
-                // including ajax calls queued for sequential file uploads:
-                this._trigger('progressall', e, {
-                    lengthComputable: true,
-                    loaded: this._loaded,
-                    total: this._total,
-                    bitrate: this._bitrateTimer.getBitrate(
-                        now,
-                        this._loaded,
-                        data.bitrateInterval
-                    )
-                });
-            }
-        },
+              }
+            });
+          }
+        }
+        options.data = formData;
+      }
+      // Blob reference is not needed anymore, free memory:
+      options.blob = null;
+    },
 
-        _initProgressListener: function (options) {
-            var that = this,
-                xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-            // Accesss to the native XHR object is required to add event listeners
-            // for the upload progress event:
-            if (xhr.upload) {
-                $(xhr.upload).bind('progress', function (e) {
-                    var oe = e.originalEvent;
-                    // Make sure the progress event properties get copied over:
-                    e.lengthComputable = oe.lengthComputable;
-                    e.loaded = oe.loaded;
-                    e.total = oe.total;
-                    that._onProgress(e, options);
-                });
-                options.xhr = function () {
-                    return xhr;
-                };
-            }
-        },
+    _initIframeSettings: function (options) {
+      var targetHost = $('<a></a>').prop('href', options.url).prop('host');
+      // Setting the dataType to iframe enables the iframe transport:
+      options.dataType = 'iframe ' + (options.dataType || '');
+      // The iframe transport accepts a serialized array as form data:
+      options.formData = this._getFormData(options);
+      // Add redirect url to form data on cross-domain uploads:
+      if (options.redirect && targetHost && targetHost !== location.host) {
+        options.formData.push({
+          name: options.redirectParamName || 'redirect',
+          value: options.redirect
+        });
+      }
+    },
 
-        _initXHRData: function (options) {
-            var formData,
-                file = options.files[0],
-                // Ignore non-multipart setting if not supported:
-                multipart = options.multipart || !$.support.xhrFileUpload,
-                paramName = options.paramName[0];
-            if (!multipart || options.blob) {
-                // For non-multipart uploads and chunked uploads,
-                // file meta data is not part of the request body,
-                // so we transmit this data as part of the HTTP headers.
-                // For cross domain requests, these headers must be allowed
-                // via Access-Control-Allow-Headers or removed using
-                // the beforeSend callback:
-                options.headers = $.extend(options.headers, {
-                    'X-File-Name': file.name,
-                    'X-File-Type': file.type,
-                    'X-File-Size': file.size
-                });
-                if (!options.blob) {
-                    // Non-chunked non-multipart upload:
-                    options.contentType = file.type;
-                    options.data = file;
-                } else if (!multipart) {
-                    // Chunked non-multipart upload:
-                    options.contentType = 'application/octet-stream';
-                    options.data = options.blob;
-                }
-            }
-            if (multipart && $.support.xhrFormDataFileUpload) {
-                if (options.postMessage) {
-                    // window.postMessage does not allow sending FormData
-                    // objects, so we just add the File/Blob objects to
-                    // the formData array and let the postMessage window
-                    // create the FormData object out of this array:
-                    formData = this._getFormData(options);
-                    if (options.blob) {
-                        formData.push({
-                            name: paramName,
-                            value: options.blob
-                        });
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            formData.push({
-                                name: options.paramName[index] || paramName,
-                                value: file
-                            });
-                        });
-                    }
-                } else {
-                    if (options.formData instanceof FormData) {
-                        formData = options.formData;
-                    } else {
-                        formData = new FormData();
-                        $.each(this._getFormData(options), function (index, field) {
-                            formData.append(field.name, field.value);
-                        });
-                    }
-                    if (options.blob) {
-                        formData.append(paramName, options.blob, file.name);
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            // File objects are also Blob instances.
-                            // This check allows the tests to run with
-                            // dummy objects:
-                            if (file instanceof Blob) {
-                                formData.append(
-                                    options.paramName[index] || paramName,
-                                    file,
-                                    file.name
-                                );
-                            }
-                        });
-                    }
-                }
-                options.data = formData;
-            }
-            // Blob reference is not needed anymore, free memory:
-            options.blob = null;
-        },
+    _initDataSettings: function (options) {
+      if (this._isXHRUpload(options)) {
+        if (!this._chunkedUpload(options, true)) {
+          if (!options.data) {
+            this._initXHRData(options);
+          }
+          this._initProgressListener(options);
+        }
+        if (options.postMessage) {
+          // Setting the dataType to postmessage enables the
+          // postMessage transport:
+          options.dataType = 'postmessage ' + (options.dataType || '');
+        }
+      } else {
+        this._initIframeSettings(options);
+      }
+    },
 
-        _initIframeSettings: function (options) {
-            // Setting the dataType to iframe enables the iframe transport:
-            options.dataType = 'iframe ' + (options.dataType || '');
-            // The iframe transport accepts a serialized array as form data:
-            options.formData = this._getFormData(options);
-            // Add redirect url to form data on cross-domain uploads:
-            if (options.redirect && $('<a></a>').prop('href', options.url)
-                    .prop('host') !== location.host) {
-                options.formData.push({
-                    name: options.redirectParamName || 'redirect',
-                    value: options.redirect
-                });
-            }
-        },
+    _getParamName: function (options) {
+      var fileInput = $(options.fileInput),
+        paramName = options.paramName;
+      if (!paramName) {
+        paramName = [];
+        fileInput.each(function () {
+          var input = $(this),
+            name = input.prop('name') || 'files[]',
+            i = (input.prop('files') || [1]).length;
+          while (i) {
+            paramName.push(name);
+            i -= 1;
+          }
+        });
+        if (!paramName.length) {
+          paramName = [fileInput.prop('name') || 'files[]'];
+        }
+      } else if (!$.isArray(paramName)) {
+        paramName = [paramName];
+      }
+      return paramName;
+    },
 
-        _initDataSettings: function (options) {
-            if (this._isXHRUpload(options)) {
-                if (!this._chunkedUpload(options, true)) {
-                    if (!options.data) {
-                        this._initXHRData(options);
-                    }
-                    this._initProgressListener(options);
-                }
-                if (options.postMessage) {
-                    // Setting the dataType to postmessage enables the
-                    // postMessage transport:
-                    options.dataType = 'postmessage ' + (options.dataType || '');
-                }
-            } else {
-                this._initIframeSettings(options, 'iframe');
-            }
-        },
+    _initFormSettings: function (options) {
+      // Retrieve missing options from the input field and the
+      // associated form, if available:
+      if (!options.form || !options.form.length) {
+        options.form = $(options.fileInput.prop('form'));
+        // If the given file input doesn't have an associated form,
+        // use the default widget file input's form:
+        if (!options.form.length) {
+          options.form = $(this.options.fileInput.prop('form'));
+        }
+      }
+      options.paramName = this._getParamName(options);
+      if (!options.url) {
+        options.url = options.form.prop('action') || location.href;
+      }
+      // The HTTP request method must be "POST" or "PUT":
+      options.type = (
+        options.type ||
+        ($.type(options.form.prop('method')) === 'string' &&
+          options.form.prop('method')) ||
+        ''
+      ).toUpperCase();
+      if (
+        options.type !== 'POST' &&
+        options.type !== 'PUT' &&
+        options.type !== 'PATCH'
+      ) {
+        options.type = 'POST';
+      }
+      if (!options.formAcceptCharset) {
+        options.formAcceptCharset = options.form.attr('accept-charset');
+      }
+    },
 
-        _getParamName: function (options) {
-            var fileInput = $(options.fileInput),
-                paramName = options.paramName;
-            if (!paramName) {
-                paramName = [];
-                fileInput.each(function () {
-                    var input = $(this),
-                        name = input.prop('name') || 'files[]',
-                        i = (input.prop('files') || [1]).length;
-                    while (i) {
-                        paramName.push(name);
-                        i -= 1;
-                    }
-                });
-                if (!paramName.length) {
-                    paramName = [fileInput.prop('name') || 'files[]'];
-                }
-            } else if (!$.isArray(paramName)) {
-                paramName = [paramName];
-            }
-            return paramName;
-        },
+    _getAJAXSettings: function (data) {
+      var options = $.extend({}, this.options, data);
+      this._initFormSettings(options);
+      this._initDataSettings(options);
+      return options;
+    },
 
-        _initFormSettings: function (options) {
-            // Retrieve missing options from the input field and the
-            // associated form, if available:
-            if (!options.form || !options.form.length) {
-                options.form = $(options.fileInput.prop('form'));
-            }
-            options.paramName = this._getParamName(options);
-            if (!options.url) {
-                options.url = options.form.prop('action') || location.href;
-            }
-            // The HTTP request method must be "POST" or "PUT":
-            options.type = (options.type || options.form.prop('method') || '')
-                .toUpperCase();
-            if (options.type !== 'POST' && options.type !== 'PUT') {
-                options.type = 'POST';
-            }
-            if (!options.formAcceptCharset) {
-                options.formAcceptCharset = options.form.attr('accept-charset');
-            }
-        },
+    // jQuery 1.6 doesn't provide .state(),
+    // while jQuery 1.8+ removed .isRejected() and .isResolved():
+    _getDeferredState: function (deferred) {
+      if (deferred.state) {
+        return deferred.state();
+      }
+      if (deferred.isResolved()) {
+        return 'resolved';
+      }
+      if (deferred.isRejected()) {
+        return 'rejected';
+      }
+      return 'pending';
+    },
 
-        _getAJAXSettings: function (data) {
-            var options = $.extend({}, this.options, data);
-            this._initFormSettings(options);
-            this._initDataSettings(options);
-            return options;
-        },
+    // Maps jqXHR callbacks to the equivalent
+    // methods of the given Promise object:
+    _enhancePromise: function (promise) {
+      promise.success = promise.done;
+      promise.error = promise.fail;
+      promise.complete = promise.always;
+      return promise;
+    },
 
-        // Maps jqXHR callbacks to the equivalent
-        // methods of the given Promise object:
-        _enhancePromise: function (promise) {
-            promise.success = promise.done;
-            promise.error = promise.fail;
-            promise.complete = promise.always;
-            return promise;
-        },
+    // Creates and returns a Promise object enhanced with
+    // the jqXHR methods abort, success, error and complete:
+    _getXHRPromise: function (resolveOrReject, context, args) {
+      var dfd = $.Deferred(),
+        promise = dfd.promise();
+      // eslint-disable-next-line no-param-reassign
+      context = context || this.options.context || promise;
+      if (resolveOrReject === true) {
+        dfd.resolveWith(context, args);
+      } else if (resolveOrReject === false) {
+        dfd.rejectWith(context, args);
+      }
+      promise.abort = dfd.promise;
+      return this._enhancePromise(promise);
+    },
 
-        // Creates and returns a Promise object enhanced with
-        // the jqXHR methods abort, success, error and complete:
-        _getXHRPromise: function (resolveOrReject, context, args) {
-            var dfd = $.Deferred(),
-                promise = dfd.promise();
-            context = context || this.options.context || promise;
-            if (resolveOrReject === true) {
-                dfd.resolveWith(context, args);
-            } else if (resolveOrReject === false) {
-                dfd.rejectWith(context, args);
-            }
-            promise.abort = dfd.promise;
-            return this._enhancePromise(promise);
-        },
+    // Adds convenience methods to the data callback argument:
+    _addConvenienceMethods: function (e, data) {
+      var that = this,
+        getPromise = function (args) {
+          return $.Deferred().resolveWith(that, args).promise();
+        };
+      data.process = function (resolveFunc, rejectFunc) {
+        if (resolveFunc || rejectFunc) {
+          data._processQueue = this._processQueue = (this._processQueue ||
+            getPromise([this]))
+            [that._promisePipe](function () {
+              if (data.errorThrown) {
+                return $.Deferred().rejectWith(that, [data]).promise();
+              }
+              return getPromise(arguments);
+            })
+            [that._promisePipe](resolveFunc, rejectFunc);
+        }
+        return this._processQueue || getPromise([this]);
+      };
+      data.submit = function () {
+        if (this.state() !== 'pending') {
+          data.jqXHR = this.jqXHR =
+            that._trigger(
+              'submit',
+              $.Event('submit', { delegatedEvent: e }),
+              this
+            ) !== false && that._onSend(e, this);
+        }
+        return this.jqXHR || that._getXHRPromise();
+      };
+      data.abort = function () {
+        if (this.jqXHR) {
+          return this.jqXHR.abort();
+        }
+        this.errorThrown = 'abort';
+        that._trigger('fail', null, this);
+        return that._getXHRPromise(false);
+      };
+      data.state = function () {
+        if (this.jqXHR) {
+          return that._getDeferredState(this.jqXHR);
+        }
+        if (this._processQueue) {
+          return that._getDeferredState(this._processQueue);
+        }
+      };
+      data.processing = function () {
+        return (
+          !this.jqXHR &&
+          this._processQueue &&
+          that._getDeferredState(this._processQueue) === 'pending'
+        );
+      };
+      data.progress = function () {
+        return this._progress;
+      };
+      data.response = function () {
+        return this._response;
+      };
+    },
 
-        // Uploads a file in multiple, sequential requests
-        // by splitting the file up in multiple blob chunks.
-        // If the second parameter is true, only tests if the file
-        // should be uploaded in chunks, but does not invoke any
-        // upload requests:
-        _chunkedUpload: function (options, testOnly) {
-            var that = this,
-                file = options.files[0],
-                fs = file.size,
-                ub = options.uploadedBytes = options.uploadedBytes || 0,
-                mcs = options.maxChunkSize || fs,
-                // Use the Blob methods with the slice implementation
-                // according to the W3C Blob API specification:
-                slice = file.webkitSlice || file.mozSlice || file.slice,
-                upload,
-                n,
-                jqXHR,
-                pipe;
-            if (!(this._isXHRUpload(options) && slice && (ub || mcs < fs)) ||
-                    options.data) {
-                return false;
-            }
-            if (testOnly) {
-                return true;
+    // Parses the Range header from the server response
+    // and returns the uploaded bytes:
+    _getUploadedBytes: function (jqXHR) {
+      var range = jqXHR.getResponseHeader('Range'),
+        parts = range && range.split('-'),
+        upperBytesPos = parts && parts.length > 1 && parseInt(parts[1], 10);
+      return upperBytesPos && upperBytesPos + 1;
+    },
+
+    // Uploads a file in multiple, sequential requests
+    // by splitting the file up in multiple blob chunks.
+    // If the second parameter is true, only tests if the file
+    // should be uploaded in chunks, but does not invoke any
+    // upload requests:
+    _chunkedUpload: function (options, testOnly) {
+      options.uploadedBytes = options.uploadedBytes || 0;
+      var that = this,
+        file = options.files[0],
+        fs = file.size,
+        ub = options.uploadedBytes,
+        mcs = options.maxChunkSize || fs,
+        slice = this._blobSlice,
+        dfd = $.Deferred(),
+        promise = dfd.promise(),
+        jqXHR,
+        upload;
+      if (
+        !(
+          this._isXHRUpload(options) &&
+          slice &&
+          (ub || ($.type(mcs) === 'function' ? mcs(options) : mcs) < fs)
+        ) ||
+        options.data
+      ) {
+        return false;
+      }
+      if (testOnly) {
+        return true;
+      }
+      if (ub >= fs) {
+        file.error = options.i18n('uploadedBytes');
+        return this._getXHRPromise(false, options.context, [
+          null,
+          'error',
+          file.error
+        ]);
+      }
+      // The chunk upload method:
+      upload = function () {
+        // Clone the options object for each chunk upload:
+        var o = $.extend({}, options),
+          currentLoaded = o._progress.loaded;
+        o.blob = slice.call(
+          file,
+          ub,
+          ub + ($.type(mcs) === 'function' ? mcs(o) : mcs),
+          file.type
+        );
+        // Store the current chunk size, as the blob itself
+        // will be dereferenced after data processing:
+        o.chunkSize = o.blob.size;
+        // Expose the chunk bytes position range:
+        o.contentRange =
+          'bytes ' + ub + '-' + (ub + o.chunkSize - 1) + '/' + fs;
+        // Trigger chunkbeforesend to allow form data to be updated for this chunk
+        that._trigger('chunkbeforesend', null, o);
+        // Process the upload data (the blob and potential form data):
+        that._initXHRData(o);
+        // Add progress listeners for this chunk upload:
+        that._initProgressListener(o);
+        jqXHR = (
+          (that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
+          that._getXHRPromise(false, o.context)
+        )
+          .done(function (result, textStatus, jqXHR) {
+            ub = that._getUploadedBytes(jqXHR) || ub + o.chunkSize;
+            // Create a progress event if no final progress event
+            // with loaded equaling total has been triggered
+            // for this chunk:
+            if (currentLoaded + o.chunkSize - o._progress.loaded) {
+              that._onProgress(
+                $.Event('progress', {
+                  lengthComputable: true,
+                  loaded: ub - o.uploadedBytes,
+                  total: ub - o.uploadedBytes
+                }),
+                o
+              );
             }
-            if (ub >= fs) {
-                file.error = 'uploadedBytes';
-                return this._getXHRPromise(
-                    false,
-                    options.context,
-                    [null, 'error', file.error]
-                );
+            options.uploadedBytes = o.uploadedBytes = ub;
+            o.result = result;
+            o.textStatus = textStatus;
+            o.jqXHR = jqXHR;
+            that._trigger('chunkdone', null, o);
+            that._trigger('chunkalways', null, o);
+            if (ub < fs) {
+              // File upload not yet complete,
+              // continue with the next chunk:
+              upload();
+            } else {
+              dfd.resolveWith(o.context, [result, textStatus, jqXHR]);
             }
-            // n is the number of blobs to upload,
-            // calculated via filesize, uploaded bytes and max chunk size:
-            n = Math.ceil((fs - ub) / mcs);
-            // The chunk upload method accepting the chunk number as parameter:
-            upload = function (i) {
-                if (!i) {
-                    return that._getXHRPromise(true, options.context);
-                }
-                // Upload the blobs in sequential order:
-                return upload(i -= 1).pipe(function () {
-                    // Clone the options object for each chunk upload:
-                    var o = $.extend({}, options);
-                    o.blob = slice.call(
-                        file,
-                        ub + i * mcs,
-                        ub + (i + 1) * mcs
-                    );
-                    // Expose the chunk index:
-                    o.chunkIndex = i;
-                    // Expose the number of chunks:
-                    o.chunksNumber = n;
-                    // Store the current chunk size, as the blob itself
-                    // will be dereferenced after data processing:
-                    o.chunkSize = o.blob.size;
-                    // Process the upload data (the blob and potential form data):
-                    that._initXHRData(o);
-                    // Add progress listeners for this chunk upload:
-                    that._initProgressListener(o);
-                    jqXHR = ($.ajax(o) || that._getXHRPromise(false, o.context))
-                        .done(function () {
-                            // Create a progress event if upload is done and
-                            // no progress event has been invoked for this chunk:
-                            if (!o.loaded) {
-                                that._onProgress($.Event('progress', {
-                                    lengthComputable: true,
-                                    loaded: o.chunkSize,
-                                    total: o.chunkSize
-                                }), o);
-                            }
-                            options.uploadedBytes = o.uploadedBytes +=
-                                o.chunkSize;
-                        });
-                    return jqXHR;
-                });
-            };
-            // Return the piped Promise object, enhanced with an abort method,
-            // which is delegated to the jqXHR object of the current upload,
-            // and jqXHR callbacks mapped to the equivalent Promise methods:
-            pipe = upload(n);
-            pipe.abort = function () {
-                return jqXHR.abort();
-            };
-            return this._enhancePromise(pipe);
-        },
+          })
+          .fail(function (jqXHR, textStatus, errorThrown) {
+            o.jqXHR = jqXHR;
+            o.textStatus = textStatus;
+            o.errorThrown = errorThrown;
+            that._trigger('chunkfail', null, o);
+            that._trigger('chunkalways', null, o);
+            dfd.rejectWith(o.context, [jqXHR, textStatus, errorThrown]);
+          })
+          .always(function () {
+            that._deinitProgressListener(o);
+          });
+      };
+      this._enhancePromise(promise);
+      promise.abort = function () {
+        return jqXHR.abort();
+      };
+      upload();
+      return promise;
+    },
 
-        _beforeSend: function (e, data) {
-            if (this._active === 0) {
-                // the start callback is triggered when an upload starts
-                // and no other uploads are currently running,
-                // equivalent to the global ajaxStart event:
-                this._trigger('start');
-                // Set timer for global bitrate progress calculation:
-                this._bitrateTimer = new this._BitrateTimer();
-            }
-            this._active += 1;
-            // Initialize the global progress values:
-            this._loaded += data.uploadedBytes || 0;
-            this._total += this._getTotal(data.files);
-        },
+    _beforeSend: function (e, data) {
+      if (this._active === 0) {
+        // the start callback is triggered when an upload starts
+        // and no other uploads are currently running,
+        // equivalent to the global ajaxStart event:
+        this._trigger('start');
+        // Set timer for global bitrate progress calculation:
+        this._bitrateTimer = new this._BitrateTimer();
+        // Reset the global progress values:
+        this._progress.loaded = this._progress.total = 0;
+        this._progress.bitrate = 0;
+      }
+      // Make sure the container objects for the .response() and
+      // .progress() methods on the data object are available
+      // and reset to their initial state:
+      this._initResponseObject(data);
+      this._initProgressObject(data);
+      data._progress.loaded = data.loaded = data.uploadedBytes || 0;
+      data._progress.total = data.total = this._getTotal(data.files) || 1;
+      data._progress.bitrate = data.bitrate = 0;
+      this._active += 1;
+      // Initialize the global progress values:
+      this._progress.loaded += data.loaded;
+      this._progress.total += data.total;
+    },
 
-        _onDone: function (result, textStatus, jqXHR, options) {
-            if (!this._isXHRUpload(options)) {
-                // Create a progress event for each iframe load:
-                this._onProgress($.Event('progress', {
-                    lengthComputable: true,
-                    loaded: 1,
-                    total: 1
-                }), options);
-            }
-            options.result = result;
-            options.textStatus = textStatus;
-            options.jqXHR = jqXHR;
-            this._trigger('done', null, options);
-        },
+    _onDone: function (result, textStatus, jqXHR, options) {
+      var total = options._progress.total,
+        response = options._response;
+      if (options._progress.loaded < total) {
+        // Create a progress event if no final progress event
+        // with loaded equaling total has been triggered:
+        this._onProgress(
+          $.Event('progress', {
+            lengthComputable: true,
+            loaded: total,
+            total: total
+          }),
+          options
+        );
+      }
+      response.result = options.result = result;
+      response.textStatus = options.textStatus = textStatus;
+      response.jqXHR = options.jqXHR = jqXHR;
+      this._trigger('done', null, options);
+    },
 
-        _onFail: function (jqXHR, textStatus, errorThrown, options) {
-            options.jqXHR = jqXHR;
-            options.textStatus = textStatus;
-            options.errorThrown = errorThrown;
-            this._trigger('fail', null, options);
-            if (options.recalculateProgress) {
-                // Remove the failed (error or abort) file upload from
-                // the global progress calculation:
-                this._loaded -= options.loaded || options.uploadedBytes || 0;
-                this._total -= options.total || this._getTotal(options.files);
-            }
-        },
+    _onFail: function (jqXHR, textStatus, errorThrown, options) {
+      var response = options._response;
+      if (options.recalculateProgress) {
+        // Remove the failed (error or abort) file upload from
+        // the global progress calculation:
+        this._progress.loaded -= options._progress.loaded;
+        this._progress.total -= options._progress.total;
+      }
+      response.jqXHR = options.jqXHR = jqXHR;
+      response.textStatus = options.textStatus = textStatus;
+      response.errorThrown = options.errorThrown = errorThrown;
+      this._trigger('fail', null, options);
+    },
 
-        _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
-            this._active -= 1;
-            options.textStatus = textStatus;
-            if (jqXHRorError && jqXHRorError.always) {
-                options.jqXHR = jqXHRorError;
-                options.result = jqXHRorResult;
-            } else {
-                options.jqXHR = jqXHRorResult;
-                options.errorThrown = jqXHRorError;
-            }
-            this._trigger('always', null, options);
-            if (this._active === 0) {
-                // The stop callback is triggered when all uploads have
-                // been completed, equivalent to the global ajaxStop event:
-                this._trigger('stop');
-                // Reset the global progress values:
-                this._loaded = this._total = 0;
-                this._bitrateTimer = null;
-            }
-        },
+    _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
+      // jqXHRorResult, textStatus and jqXHRorError are added to the
+      // options object via done and fail callbacks
+      this._trigger('always', null, options);
+    },
 
-        _onSend: function (e, data) {
-            var that = this,
-                jqXHR,
-                slot,
-                pipe,
-                options = that._getAJAXSettings(data),
-                send = function (resolve, args) {
-                    that._sending += 1;
-                    // Set timer for bitrate progress calculation:
-                    options._bitrateTimer = new that._BitrateTimer();
-                    jqXHR = jqXHR || (
-                        (resolve !== false &&
-                        that._trigger('send', e, options) !== false &&
-                        (that._chunkedUpload(options) || $.ajax(options))) ||
-                        that._getXHRPromise(false, options.context, args)
-                    ).done(function (result, textStatus, jqXHR) {
-                        that._onDone(result, textStatus, jqXHR, options);
-                    }).fail(function (jqXHR, textStatus, errorThrown) {
-                        that._onFail(jqXHR, textStatus, errorThrown, options);
-                    }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
-                        that._sending -= 1;
-                        that._onAlways(
-                            jqXHRorResult,
-                            textStatus,
-                            jqXHRorError,
-                            options
-                        );
-                        if (options.limitConcurrentUploads &&
-                                options.limitConcurrentUploads > that._sending) {
-                            // Start the next queued upload,
-                            // that has not been aborted:
-                            var nextSlot = that._slots.shift(),
-                                isPending;
-                            while (nextSlot) {
-                                // jQuery 1.6 doesn't provide .state(),
-                                // while jQuery 1.8+ removed .isRejected():
-                                isPending = nextSlot.state ?
-                                        nextSlot.state() === 'pending' :
-                                        !nextSlot.isRejected();
-                                if (isPending) {
-                                    nextSlot.resolve();
-                                    break;
-                                }
-                                nextSlot = that._slots.shift();
-                            }
-                        }
-                    });
-                    return jqXHR;
-                };
-            this._beforeSend(e, options);
-            if (this.options.sequentialUploads ||
-                    (this.options.limitConcurrentUploads &&
-                    this.options.limitConcurrentUploads <= this._sending)) {
-                if (this.options.limitConcurrentUploads > 1) {
-                    slot = $.Deferred();
-                    this._slots.push(slot);
-                    pipe = slot.pipe(send);
-                } else {
-                    pipe = (this._sequence = this._sequence.pipe(send, send));
-                }
-                // Return the piped Promise object, enhanced with an abort method,
-                // which is delegated to the jqXHR object of the current upload,
-                // and jqXHR callbacks mapped to the equivalent Promise methods:
-                pipe.abort = function () {
-                    var args = [undefined, 'abort', 'abort'];
-                    if (!jqXHR) {
-                        if (slot) {
-                            slot.rejectWith(pipe, args);
-                        }
-                        return send(false, args);
+    _onSend: function (e, data) {
+      if (!data.submit) {
+        this._addConvenienceMethods(e, data);
+      }
+      var that = this,
+        jqXHR,
+        aborted,
+        slot,
+        pipe,
+        options = that._getAJAXSettings(data),
+        send = function () {
+          that._sending += 1;
+          // Set timer for bitrate progress calculation:
+          options._bitrateTimer = new that._BitrateTimer();
+          jqXHR =
+            jqXHR ||
+            (
+              ((aborted ||
+                that._trigger(
+                  'send',
+                  $.Event('send', { delegatedEvent: e }),
+                  options
+                ) === false) &&
+                that._getXHRPromise(false, options.context, aborted)) ||
+              that._chunkedUpload(options) ||
+              $.ajax(options)
+            )
+              .done(function (result, textStatus, jqXHR) {
+                that._onDone(result, textStatus, jqXHR, options);
+              })
+              .fail(function (jqXHR, textStatus, errorThrown) {
+                that._onFail(jqXHR, textStatus, errorThrown, options);
+              })
+              .always(function (jqXHRorResult, textStatus, jqXHRorError) {
+                that._deinitProgressListener(options);
+                that._onAlways(
+                  jqXHRorResult,
+                  textStatus,
+                  jqXHRorError,
+                  options
+                );
+                that._sending -= 1;
+                that._active -= 1;
+                if (
+                  options.limitConcurrentUploads &&
+                  options.limitConcurrentUploads > that._sending
+                ) {
+                  // Start the next queued upload,
+                  // that has not been aborted:
+                  var nextSlot = that._slots.shift();
+                  while (nextSlot) {
+                    if (that._getDeferredState(nextSlot) === 'pending') {
+                      nextSlot.resolve();
+                      break;
                     }
-                    return jqXHR.abort();
-                };
-                return this._enhancePromise(pipe);
+                    nextSlot = that._slots.shift();
+                  }
+                }
+                if (that._active === 0) {
+                  // The stop callback is triggered when all uploads have
+                  // been completed, equivalent to the global ajaxStop event:
+                  that._trigger('stop');
+                }
+              });
+          return jqXHR;
+        };
+      this._beforeSend(e, options);
+      if (
+        this.options.sequentialUploads ||
+        (this.options.limitConcurrentUploads &&
+          this.options.limitConcurrentUploads <= this._sending)
+      ) {
+        if (this.options.limitConcurrentUploads > 1) {
+          slot = $.Deferred();
+          this._slots.push(slot);
+          pipe = slot[that._promisePipe](send);
+        } else {
+          this._sequence = this._sequence[that._promisePipe](send, send);
+          pipe = this._sequence;
+        }
+        // Return the piped Promise object, enhanced with an abort method,
+        // which is delegated to the jqXHR object of the current upload,
+        // and jqXHR callbacks mapped to the equivalent Promise methods:
+        pipe.abort = function () {
+          aborted = [undefined, 'abort', 'abort'];
+          if (!jqXHR) {
+            if (slot) {
+              slot.rejectWith(options.context, aborted);
             }
             return send();
-        },
+          }
+          return jqXHR.abort();
+        };
+        return this._enhancePromise(pipe);
+      }
+      return send();
+    },
 
-        _onAdd: function (e, data) {
-            var that = this,
-                result = true,
-                options = $.extend({}, this.options, data),
-                limit = options.limitMultiFileUploads,
-                paramName = this._getParamName(options),
-                paramNameSet,
-                paramNameSlice,
-                fileSet,
-                i;
-            if (!(options.singleFileUploads || limit) ||
-                    !this._isXHRUpload(options)) {
-                fileSet = [data.files];
-                paramNameSet = [paramName];
-            } else if (!options.singleFileUploads && limit) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < data.files.length; i += limit) {
-                    fileSet.push(data.files.slice(i, i + limit));
-                    paramNameSlice = paramName.slice(i, i + limit);
-                    if (!paramNameSlice.length) {
-                        paramNameSlice = paramName;
-                    }
-                    paramNameSet.push(paramNameSlice);
-                }
-            } else {
-                paramNameSet = paramName;
+    _onAdd: function (e, data) {
+      var that = this,
+        result = true,
+        options = $.extend({}, this.options, data),
+        files = data.files,
+        filesLength = files.length,
+        limit = options.limitMultiFileUploads,
+        limitSize = options.limitMultiFileUploadSize,
+        overhead = options.limitMultiFileUploadSizeOverhead,
+        batchSize = 0,
+        paramName = this._getParamName(options),
+        paramNameSet,
+        paramNameSlice,
+        fileSet,
+        i,
+        j = 0;
+      if (!filesLength) {
+        return false;
+      }
+      if (limitSize && files[0].size === undefined) {
+        limitSize = undefined;
+      }
+      if (
+        !(options.singleFileUploads || limit || limitSize) ||
+        !this._isXHRUpload(options)
+      ) {
+        fileSet = [files];
+        paramNameSet = [paramName];
+      } else if (!(options.singleFileUploads || limitSize) && limit) {
+        fileSet = [];
+        paramNameSet = [];
+        for (i = 0; i < filesLength; i += limit) {
+          fileSet.push(files.slice(i, i + limit));
+          paramNameSlice = paramName.slice(i, i + limit);
+          if (!paramNameSlice.length) {
+            paramNameSlice = paramName;
+          }
+          paramNameSet.push(paramNameSlice);
+        }
+      } else if (!options.singleFileUploads && limitSize) {
+        fileSet = [];
+        paramNameSet = [];
+        for (i = 0; i < filesLength; i = i + 1) {
+          batchSize += files[i].size + overhead;
+          if (
+            i + 1 === filesLength ||
+            batchSize + files[i + 1].size + overhead > limitSize ||
+            (limit && i + 1 - j >= limit)
+          ) {
+            fileSet.push(files.slice(j, i + 1));
+            paramNameSlice = paramName.slice(j, i + 1);
+            if (!paramNameSlice.length) {
+              paramNameSlice = paramName;
             }
-            data.originalFiles = data.files;
-            $.each(fileSet || data.files, function (index, element) {
-                var newData = $.extend({}, data);
-                newData.files = fileSet ? element : [element];
-                newData.paramName = paramNameSet[index];
-                newData.submit = function () {
-                    newData.jqXHR = this.jqXHR =
-                        (that._trigger('submit', e, this) !== false) &&
-                        that._onSend(e, this);
-                    return this.jqXHR;
-                };
-                return (result = that._trigger('add', e, newData));
-            });
-            return result;
-        },
+            paramNameSet.push(paramNameSlice);
+            j = i + 1;
+            batchSize = 0;
+          }
+        }
+      } else {
+        paramNameSet = paramName;
+      }
+      data.originalFiles = files;
+      $.each(fileSet || files, function (index, element) {
+        var newData = $.extend({}, data);
+        newData.files = fileSet ? element : [element];
+        newData.paramName = paramNameSet[index];
+        that._initResponseObject(newData);
+        that._initProgressObject(newData);
+        that._addConvenienceMethods(e, newData);
+        result = that._trigger(
+          'add',
+          $.Event('add', { delegatedEvent: e }),
+          newData
+        );
+        return result;
+      });
+      return result;
+    },
 
-        _replaceFileInput: function (input) {
-            var inputClone = input.clone(true);
-            $('<form></form>').append(inputClone)[0].reset();
-            // Detaching allows to insert the fileInput on another form
-            // without loosing the file input value:
-            input.after(inputClone).detach();
-            // Avoid memory leaks with the detached file input:
-            $.cleanData(input.unbind('remove'));
-            // Replace the original file input element in the fileInput
-            // collection with the clone, which has been copied including
-            // event handlers:
-            this.options.fileInput = this.options.fileInput.map(function (i, el) {
-                if (el === input[0]) {
-                    return inputClone[0];
-                }
-                return el;
-            });
-            // If the widget has been initialized on the file input itself,
-            // override this.element with the file input clone:
-            if (input[0] === this.element[0]) {
-                this.element = inputClone;
-            }
-        },
+    _replaceFileInput: function (data) {
+      var input = data.fileInput,
+        inputClone = input.clone(true),
+        restoreFocus = input.is(document.activeElement);
+      // Add a reference for the new cloned file input to the data argument:
+      data.fileInputClone = inputClone;
+      $('<form></form>').append(inputClone)[0].reset();
+      // Detaching allows to insert the fileInput on another form
+      // without loosing the file input value:
+      input.after(inputClone).detach();
+      // If the fileInput had focus before it was detached,
+      // restore focus to the inputClone.
+      if (restoreFocus) {
+        inputClone.trigger('focus');
+      }
+      // Avoid memory leaks with the detached file input:
+      $.cleanData(input.off('remove'));
+      // Replace the original file input element in the fileInput
+      // elements set with the clone, which has been copied including
+      // event handlers:
+      this.options.fileInput = this.options.fileInput.map(function (i, el) {
+        if (el === input[0]) {
+          return inputClone[0];
+        }
+        return el;
+      });
+      // If the widget has been initialized on the file input itself,
+      // override this.element with the file input clone:
+      if (input[0] === this.element[0]) {
+        this.element = inputClone;
+      }
+    },
 
-        _handleFileTreeEntry: function (entry, path) {
-            var that = this,
-                dfd = $.Deferred(),
-                errorHandler = function () {
-                    dfd.reject();
-                },
-                dirReader;
-            path = path || '';
-            if (entry.isFile) {
-                entry.file(function (file) {
-                    file.relativePath = path;
-                    dfd.resolve(file);
-                }, errorHandler);
-            } else if (entry.isDirectory) {
-                dirReader = entry.createReader();
-                dirReader.readEntries(function (entries) {
-                    that._handleFileTreeEntries(
-                        entries,
-                        path + entry.name + '/'
-                    ).done(function (files) {
-                        dfd.resolve(files);
-                    }).fail(errorHandler);
-                }, errorHandler);
+    _handleFileTreeEntry: function (entry, path) {
+      var that = this,
+        dfd = $.Deferred(),
+        entries = [],
+        dirReader,
+        errorHandler = function (e) {
+          if (e && !e.entry) {
+            e.entry = entry;
+          }
+          // Since $.when returns immediately if one
+          // Deferred is rejected, we use resolve instead.
+          // This allows valid files and invalid items
+          // to be returned together in one set:
+          dfd.resolve([e]);
+        },
+        successHandler = function (entries) {
+          that
+            ._handleFileTreeEntries(entries, path + entry.name + '/')
+            .done(function (files) {
+              dfd.resolve(files);
+            })
+            .fail(errorHandler);
+        },
+        readEntries = function () {
+          dirReader.readEntries(function (results) {
+            if (!results.length) {
+              successHandler(entries);
             } else {
-                errorHandler();
+              entries = entries.concat(results);
+              readEntries();
             }
-            return dfd.promise();
-        },
+          }, errorHandler);
+        };
+      // eslint-disable-next-line no-param-reassign
+      path = path || '';
+      if (entry.isFile) {
+        if (entry._file) {
+          // Workaround for Chrome bug #149735
+          entry._file.relativePath = path;
+          dfd.resolve(entry._file);
+        } else {
+          entry.file(function (file) {
+            file.relativePath = path;
+            dfd.resolve(file);
+          }, errorHandler);
+        }
+      } else if (entry.isDirectory) {
+        dirReader = entry.createReader();
+        readEntries();
+      } else {
+        // Return an empty list for file system items
+        // other than files or directories:
+        dfd.resolve([]);
+      }
+      return dfd.promise();
+    },
 
-        _handleFileTreeEntries: function (entries, path) {
-            var that = this;
-            return $.when.apply(
-                $,
-                $.map(entries, function (entry) {
-                    return that._handleFileTreeEntry(entry, path);
-                })
-            ).pipe(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
+    _handleFileTreeEntries: function (entries, path) {
+      var that = this;
+      return $.when
+        .apply(
+          $,
+          $.map(entries, function (entry) {
+            return that._handleFileTreeEntry(entry, path);
+          })
+        )
+        [this._promisePipe](function () {
+          return Array.prototype.concat.apply([], arguments);
+        });
+    },
 
-        _getDroppedFiles: function (dataTransfer) {
-            dataTransfer = dataTransfer || {};
-            var items = dataTransfer.items;
-            if (items && items.length && (items[0].webkitGetAsEntry ||
-                    items[0].getAsEntry)) {
-                return this._handleFileTreeEntries(
-                    $.map(items, function (item) {
-                        if (item.webkitGetAsEntry) {
-                            return item.webkitGetAsEntry();
-                        }
-                        return item.getAsEntry();
-                    })
-                );
+    _getDroppedFiles: function (dataTransfer) {
+      // eslint-disable-next-line no-param-reassign
+      dataTransfer = dataTransfer || {};
+      var items = dataTransfer.items;
+      if (
+        items &&
+        items.length &&
+        (items[0].webkitGetAsEntry || items[0].getAsEntry)
+      ) {
+        return this._handleFileTreeEntries(
+          $.map(items, function (item) {
+            var entry;
+            if (item.webkitGetAsEntry) {
+              entry = item.webkitGetAsEntry();
+              if (entry) {
+                // Workaround for Chrome bug #149735:
+                entry._file = item.getAsFile();
+              }
+              return entry;
             }
-            return $.Deferred().resolve(
-                $.makeArray(dataTransfer.files)
-            ).promise();
-        },
+            return item.getAsEntry();
+          })
+        );
+      }
+      return $.Deferred().resolve($.makeArray(dataTransfer.files)).promise();
+    },
 
-        _getFileInputFiles: function (fileInput) {
-            fileInput = $(fileInput);
-            var entries = fileInput.prop('webkitEntries') ||
-                    fileInput.prop('entries'),
-                files,
-                value;
-            if (entries && entries.length) {
-                return this._handleFileTreeEntries(entries);
-            }
-            files = $.makeArray(fileInput.prop('files'));
-            if (!files.length) {
-                value = fileInput.prop('value');
-                if (!value) {
-                    return $.Deferred().reject([]).promise();
-                }
-                // If the files property is not available, the browser does not
-                // support the File API and we add a pseudo File object with
-                // the input value as name with path information removed:
-                files = [{name: value.replace(/^.*\\/, '')}];
-            }
-            return $.Deferred().resolve(files).promise();
-        },
+    _getSingleFileInputFiles: function (fileInput) {
+      // eslint-disable-next-line no-param-reassign
+      fileInput = $(fileInput);
+      var entries =
+          fileInput.prop('webkitEntries') || fileInput.prop('entries'),
+        files,
+        value;
+      if (entries && entries.length) {
+        return this._handleFileTreeEntries(entries);
+      }
+      files = $.makeArray(fileInput.prop('files'));
+      if (!files.length) {
+        value = fileInput.prop('value');
+        if (!value) {
+          return $.Deferred().resolve([]).promise();
+        }
+        // If the files property is not available, the browser does not
+        // support the File API and we add a pseudo File object with
+        // the input value as name with path information removed:
+        files = [{ name: value.replace(/^.*\\/, '') }];
+      } else if (files[0].name === undefined && files[0].fileName) {
+        // File normalization for Safari 4 and Firefox 3:
+        $.each(files, function (index, file) {
+          file.name = file.fileName;
+          file.size = file.fileSize;
+        });
+      }
+      return $.Deferred().resolve(files).promise();
+    },
 
-        _onChange: function (e) {
-            var that = e.data.fileupload,
-                data = {
-                    fileInput: $(e.target),
-                    form: $(e.target.form)
-                };
-            that._getFileInputFiles(data.fileInput).always(function (files) {
-                data.files = files;
-                if (that.options.replaceFileInput) {
-                    that._replaceFileInput(data.fileInput);
-                }
-                if (that._trigger('change', e, data) !== false) {
-                    that._onAdd(e, data);
-                }
-            });
-        },
+    _getFileInputFiles: function (fileInput) {
+      if (!(fileInput instanceof $) || fileInput.length === 1) {
+        return this._getSingleFileInputFiles(fileInput);
+      }
+      return $.when
+        .apply($, $.map(fileInput, this._getSingleFileInputFiles))
+        [this._promisePipe](function () {
+          return Array.prototype.concat.apply([], arguments);
+        });
+    },
 
-        _onPaste: function (e) {
-            var that = e.data.fileupload,
-                cbd = e.originalEvent.clipboardData,
-                items = (cbd && cbd.items) || [],
-                data = {files: []};
-            $.each(items, function (index, item) {
-                var file = item.getAsFile && item.getAsFile();
-                if (file) {
-                    data.files.push(file);
-                }
-            });
-            if (that._trigger('paste', e, data) === false ||
-                    that._onAdd(e, data) === false) {
-                return false;
-            }
-        },
+    _onChange: function (e) {
+      var that = this,
+        data = {
+          fileInput: $(e.target),
+          form: $(e.target.form)
+        };
+      this._getFileInputFiles(data.fileInput).always(function (files) {
+        data.files = files;
+        if (that.options.replaceFileInput) {
+          that._replaceFileInput(data);
+        }
+        if (
+          that._trigger(
+            'change',
+            $.Event('change', { delegatedEvent: e }),
+            data
+          ) !== false
+        ) {
+          that._onAdd(e, data);
+        }
+      });
+    },
 
-        _onDrop: function (e) {
-            e.preventDefault();
-            var that = e.data.fileupload,
-                dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer,
-                data = {};
-            that._getDroppedFiles(dataTransfer).always(function (files) {
-                data.files = files;
-                if (that._trigger('drop', e, data) !== false) {
-                    that._onAdd(e, data);
-                }
-            });
-        },
+    _onPaste: function (e) {
+      var items =
+          e.originalEvent &&
+          e.originalEvent.clipboardData &&
+          e.originalEvent.clipboardData.items,
+        data = { files: [] };
+      if (items && items.length) {
+        $.each(items, function (index, item) {
+          var file = item.getAsFile && item.getAsFile();
+          if (file) {
+            data.files.push(file);
+          }
+        });
+        if (
+          this._trigger(
+            'paste',
+            $.Event('paste', { delegatedEvent: e }),
+            data
+          ) !== false
+        ) {
+          this._onAdd(e, data);
+        }
+      }
+    },
 
-        _onDragOver: function (e) {
-            var that = e.data.fileupload,
-                dataTransfer = e.dataTransfer = e.originalEvent.dataTransfer;
-            if (that._trigger('dragover', e) === false) {
-                return false;
-            }
-            if (dataTransfer) {
-                dataTransfer.dropEffect = 'copy';
-            }
-            e.preventDefault();
-        },
+    _onDrop: function (e) {
+      e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
+      var that = this,
+        dataTransfer = e.dataTransfer,
+        data = {};
+      if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+        e.preventDefault();
+        this._getDroppedFiles(dataTransfer).always(function (files) {
+          data.files = files;
+          if (
+            that._trigger(
+              'drop',
+              $.Event('drop', { delegatedEvent: e }),
+              data
+            ) !== false
+          ) {
+            that._onAdd(e, data);
+          }
+        });
+      }
+    },
 
-        _initEventHandlers: function () {
-            var ns = this.options.namespace;
-            if (this._isXHRUpload(this.options)) {
-                this.options.dropZone
-                    .bind('dragover.' + ns, {fileupload: this}, this._onDragOver)
-                    .bind('drop.' + ns, {fileupload: this}, this._onDrop)
-                    .bind('paste.' + ns, {fileupload: this}, this._onPaste);
-            }
-            this.options.fileInput
-                .bind('change.' + ns, {fileupload: this}, this._onChange);
-        },
+    _onDragOver: getDragHandler('dragover'),
 
-        _destroyEventHandlers: function () {
-            var ns = this.options.namespace;
-            this.options.dropZone
-                .unbind('dragover.' + ns, this._onDragOver)
-                .unbind('drop.' + ns, this._onDrop)
-                .unbind('paste.' + ns, this._onPaste);
-            this.options.fileInput
-                .unbind('change.' + ns, this._onChange);
-        },
+    _onDragEnter: getDragHandler('dragenter'),
 
-        _setOption: function (key, value) {
-            var refresh = $.inArray(key, this._refreshOptionsList) !== -1;
-            if (refresh) {
-                this._destroyEventHandlers();
-            }
-            $.Widget.prototype._setOption.call(this, key, value);
-            if (refresh) {
-                this._initSpecialOptions();
-                this._initEventHandlers();
-            }
-        },
+    _onDragLeave: getDragHandler('dragleave'),
 
-        _initSpecialOptions: function () {
-            var options = this.options;
-            if (options.fileInput === undefined) {
-                options.fileInput = this.element.is('input[type="file"]') ?
-                        this.element : this.element.find('input[type="file"]');
-            } else if (!(options.fileInput instanceof $)) {
-                options.fileInput = $(options.fileInput);
-            }
-            if (!(options.dropZone instanceof $)) {
-                options.dropZone = $(options.dropZone);
-            }
-        },
+    _initEventHandlers: function () {
+      if (this._isXHRUpload(this.options)) {
+        this._on(this.options.dropZone, {
+          dragover: this._onDragOver,
+          drop: this._onDrop,
+          // event.preventDefault() on dragenter is required for IE10+:
+          dragenter: this._onDragEnter,
+          // dragleave is not required, but added for completeness:
+          dragleave: this._onDragLeave
+        });
+        this._on(this.options.pasteZone, {
+          paste: this._onPaste
+        });
+      }
+      if ($.support.fileInput) {
+        this._on(this.options.fileInput, {
+          change: this._onChange
+        });
+      }
+    },
 
-        _create: function () {
-            var options = this.options;
-            // Initialize options set via HTML5 data-attributes:
-            $.extend(options, $(this.element[0].cloneNode(false)).data());
-            options.namespace = options.namespace || this.widgetName;
-            this._initSpecialOptions();
-            this._slots = [];
-            this._sequence = this._getXHRPromise(true);
-            this._sending = this._active = this._loaded = this._total = 0;
-            this._initEventHandlers();
-        },
+    _destroyEventHandlers: function () {
+      this._off(this.options.dropZone, 'dragenter dragleave dragover drop');
+      this._off(this.options.pasteZone, 'paste');
+      this._off(this.options.fileInput, 'change');
+    },
 
-        destroy: function () {
-            this._destroyEventHandlers();
-            $.Widget.prototype.destroy.call(this);
-        },
+    _destroy: function () {
+      this._destroyEventHandlers();
+    },
 
-        enable: function () {
-            var wasDisabled = false;
-            if (this.options.disabled) {
-                wasDisabled = true;
-            }
-            $.Widget.prototype.enable.call(this);
-            if (wasDisabled) {
-                this._initEventHandlers();
-            }
-        },
+    _setOption: function (key, value) {
+      var reinit = $.inArray(key, this._specialOptions) !== -1;
+      if (reinit) {
+        this._destroyEventHandlers();
+      }
+      this._super(key, value);
+      if (reinit) {
+        this._initSpecialOptions();
+        this._initEventHandlers();
+      }
+    },
 
-        disable: function () {
-            if (!this.options.disabled) {
-                this._destroyEventHandlers();
-            }
-            $.Widget.prototype.disable.call(this);
-        },
+    _initSpecialOptions: function () {
+      var options = this.options;
+      if (options.fileInput === undefined) {
+        options.fileInput = this.element.is('input[type="file"]')
+          ? this.element
+          : this.element.find('input[type="file"]');
+      } else if (!(options.fileInput instanceof $)) {
+        options.fileInput = $(options.fileInput);
+      }
+      if (!(options.dropZone instanceof $)) {
+        options.dropZone = $(options.dropZone);
+      }
+      if (!(options.pasteZone instanceof $)) {
+        options.pasteZone = $(options.pasteZone);
+      }
+    },
 
-        // This method is exposed to the widget API and allows adding files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files property and can contain additional options:
-        // .fileupload('add', {files: filesList});
-        add: function (data) {
-            var that = this;
-            if (!data || this.options.disabled) {
-                return;
-            }
-            if (data.fileInput && !data.files) {
-                this._getFileInputFiles(data.fileInput).always(function (files) {
-                    data.files = files;
-                    that._onAdd(null, data);
-                });
-            } else {
-                data.files = $.makeArray(data.files);
-                this._onAdd(null, data);
-            }
-        },
+    _getRegExp: function (str) {
+      var parts = str.split('/'),
+        modifiers = parts.pop();
+      parts.shift();
+      return new RegExp(parts.join('/'), modifiers);
+    },
 
-        // This method is exposed to the widget API and allows sending files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files or fileInput property and can contain additional options:
-        // .fileupload('send', {files: filesList});
-        // The method returns a Promise object for the file upload call.
-        send: function (data) {
-            if (data && !this.options.disabled) {
-                if (data.fileInput && !data.files) {
-                    var that = this,
-                        dfd = $.Deferred(),
-                        promise = dfd.promise(),
-                        jqXHR,
-                        aborted;
-                    promise.abort = function () {
-                        aborted = true;
-                        if (jqXHR) {
-                            return jqXHR.abort();
-                        }
-                        dfd.reject(null, 'abort', 'abort');
-                        return promise;
-                    };
-                    this._getFileInputFiles(data.fileInput).always(
-                        function (files) {
-                            if (aborted) {
-                                return;
-                            }
-                            data.files = files;
-                            jqXHR = that._onSend(null, data).then(
-                                function (result, textStatus, jqXHR) {
-                                    dfd.resolve(result, textStatus, jqXHR);
-                                },
-                                function (jqXHR, textStatus, errorThrown) {
-                                    dfd.reject(jqXHR, textStatus, errorThrown);
-                                }
-                            );
-                        }
-                    );
-                    return this._enhancePromise(promise);
-                }
-                data.files = $.makeArray(data.files);
-                if (data.files.length) {
-                    return this._onSend(null, data);
-                }
-            }
-            return this._getXHRPromise(false, data && data.context);
+    _isRegExpOption: function (key, value) {
+      return (
+        key !== 'url' &&
+        $.type(value) === 'string' &&
+        /^\/.*\/[igm]{0,3}$/.test(value)
+      );
+    },
+
+    _initDataAttributes: function () {
+      var that = this,
+        options = this.options,
+        data = this.element.data();
+      // Initialize options set via HTML5 data-attributes:
+      $.each(this.element[0].attributes, function (index, attr) {
+        var key = attr.name.toLowerCase(),
+          value;
+        if (/^data-/.test(key)) {
+          // Convert hyphen-ated key to camelCase:
+          key = key.slice(5).replace(/-[a-z]/g, function (str) {
+            return str.charAt(1).toUpperCase();
+          });
+          value = data[key];
+          if (that._isRegExpOption(key, value)) {
+            value = that._getRegExp(value);
+          }
+          options[key] = value;
         }
+      });
+    },
+
+    _create: function () {
+      this._initDataAttributes();
+      this._initSpecialOptions();
+      this._slots = [];
+      this._sequence = this._getXHRPromise(true);
+      this._sending = this._active = 0;
+      this._initProgressObject(this);
+      this._initEventHandlers();
+    },
+
+    // This method is exposed to the widget API and allows to query
+    // the number of active uploads:
+    active: function () {
+      return this._active;
+    },
 
-    });
+    // This method is exposed to the widget API and allows to query
+    // the widget upload progress.
+    // It returns an object with loaded, total and bitrate properties
+    // for the running uploads:
+    progress: function () {
+      return this._progress;
+    },
 
-}));
+    // This method is exposed to the widget API and allows adding files
+    // using the fileupload API. The data parameter accepts an object which
+    // must have a files property and can contain additional options:
+    // .fileupload('add', {files: filesList});
+    add: function (data) {
+      var that = this;
+      if (!data || this.options.disabled) {
+        return;
+      }
+      if (data.fileInput && !data.files) {
+        this._getFileInputFiles(data.fileInput).always(function (files) {
+          data.files = files;
+          that._onAdd(null, data);
+        });
+      } else {
+        data.files = $.makeArray(data.files);
+        this._onAdd(null, data);
+      }
+    },
+
+    // This method is exposed to the widget API and allows sending files
+    // using the fileupload API. The data parameter accepts an object which
+    // must have a files or fileInput property and can contain additional options:
+    // .fileupload('send', {files: filesList});
+    // The method returns a Promise object for the file upload call.
+    send: function (data) {
+      if (data && !this.options.disabled) {
+        if (data.fileInput && !data.files) {
+          var that = this,
+            dfd = $.Deferred(),
+            promise = dfd.promise(),
+            jqXHR,
+            aborted;
+          promise.abort = function () {
+            aborted = true;
+            if (jqXHR) {
+              return jqXHR.abort();
+            }
+            dfd.reject(null, 'abort', 'abort');
+            return promise;
+          };
+          this._getFileInputFiles(data.fileInput).always(function (files) {
+            if (aborted) {
+              return;
+            }
+            if (!files.length) {
+              dfd.reject();
+              return;
+            }
+            data.files = files;
+            jqXHR = that._onSend(null, data);
+            jqXHR.then(
+              function (result, textStatus, jqXHR) {
+                dfd.resolve(result, textStatus, jqXHR);
+              },
+              function (jqXHR, textStatus, errorThrown) {
+                dfd.reject(jqXHR, textStatus, errorThrown);
+              }
+            );
+          });
+          return this._enhancePromise(promise);
+        }
+        data.files = $.makeArray(data.files);
+        if (data.files.length) {
+          return this._onSend(null, data);
+        }
+      }
+      return this._getXHRPromise(false, data && data.context);
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/jquery.iframe-transport.js b/lib/web/jquery/fileUploader/jquery.iframe-transport.js
index 4749f46993652..3e3b9a93b05df 100644
--- a/lib/web/jquery/fileUploader/jquery.iframe-transport.js
+++ b/lib/web/jquery/fileUploader/jquery.iframe-transport.js
@@ -1,172 +1,227 @@
 /*
- * jQuery Iframe Transport Plugin 1.5
+ * jQuery Iframe Transport Plugin
  * https://github.com/blueimp/jQuery-File-Upload
  *
  * Copyright 2011, Sebastian Tschan
  * https://blueimp.net
  *
  * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
+ * https://opensource.org/licenses/MIT
  */
 
-/*jslint unparam: true, nomen: true */
-/*global define, window, document */
+/* global define, require */
 
 (function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(require('jquery'));
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})(function ($) {
+  'use strict';
 
-    // Helper variable to create unique names for the transport iframes:
-    var counter = 0;
+  // Helper variable to create unique names for the transport iframes:
+  var counter = 0,
+    jsonAPI = $,
+    jsonParse = 'parseJSON';
 
-    // The iframe transport accepts three additional options:
-    // options.fileInput: a jQuery collection of file input fields
-    // options.paramName: the parameter name for the file form data,
-    //  overrides the name property of the file input field(s),
-    //  can be a string or an array of strings.
-    // options.formData: an array of objects with name and value properties,
-    //  equivalent to the return data of .serializeArray(), e.g.:
-    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
-    $.ajaxTransport('iframe', function (options) {
-        if (options.async && (options.type === 'POST' || options.type === 'GET')) {
-            var form,
-                iframe;
-            return {
-                send: function (_, completeCallback) {
-                    form = $('<form style="display:none;"></form>');
-                    form.attr('accept-charset', options.formAcceptCharset);
-                    // javascript:false as initial iframe src
-                    // prevents warning popups on HTTPS in IE6.
-                    // IE versions below IE8 cannot set the name property of
-                    // elements that have already been added to the DOM,
-                    // so we set the name along with the iframe HTML markup:
-                    iframe = $(
-                        '<iframe src="javascript:false;" name="iframe-transport-' +
-                            (counter += 1) + '"></iframe>'
-                    ).bind('load', function () {
-                        var fileInputClones,
-                            paramNames = $.isArray(options.paramName) ?
-                                    options.paramName : [options.paramName];
-                        iframe
-                            .unbind('load')
-                            .bind('load', function () {
-                                var response;
-                                // Wrap in a try/catch block to catch exceptions thrown
-                                // when trying to access cross-domain iframe contents:
-                                try {
-                                    response = iframe.contents();
-                                    // Google Chrome and Firefox do not throw an
-                                    // exception when calling iframe.contents() on
-                                    // cross-domain requests, so we unify the response:
-                                    if (!response.length || !response[0].firstChild) {
-                                        throw new Error();
-                                    }
-                                } catch (e) {
-                                    response = undefined;
-                                }
-                                // The complete callback returns the
-                                // iframe content document as response object:
-                                completeCallback(
-                                    200,
-                                    'success',
-                                    {'iframe': response}
-                                );
-                                // Fix for IE endless progress bar activity bug
-                                // (happens on form submits to iframe targets):
-                                $('<iframe src="javascript:false;"></iframe>')
-                                    .appendTo(form);
-                                form.remove();
-                            });
-                        form
-                            .prop('target', iframe.prop('name'))
-                            .prop('action', options.url)
-                            .prop('method', options.type);
-                        if (options.formData) {
-                            $.each(options.formData, function (index, field) {
-                                $('<input type="hidden"/>')
-                                    .prop('name', field.name)
-                                    .val(field.value)
-                                    .appendTo(form);
-                            });
-                        }
-                        if (options.fileInput && options.fileInput.length &&
-                                options.type === 'POST') {
-                            fileInputClones = options.fileInput.clone();
-                            // Insert a clone for each file input field:
-                            options.fileInput.after(function (index) {
-                                return fileInputClones[index];
-                            });
-                            if (options.paramName) {
-                                options.fileInput.each(function (index) {
-                                    $(this).prop(
-                                        'name',
-                                        paramNames[index] || options.paramName
-                                    );
-                                });
-                            }
-                            // Appending the file input fields to the hidden form
-                            // removes them from their original location:
-                            form
-                                .append(options.fileInput)
-                                .prop('enctype', 'multipart/form-data')
-                                // enctype must be set as encoding for IE:
-                                .prop('encoding', 'multipart/form-data');
-                        }
-                        form.submit();
-                        // Insert the file input fields at their original location
-                        // by replacing the clones with the originals:
-                        if (fileInputClones && fileInputClones.length) {
-                            options.fileInput.each(function (index, input) {
-                                var clone = $(fileInputClones[index]);
-                                $(input).prop('name', clone.prop('name'));
-                                clone.replaceWith(input);
-                            });
-                        }
-                    });
-                    form.append(iframe).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        // javascript:false as iframe src aborts the request
-                        // and prevents warning popups on HTTPS in IE6.
-                        // concat is used to avoid the "Script URL" JSLint error:
-                        iframe
-                            .unbind('load')
-                            .prop('src', 'javascript'.concat(':false;'));
-                    }
-                    if (form) {
-                        form.remove();
-                    }
-                }
-            };
-        }
-    });
+  if ('JSON' in window && 'parse' in JSON) {
+    jsonAPI = JSON;
+    jsonParse = 'parse';
+  }
 
-    // The iframe transport returns the iframe content document as response.
-    // The following adds converters from iframe to text, json, html, and script:
-    $.ajaxSetup({
-        converters: {
-            'iframe text': function (iframe) {
-                return $(iframe[0].body).text();
-            },
-            'iframe json': function (iframe) {
-                return $.parseJSON($(iframe[0].body).text());
-            },
-            'iframe html': function (iframe) {
-                return $(iframe[0].body).html();
-            },
-            'iframe script': function (iframe) {
-                return $.globalEval($(iframe[0].body).text());
+  // The iframe transport accepts four additional options:
+  // options.fileInput: a jQuery collection of file input fields
+  // options.paramName: the parameter name for the file form data,
+  //  overrides the name property of the file input field(s),
+  //  can be a string or an array of strings.
+  // options.formData: an array of objects with name and value properties,
+  //  equivalent to the return data of .serializeArray(), e.g.:
+  //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
+  // options.initialIframeSrc: the URL of the initial iframe src,
+  //  by default set to "javascript:false;"
+  $.ajaxTransport('iframe', function (options) {
+    if (options.async) {
+      // javascript:false as initial iframe src
+      // prevents warning popups on HTTPS in IE6:
+      // eslint-disable-next-line no-script-url
+      var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
+        form,
+        iframe,
+        addParamChar;
+      return {
+        send: function (_, completeCallback) {
+          form = $('<form style="display:none;"></form>');
+          form.attr('accept-charset', options.formAcceptCharset);
+          addParamChar = /\?/.test(options.url) ? '&' : '?';
+          // XDomainRequest only supports GET and POST:
+          if (options.type === 'DELETE') {
+            options.url = options.url + addParamChar + '_method=DELETE';
+            options.type = 'POST';
+          } else if (options.type === 'PUT') {
+            options.url = options.url + addParamChar + '_method=PUT';
+            options.type = 'POST';
+          } else if (options.type === 'PATCH') {
+            options.url = options.url + addParamChar + '_method=PATCH';
+            options.type = 'POST';
+          }
+          // IE versions below IE8 cannot set the name property of
+          // elements that have already been added to the DOM,
+          // so we set the name along with the iframe HTML markup:
+          counter += 1;
+          iframe = $(
+            '<iframe src="' +
+              initialIframeSrc +
+              '" name="iframe-transport-' +
+              counter +
+              '"></iframe>'
+          ).on('load', function () {
+            var fileInputClones,
+              paramNames = $.isArray(options.paramName)
+                ? options.paramName
+                : [options.paramName];
+            iframe.off('load').on('load', function () {
+              var response;
+              // Wrap in a try/catch block to catch exceptions thrown
+              // when trying to access cross-domain iframe contents:
+              try {
+                response = iframe.contents();
+                // Google Chrome and Firefox do not throw an
+                // exception when calling iframe.contents() on
+                // cross-domain requests, so we unify the response:
+                if (!response.length || !response[0].firstChild) {
+                  throw new Error();
+                }
+              } catch (e) {
+                response = undefined;
+              }
+              // The complete callback returns the
+              // iframe content document as response object:
+              completeCallback(200, 'success', { iframe: response });
+              // Fix for IE endless progress bar activity bug
+              // (happens on form submits to iframe targets):
+              $('<iframe src="' + initialIframeSrc + '"></iframe>').appendTo(
+                form
+              );
+              window.setTimeout(function () {
+                // Removing the form in a setTimeout call
+                // allows Chrome's developer tools to display
+                // the response result
+                form.remove();
+              }, 0);
+            });
+            form
+              .prop('target', iframe.prop('name'))
+              .prop('action', options.url)
+              .prop('method', options.type);
+            if (options.formData) {
+              $.each(options.formData, function (index, field) {
+                $('<input type="hidden"/>')
+                  .prop('name', field.name)
+                  .val(field.value)
+                  .appendTo(form);
+              });
             }
+            if (
+              options.fileInput &&
+              options.fileInput.length &&
+              options.type === 'POST'
+            ) {
+              fileInputClones = options.fileInput.clone();
+              // Insert a clone for each file input field:
+              options.fileInput.after(function (index) {
+                return fileInputClones[index];
+              });
+              if (options.paramName) {
+                options.fileInput.each(function (index) {
+                  $(this).prop('name', paramNames[index] || options.paramName);
+                });
+              }
+              // Appending the file input fields to the hidden form
+              // removes them from their original location:
+              form
+                .append(options.fileInput)
+                .prop('enctype', 'multipart/form-data')
+                // enctype must be set as encoding for IE:
+                .prop('encoding', 'multipart/form-data');
+              // Remove the HTML5 form attribute from the input(s):
+              options.fileInput.removeAttr('form');
+            }
+            window.setTimeout(function () {
+              // Submitting the form in a setTimeout call fixes an issue with
+              // Safari 13 not triggering the iframe load event after resetting
+              // the load event handler, see also:
+              // https://github.com/blueimp/jQuery-File-Upload/issues/3633
+              form.submit();
+              // Insert the file input fields at their original location
+              // by replacing the clones with the originals:
+              if (fileInputClones && fileInputClones.length) {
+                options.fileInput.each(function (index, input) {
+                  var clone = $(fileInputClones[index]);
+                  // Restore the original name and form properties:
+                  $(input)
+                    .prop('name', clone.prop('name'))
+                    .attr('form', clone.attr('form'));
+                  clone.replaceWith(input);
+                });
+              }
+            }, 0);
+          });
+          form.append(iframe).appendTo(document.body);
+        },
+        abort: function () {
+          if (iframe) {
+            // javascript:false as iframe src aborts the request
+            // and prevents warning popups on HTTPS in IE6.
+            iframe.off('load').prop('src', initialIframeSrc);
+          }
+          if (form) {
+            form.remove();
+          }
         }
-    });
+      };
+    }
+  });
 
-}));
+  // The iframe transport returns the iframe content document as response.
+  // The following adds converters from iframe to text, json, html, xml
+  // and script.
+  // Please note that the Content-Type for JSON responses has to be text/plain
+  // or text/html, if the browser doesn't include application/json in the
+  // Accept header, else IE will show a download dialog.
+  // The Content-Type for XML responses on the other hand has to be always
+  // application/xml or text/xml, so IE properly parses the XML response.
+  // See also
+  // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
+  $.ajaxSetup({
+    converters: {
+      'iframe text': function (iframe) {
+        return iframe && $(iframe[0].body).text();
+      },
+      'iframe json': function (iframe) {
+        return iframe && jsonAPI[jsonParse]($(iframe[0].body).text());
+      },
+      'iframe html': function (iframe) {
+        return iframe && $(iframe[0].body).html();
+      },
+      'iframe xml': function (iframe) {
+        var xmlDoc = iframe && iframe[0];
+        return xmlDoc && $.isXMLDoc(xmlDoc)
+          ? xmlDoc
+          : $.parseXML(
+              (xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
+                $(xmlDoc.body).html()
+            );
+      },
+      'iframe script': function (iframe) {
+        return iframe && $.globalEval($(iframe[0].body).text());
+      }
+    }
+  });
+});
diff --git a/lib/web/jquery/fileUploader/load-image.js b/lib/web/jquery/fileUploader/load-image.js
deleted file mode 100644
index f6817db48c045..0000000000000
--- a/lib/web/jquery/fileUploader/load-image.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(a){"use strict";var b=function(a,c,d){var e=document.createElement("img"),f,g;return e.onerror=c,e.onload=function(){g&&(!d||!d.noRevoke)&&b.revokeObjectURL(g),c(b.scale(e,d))},window.Blob&&a instanceof Blob||window.File&&a instanceof File?f=g=b.createObjectURL(a):f=a,f?(e.src=f,e):b.readFile(a,function(a){e.src=a})},c=window.createObjectURL&&window||window.URL&&URL.revokeObjectURL&&URL||window.webkitURL&&webkitURL;b.scale=function(a,b){b=b||{};var c=document.createElement("canvas"),d=a.width,e=a.height,f=Math.max((b.minWidth||d)/d,(b.minHeight||e)/e);return f>1&&(d=parseInt(d*f,10),e=parseInt(e*f,10)),f=Math.min((b.maxWidth||d)/d,(b.maxHeight||e)/e),f<1&&(d=parseInt(d*f,10),e=parseInt(e*f,10)),a.getContext||b.canvas&&c.getContext?(c.width=d,c.height=e,c.getContext("2d").drawImage(a,0,0,d,e),c):(a.width=d,a.height=e,a)},b.createObjectURL=function(a){return c?c.createObjectURL(a):!1},b.revokeObjectURL=function(a){return c?c.revokeObjectURL(a):!1},b.readFile=function(a,b){if(window.FileReader&&FileReader.prototype.readAsDataURL){var c=new FileReader;return c.onload=function(a){b(a.target.result)},c.readAsDataURL(a),c}return!1},typeof define=="function"&&define.amd?define(function(){return b}):a.loadImage=b})(this);
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/locale.js b/lib/web/jquery/fileUploader/locale.js
deleted file mode 100644
index ea64b0a870ff7..0000000000000
--- a/lib/web/jquery/fileUploader/locale.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * jQuery File Upload Plugin Localization Example 6.5.1
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*global window */
-
-window.locale = {
-    "fileupload": {
-        "errors": {
-            "maxFileSize": "File is too big",
-            "minFileSize": "File is too small",
-            "acceptFileTypes": "Filetype not allowed",
-            "maxNumberOfFiles": "Max number of files exceeded",
-            "uploadedBytes": "Uploaded bytes exceed file size",
-            "emptyResult": "Empty file upload result"
-        },
-        "error": "Error",
-        "start": "Start",
-        "cancel": "Cancel",
-        "destroy": "Delete"
-    }
-};
diff --git a/lib/web/jquery/fileUploader/main.js b/lib/web/jquery/fileUploader/main.js
deleted file mode 100644
index 7231899276c4b..0000000000000
--- a/lib/web/jquery/fileUploader/main.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * jQuery File Upload Plugin JS Example 6.7
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * http://www.opensource.org/licenses/MIT
- */
-
-/*jslint nomen: true, unparam: true, regexp: true */
-/*global $, window, document */
-
-$(function () {
-    'use strict';
-
-    // Initialize the jQuery File Upload widget:
-    $('#fileupload').fileupload();
-
-    // Enable iframe cross-domain access via redirect option:
-    $('#fileupload').fileupload(
-        'option',
-        'redirect',
-        window.location.href.replace(
-            /\/[^\/]*$/,
-            '/cors/result.html?%s'
-        )
-    );
-
-    if (window.location.hostname === 'blueimp.github.com') {
-        // Demo settings:
-        $('#fileupload').fileupload('option', {
-            url: '//jquery-file-upload.appspot.com/',
-            maxFileSize: 5000000,
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-            process: [
-                {
-                    action: 'load',
-                    fileTypes: /^image\/(gif|jpeg|png)$/,
-                    maxFileSize: 20000000 // 20MB
-                },
-                {
-                    action: 'resize',
-                    maxWidth: 1440,
-                    maxHeight: 900
-                },
-                {
-                    action: 'save'
-                }
-            ]
-        });
-        // Upload server status check for browsers with CORS support:
-        if ($.support.cors) {
-            $.ajax({
-                url: '//jquery-file-upload.appspot.com/',
-                type: 'HEAD'
-            }).fail(function () {
-                $('<span class="alert alert-error"/>')
-                    .text($.mage.__('Upload server currently unavailable - ') +
-                            new Date())
-                    .appendTo('#fileupload');
-            });
-        }
-    } else {
-        // Load existing files:
-        $('#fileupload').each(function () {
-            var that = this;
-            $.getJSON(this.action, function (result) {
-                if (result && result.length) {
-                    $(that).fileupload('option', 'done')
-                        .call(that, null, {result: result});
-                }
-            });
-        });
-    }
-
-});
diff --git a/lib/web/jquery/fileUploader/vendor/jquery.ui.widget.js b/lib/web/jquery/fileUploader/vendor/jquery.ui.widget.js
index 39287bd41ab09..69096aaa35ef4 100644
--- a/lib/web/jquery/fileUploader/vendor/jquery.ui.widget.js
+++ b/lib/web/jquery/fileUploader/vendor/jquery.ui.widget.js
@@ -1,282 +1,808 @@
-/*
- * jQuery UI Widget 1.8.23+amd
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
+/*! jQuery UI - v1.12.1+0b7246b6eeadfa9e2696e22f3230f6452f8129dc - 2020-02-20
+ * http://jqueryui.com
+ * Includes: widget.js
+ * Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+/* global define, require */
+/* eslint-disable no-param-reassign, new-cap, jsdoc/require-jsdoc */
 
 (function (factory) {
-    if (typeof define === "function" && define.amd) {
-        // Register as an anonymous AMD module:
-        define(["jquery"], factory);
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define(['jquery'], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS
+    factory(require('jquery'));
+  } else {
+    // Browser globals
+    factory(window.jQuery);
+  }
+})(function ($) {
+  ('use strict');
+
+  $.ui = $.ui || {};
+
+  $.ui.version = '1.12.1';
+
+  /*!
+   * jQuery UI Widget 1.12.1
+   * http://jqueryui.com
+   *
+   * Copyright jQuery Foundation and other contributors
+   * Released under the MIT license.
+   * http://jquery.org/license
+   */
+
+  //>>label: Widget
+  //>>group: Core
+  //>>description: Provides a factory for creating stateful widgets with a common API.
+  //>>docs: http://api.jqueryui.com/jQuery.widget/
+  //>>demos: http://jqueryui.com/widget/
+
+  // Support: jQuery 1.9.x or older
+  // $.expr[ ":" ] is deprecated.
+  if (!$.expr.pseudos) {
+    $.expr.pseudos = $.expr[':'];
+  }
+
+  // Support: jQuery 1.11.x or older
+  // $.unique has been renamed to $.uniqueSort
+  if (!$.uniqueSort) {
+    $.uniqueSort = $.unique;
+  }
+
+  var widgetUuid = 0;
+  var widgetHasOwnProperty = Array.prototype.hasOwnProperty;
+  var widgetSlice = Array.prototype.slice;
+
+  $.cleanData = (function (orig) {
+    return function (elems) {
+      var events, elem, i;
+      // eslint-disable-next-line eqeqeq
+      for (i = 0; (elem = elems[i]) != null; i++) {
+        // Only trigger remove when necessary to save time
+        events = $._data(elem, 'events');
+        if (events && events.remove) {
+          $(elem).triggerHandler('remove');
+        }
+      }
+      orig(elems);
+    };
+  })($.cleanData);
+
+  $.widget = function (name, base, prototype) {
+    var existingConstructor, constructor, basePrototype;
+
+    // ProxiedPrototype allows the provided prototype to remain unmodified
+    // so that it can be used as a mixin for multiple widgets (#8876)
+    var proxiedPrototype = {};
+
+    var namespace = name.split('.')[0];
+    name = name.split('.')[1];
+    var fullName = namespace + '-' + name;
+
+    if (!prototype) {
+      prototype = base;
+      base = $.Widget;
+    }
+
+    if ($.isArray(prototype)) {
+      prototype = $.extend.apply(null, [{}].concat(prototype));
+    }
+
+    // Create selector for plugin
+    $.expr.pseudos[fullName.toLowerCase()] = function (elem) {
+      return !!$.data(elem, fullName);
+    };
+
+    $[namespace] = $[namespace] || {};
+    existingConstructor = $[namespace][name];
+    constructor = $[namespace][name] = function (options, element) {
+      // Allow instantiation without "new" keyword
+      if (!this._createWidget) {
+        return new constructor(options, element);
+      }
+
+      // Allow instantiation without initializing for simple inheritance
+      // must use "new" keyword (the code above always passes args)
+      if (arguments.length) {
+        this._createWidget(options, element);
+      }
+    };
+
+    // Extend with the existing constructor to carry over any static properties
+    $.extend(constructor, existingConstructor, {
+      version: prototype.version,
+
+      // Copy the object used to create the prototype in case we need to
+      // redefine the widget later
+      _proto: $.extend({}, prototype),
+
+      // Track widgets that inherit from this widget in case this widget is
+      // redefined after a widget inherits from it
+      _childConstructors: []
+    });
+
+    basePrototype = new base();
+
+    // We need to make the options hash a property directly on the new instance
+    // otherwise we'll modify the options hash on the prototype that we're
+    // inheriting from
+    basePrototype.options = $.widget.extend({}, basePrototype.options);
+    $.each(prototype, function (prop, value) {
+      if (!$.isFunction(value)) {
+        proxiedPrototype[prop] = value;
+        return;
+      }
+      proxiedPrototype[prop] = (function () {
+        function _super() {
+          return base.prototype[prop].apply(this, arguments);
+        }
+
+        function _superApply(args) {
+          return base.prototype[prop].apply(this, args);
+        }
+
+        return function () {
+          var __super = this._super;
+          var __superApply = this._superApply;
+          var returnValue;
+
+          this._super = _super;
+          this._superApply = _superApply;
+
+          returnValue = value.apply(this, arguments);
+
+          this._super = __super;
+          this._superApply = __superApply;
+
+          return returnValue;
+        };
+      })();
+    });
+    constructor.prototype = $.widget.extend(
+      basePrototype,
+      {
+        // TODO: remove support for widgetEventPrefix
+        // always use the name + a colon as the prefix, e.g., draggable:start
+        // don't prefix for widgets that aren't DOM-based
+        widgetEventPrefix: existingConstructor
+          ? basePrototype.widgetEventPrefix || name
+          : name
+      },
+      proxiedPrototype,
+      {
+        constructor: constructor,
+        namespace: namespace,
+        widgetName: name,
+        widgetFullName: fullName
+      }
+    );
+
+    // If this widget is being redefined then we need to find all widgets that
+    // are inheriting from it and redefine all of them so that they inherit from
+    // the new version of this widget. We're essentially trying to replace one
+    // level in the prototype chain.
+    if (existingConstructor) {
+      $.each(existingConstructor._childConstructors, function (i, child) {
+        var childPrototype = child.prototype;
+
+        // Redefine the child widget using the same prototype that was
+        // originally used, but inherit from the new version of the base
+        $.widget(
+          childPrototype.namespace + '.' + childPrototype.widgetName,
+          constructor,
+          child._proto
+        );
+      });
+
+      // Remove the list of existing child constructors from the old constructor
+      // so the old child constructors can be garbage collected
+      delete existingConstructor._childConstructors;
     } else {
-        // Browser globals:
-        factory(jQuery);
+      base._childConstructors.push(constructor);
+    }
+
+    $.widget.bridge(name, constructor);
+
+    return constructor;
+  };
+
+  $.widget.extend = function (target) {
+    var input = widgetSlice.call(arguments, 1);
+    var inputIndex = 0;
+    var inputLength = input.length;
+    var key;
+    var value;
+
+    for (; inputIndex < inputLength; inputIndex++) {
+      for (key in input[inputIndex]) {
+        value = input[inputIndex][key];
+        if (
+          widgetHasOwnProperty.call(input[inputIndex], key) &&
+          value !== undefined
+        ) {
+          // Clone objects
+          if ($.isPlainObject(value)) {
+            target[key] = $.isPlainObject(target[key])
+              ? $.widget.extend({}, target[key], value)
+              : // Don't extend strings, arrays, etc. with objects
+                $.widget.extend({}, value);
+
+            // Copy everything else by reference
+          } else {
+            target[key] = value;
+          }
+        }
+      }
+    }
+    return target;
+  };
+
+  $.widget.bridge = function (name, object) {
+    var fullName = object.prototype.widgetFullName || name;
+    $.fn[name] = function (options) {
+      var isMethodCall = typeof options === 'string';
+      var args = widgetSlice.call(arguments, 1);
+      var returnValue = this;
+
+      if (isMethodCall) {
+        // If this is an empty collection, we need to have the instance method
+        // return undefined instead of the jQuery instance
+        if (!this.length && options === 'instance') {
+          returnValue = undefined;
+        } else {
+          this.each(function () {
+            var methodValue;
+            var instance = $.data(this, fullName);
+
+            if (options === 'instance') {
+              returnValue = instance;
+              return false;
+            }
+
+            if (!instance) {
+              return $.error(
+                'cannot call methods on ' +
+                  name +
+                  ' prior to initialization; ' +
+                  "attempted to call method '" +
+                  options +
+                  "'"
+              );
+            }
+
+            if (!$.isFunction(instance[options]) || options.charAt(0) === '_') {
+              return $.error(
+                "no such method '" +
+                  options +
+                  "' for " +
+                  name +
+                  ' widget instance'
+              );
+            }
+
+            methodValue = instance[options].apply(instance, args);
+
+            if (methodValue !== instance && methodValue !== undefined) {
+              returnValue =
+                methodValue && methodValue.jquery
+                  ? returnValue.pushStack(methodValue.get())
+                  : methodValue;
+              return false;
+            }
+          });
+        }
+      } else {
+        // Allow multiple hashes to be passed on init
+        if (args.length) {
+          options = $.widget.extend.apply(null, [options].concat(args));
+        }
+
+        this.each(function () {
+          var instance = $.data(this, fullName);
+          if (instance) {
+            instance.option(options || {});
+            if (instance._init) {
+              instance._init();
+            }
+          } else {
+            $.data(this, fullName, new object(options, this));
+          }
+        });
+      }
+
+      return returnValue;
+    };
+  };
+
+  $.Widget = function (/* options, element */) {};
+  $.Widget._childConstructors = [];
+
+  $.Widget.prototype = {
+    widgetName: 'widget',
+    widgetEventPrefix: '',
+    defaultElement: '<div>',
+
+    options: {
+      classes: {},
+      disabled: false,
+
+      // Callbacks
+      create: null
+    },
+
+    _createWidget: function (options, element) {
+      element = $(element || this.defaultElement || this)[0];
+      this.element = $(element);
+      this.uuid = widgetUuid++;
+      this.eventNamespace = '.' + this.widgetName + this.uuid;
+
+      this.bindings = $();
+      this.hoverable = $();
+      this.focusable = $();
+      this.classesElementLookup = {};
+
+      if (element !== this) {
+        $.data(element, this.widgetFullName, this);
+        this._on(true, this.element, {
+          remove: function (event) {
+            if (event.target === element) {
+              this.destroy();
+            }
+          }
+        });
+        this.document = $(
+          element.style
+            ? // Element within the document
+              element.ownerDocument
+            : // Element is window or document
+              element.document || element
+        );
+        this.window = $(
+          this.document[0].defaultView || this.document[0].parentWindow
+        );
+      }
+
+      this.options = $.widget.extend(
+        {},
+        this.options,
+        this._getCreateOptions(),
+        options
+      );
+
+      this._create();
+
+      if (this.options.disabled) {
+        this._setOptionDisabled(this.options.disabled);
+      }
+
+      this._trigger('create', null, this._getCreateEventData());
+      this._init();
+    },
+
+    _getCreateOptions: function () {
+      return {};
+    },
+
+    _getCreateEventData: $.noop,
+
+    _create: $.noop,
+
+    _init: $.noop,
+
+    destroy: function () {
+      var that = this;
+
+      this._destroy();
+      $.each(this.classesElementLookup, function (key, value) {
+        that._removeClass(value, key);
+      });
+
+      // We can probably remove the unbind calls in 2.0
+      // all event bindings should go through this._on()
+      this.element.off(this.eventNamespace).removeData(this.widgetFullName);
+      this.widget().off(this.eventNamespace).removeAttr('aria-disabled');
+
+      // Clean up events and states
+      this.bindings.off(this.eventNamespace);
+    },
+
+    _destroy: $.noop,
+
+    widget: function () {
+      return this.element;
+    },
+
+    option: function (key, value) {
+      var options = key;
+      var parts;
+      var curOption;
+      var i;
+
+      if (arguments.length === 0) {
+        // Don't return a reference to the internal hash
+        return $.widget.extend({}, this.options);
+      }
+
+      if (typeof key === 'string') {
+        // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+        options = {};
+        parts = key.split('.');
+        key = parts.shift();
+        if (parts.length) {
+          curOption = options[key] = $.widget.extend({}, this.options[key]);
+          for (i = 0; i < parts.length - 1; i++) {
+            curOption[parts[i]] = curOption[parts[i]] || {};
+            curOption = curOption[parts[i]];
+          }
+          key = parts.pop();
+          if (arguments.length === 1) {
+            return curOption[key] === undefined ? null : curOption[key];
+          }
+          curOption[key] = value;
+        } else {
+          if (arguments.length === 1) {
+            return this.options[key] === undefined ? null : this.options[key];
+          }
+          options[key] = value;
+        }
+      }
+
+      this._setOptions(options);
+
+      return this;
+    },
+
+    _setOptions: function (options) {
+      var key;
+
+      for (key in options) {
+        this._setOption(key, options[key]);
+      }
+
+      return this;
+    },
+
+    _setOption: function (key, value) {
+      if (key === 'classes') {
+        this._setOptionClasses(value);
+      }
+
+      this.options[key] = value;
+
+      if (key === 'disabled') {
+        this._setOptionDisabled(value);
+      }
+
+      return this;
+    },
+
+    _setOptionClasses: function (value) {
+      var classKey, elements, currentElements;
+
+      for (classKey in value) {
+        currentElements = this.classesElementLookup[classKey];
+        if (
+          value[classKey] === this.options.classes[classKey] ||
+          !currentElements ||
+          !currentElements.length
+        ) {
+          continue;
+        }
+
+        // We are doing this to create a new jQuery object because the _removeClass() call
+        // on the next line is going to destroy the reference to the current elements being
+        // tracked. We need to save a copy of this collection so that we can add the new classes
+        // below.
+        elements = $(currentElements.get());
+        this._removeClass(currentElements, classKey);
+
+        // We don't use _addClass() here, because that uses this.options.classes
+        // for generating the string of classes. We want to use the value passed in from
+        // _setOption(), this is the new value of the classes option which was passed to
+        // _setOption(). We pass this value directly to _classes().
+        elements.addClass(
+          this._classes({
+            element: elements,
+            keys: classKey,
+            classes: value,
+            add: true
+          })
+        );
+      }
+    },
+
+    _setOptionDisabled: function (value) {
+      this._toggleClass(
+        this.widget(),
+        this.widgetFullName + '-disabled',
+        null,
+        !!value
+      );
+
+      // If the widget is becoming disabled, then nothing is interactive
+      if (value) {
+        this._removeClass(this.hoverable, null, 'ui-state-hover');
+        this._removeClass(this.focusable, null, 'ui-state-focus');
+      }
+    },
+
+    enable: function () {
+      return this._setOptions({ disabled: false });
+    },
+
+    disable: function () {
+      return this._setOptions({ disabled: true });
+    },
+
+    _classes: function (options) {
+      var full = [];
+      var that = this;
+
+      options = $.extend(
+        {
+          element: this.element,
+          classes: this.options.classes || {}
+        },
+        options
+      );
+
+      function bindRemoveEvent() {
+        options.element.each(function (_, element) {
+          var isTracked = $.map(that.classesElementLookup, function (elements) {
+            return elements;
+          }).some(function (elements) {
+            return elements.is(element);
+          });
+
+          if (!isTracked) {
+            that._on($(element), {
+              remove: '_untrackClassesElement'
+            });
+          }
+        });
+      }
+
+      function processClassString(classes, checkOption) {
+        var current, i;
+        for (i = 0; i < classes.length; i++) {
+          current = that.classesElementLookup[classes[i]] || $();
+          if (options.add) {
+            bindRemoveEvent();
+            current = $(
+              $.uniqueSort(current.get().concat(options.element.get()))
+            );
+          } else {
+            current = $(current.not(options.element).get());
+          }
+          that.classesElementLookup[classes[i]] = current;
+          full.push(classes[i]);
+          if (checkOption && options.classes[classes[i]]) {
+            full.push(options.classes[classes[i]]);
+          }
+        }
+      }
+
+      if (options.keys) {
+        processClassString(options.keys.match(/\S+/g) || [], true);
+      }
+      if (options.extra) {
+        processClassString(options.extra.match(/\S+/g) || []);
+      }
+
+      return full.join(' ');
+    },
+
+    _untrackClassesElement: function (event) {
+      var that = this;
+      $.each(that.classesElementLookup, function (key, value) {
+        if ($.inArray(event.target, value) !== -1) {
+          that.classesElementLookup[key] = $(value.not(event.target).get());
+        }
+      });
+
+      this._off($(event.target));
+    },
+
+    _removeClass: function (element, keys, extra) {
+      return this._toggleClass(element, keys, extra, false);
+    },
+
+    _addClass: function (element, keys, extra) {
+      return this._toggleClass(element, keys, extra, true);
+    },
+
+    _toggleClass: function (element, keys, extra, add) {
+      add = typeof add === 'boolean' ? add : extra;
+      var shift = typeof element === 'string' || element === null,
+        options = {
+          extra: shift ? keys : extra,
+          keys: shift ? element : keys,
+          element: shift ? this.element : element,
+          add: add
+        };
+      options.element.toggleClass(this._classes(options), add);
+      return this;
+    },
+
+    _on: function (suppressDisabledCheck, element, handlers) {
+      var delegateElement;
+      var instance = this;
+
+      // No suppressDisabledCheck flag, shuffle arguments
+      if (typeof suppressDisabledCheck !== 'boolean') {
+        handlers = element;
+        element = suppressDisabledCheck;
+        suppressDisabledCheck = false;
+      }
+
+      // No element argument, shuffle and use this.element
+      if (!handlers) {
+        handlers = element;
+        element = this.element;
+        delegateElement = this.widget();
+      } else {
+        element = delegateElement = $(element);
+        this.bindings = this.bindings.add(element);
+      }
+
+      $.each(handlers, function (event, handler) {
+        function handlerProxy() {
+          // Allow widgets to customize the disabled handling
+          // - disabled as an array instead of boolean
+          // - disabled class as method for disabling individual parts
+          if (
+            !suppressDisabledCheck &&
+            (instance.options.disabled === true ||
+              $(this).hasClass('ui-state-disabled'))
+          ) {
+            return;
+          }
+          return (typeof handler === 'string'
+            ? instance[handler]
+            : handler
+          ).apply(instance, arguments);
+        }
+
+        // Copy the guid so direct unbinding works
+        if (typeof handler !== 'string') {
+          handlerProxy.guid = handler.guid =
+            handler.guid || handlerProxy.guid || $.guid++;
+        }
+
+        var match = event.match(/^([\w:-]*)\s*(.*)$/);
+        var eventName = match[1] + instance.eventNamespace;
+        var selector = match[2];
+
+        if (selector) {
+          delegateElement.on(eventName, selector, handlerProxy);
+        } else {
+          element.on(eventName, handlerProxy);
+        }
+      });
+    },
+
+    _off: function (element, eventName) {
+      eventName =
+        (eventName || '').split(' ').join(this.eventNamespace + ' ') +
+        this.eventNamespace;
+      element.off(eventName);
+
+      // Clear the stack to avoid memory leaks (#10056)
+      this.bindings = $(this.bindings.not(element).get());
+      this.focusable = $(this.focusable.not(element).get());
+      this.hoverable = $(this.hoverable.not(element).get());
+    },
+
+    _delay: function (handler, delay) {
+      var instance = this;
+      function handlerProxy() {
+        return (typeof handler === 'string'
+          ? instance[handler]
+          : handler
+        ).apply(instance, arguments);
+      }
+      return setTimeout(handlerProxy, delay || 0);
+    },
+
+    _hoverable: function (element) {
+      this.hoverable = this.hoverable.add(element);
+      this._on(element, {
+        mouseenter: function (event) {
+          this._addClass($(event.currentTarget), null, 'ui-state-hover');
+        },
+        mouseleave: function (event) {
+          this._removeClass($(event.currentTarget), null, 'ui-state-hover');
+        }
+      });
+    },
+
+    _focusable: function (element) {
+      this.focusable = this.focusable.add(element);
+      this._on(element, {
+        focusin: function (event) {
+          this._addClass($(event.currentTarget), null, 'ui-state-focus');
+        },
+        focusout: function (event) {
+          this._removeClass($(event.currentTarget), null, 'ui-state-focus');
+        }
+      });
+    },
+
+    _trigger: function (type, event, data) {
+      var prop, orig;
+      var callback = this.options[type];
+
+      data = data || {};
+      event = $.Event(event);
+      event.type = (type === this.widgetEventPrefix
+        ? type
+        : this.widgetEventPrefix + type
+      ).toLowerCase();
+
+      // The original event may come from any element
+      // so we need to reset the target on the new event
+      event.target = this.element[0];
+
+      // Copy original event properties over to the new event
+      orig = event.originalEvent;
+      if (orig) {
+        for (prop in orig) {
+          if (!(prop in event)) {
+            event[prop] = orig[prop];
+          }
+        }
+      }
+
+      this.element.trigger(event, data);
+      return !(
+        ($.isFunction(callback) &&
+          callback.apply(this.element[0], [event].concat(data)) === false) ||
+        event.isDefaultPrevented()
+      );
     }
-}(function( $, undefined ) {
-
-// jQuery 1.4+
-if ( $.cleanData ) {
-	var _cleanData = $.cleanData;
-	$.cleanData = function( elems ) {
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			try {
-				$( elem ).triggerHandler( "remove" );
-			// http://bugs.jquery.com/ticket/8235
-			} catch( e ) {}
-		}
-		_cleanData( elems );
-	};
-} else {
-	var _remove = $.fn.remove;
-	$.fn.remove = function( selector, keepData ) {
-		return this.each(function() {
-			if ( !keepData ) {
-				if ( !selector || $.filter( selector, [ this ] ).length ) {
-					$( "*", this ).add( [ this ] ).each(function() {
-						try {
-							$( this ).triggerHandler( "remove" );
-						// http://bugs.jquery.com/ticket/8235
-						} catch( e ) {}
-					});
-				}
-			}
-			return _remove.call( $(this), selector, keepData );
-		});
-	};
-}
-
-$.widget = function( name, base, prototype ) {
-	var namespace = name.split( "." )[ 0 ],
-		fullName;
-	name = name.split( "." )[ 1 ];
-	fullName = namespace + "-" + name;
-
-	if ( !prototype ) {
-		prototype = base;
-		base = $.Widget;
-	}
-
-	// create selector for plugin
-	$.expr[ ":" ][ fullName ] = function( elem ) {
-		return !!$.data( elem, name );
-	};
-
-	$[ namespace ] = $[ namespace ] || {};
-	$[ namespace ][ name ] = function( options, element ) {
-		// allow instantiation without initializing for simple inheritance
-		if ( arguments.length ) {
-			this._createWidget( options, element );
-		}
-	};
-
-	var basePrototype = new base();
-	// we need to make the options hash a property directly on the new instance
-	// otherwise we'll modify the options hash on the prototype that we're
-	// inheriting from
-//	$.each( basePrototype, function( key, val ) {
-//		if ( $.isPlainObject(val) ) {
-//			basePrototype[ key ] = $.extend( {}, val );
-//		}
-//	});
-	basePrototype.options = $.extend( true, {}, basePrototype.options );
-	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
-		namespace: namespace,
-		widgetName: name,
-		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
-		widgetBaseClass: fullName
-	}, prototype );
-
-	$.widget.bridge( name, $[ namespace ][ name ] );
-};
-
-$.widget.bridge = function( name, object ) {
-	$.fn[ name ] = function( options ) {
-		var isMethodCall = typeof options === "string",
-			args = Array.prototype.slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.extend.apply( null, [ true, options ].concat(args) ) :
-			options;
-
-		// prevent calls to internal methods
-		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
-			return returnValue;
-		}
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var instance = $.data( this, name ),
-					methodValue = instance && $.isFunction( instance[options] ) ?
-						instance[ options ].apply( instance, args ) :
-						instance;
-				// TODO: add this back in 1.9 and use $.error() (see #5972)
-//				if ( !instance ) {
-//					throw "cannot call methods on " + name + " prior to initialization; " +
-//						"attempted to call method '" + options + "'";
-//				}
-//				if ( !$.isFunction( instance[options] ) ) {
-//					throw "no such method '" + options + "' for " + name + " widget instance";
-//				}
-//				var methodValue = instance[ options ].apply( instance, args );
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, name );
-				if ( instance ) {
-					instance.option( options || {} )._init();
-				} else {
-					$.data( this, name, new object( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-};
-
-$.Widget = function( options, element ) {
-	// allow instantiation without initializing for simple inheritance
-	if ( arguments.length ) {
-		this._createWidget( options, element );
-	}
-};
-
-$.Widget.prototype = {
-	widgetName: "widget",
-	widgetEventPrefix: "",
-	options: {
-		disabled: false
-	},
-	_createWidget: function( options, element ) {
-		// $.widget.bridge stores the plugin instance, but we do it anyway
-		// so that it's stored even before the _create function runs
-		$.data( element, this.widgetName, this );
-		this.element = $( element );
-		this.options = $.extend( true, {},
-			this.options,
-			this._getCreateOptions(),
-			options );
-
-		var self = this;
-		this.element.bind( "remove." + this.widgetName, function() {
-			self.destroy();
-		});
-
-		this._create();
-		this._trigger( "create" );
-		this._init();
-	},
-	_getCreateOptions: function() {
-		return $.metadata && $.metadata.get( this.element[0] )[ this.widgetName ];
-	},
-	_create: function() {},
-	_init: function() {},
-
-	destroy: function() {
-		this.element
-			.unbind( "." + this.widgetName )
-			.removeData( this.widgetName );
-		this.widget()
-			.unbind( "." + this.widgetName )
-			.removeAttr( "aria-disabled" )
-			.removeClass(
-				this.widgetBaseClass + "-disabled " +
-				"ui-state-disabled" );
-	},
-
-	widget: function() {
-		return this.element;
-	},
-
-	option: function( key, value ) {
-		var options = key;
-
-		if ( arguments.length === 0 ) {
-			// don't return a reference to the internal hash
-			return $.extend( {}, this.options );
-		}
-
-		if  (typeof key === "string" ) {
-			if ( value === undefined ) {
-				return this.options[ key ];
-			}
-			options = {};
-			options[ key ] = value;
-		}
-
-		this._setOptions( options );
-
-		return this;
-	},
-	_setOptions: function( options ) {
-		var self = this;
-		$.each( options, function( key, value ) {
-			self._setOption( key, value );
-		});
-
-		return this;
-	},
-	_setOption: function( key, value ) {
-		this.options[ key ] = value;
-
-		if ( key === "disabled" ) {
-			this.widget()
-				[ value ? "addClass" : "removeClass"](
-					this.widgetBaseClass + "-disabled" + " " +
-					"ui-state-disabled" )
-				.attr( "aria-disabled", value );
-		}
-
-		return this;
-	},
-
-	enable: function() {
-		return this._setOption( "disabled", false );
-	},
-	disable: function() {
-		return this._setOption( "disabled", true );
-	},
-
-	_trigger: function( type, event, data ) {
-		var prop, orig,
-			callback = this.options[ type ];
-
-		data = data || {};
-		event = $.Event( event );
-		event.type = ( type === this.widgetEventPrefix ?
-			type :
-			this.widgetEventPrefix + type ).toLowerCase();
-		// the original event may come from any element
-		// so we need to reset the target on the new event
-		event.target = this.element[ 0 ];
-
-		// copy original event properties over to the new event
-		orig = event.originalEvent;
-		if ( orig ) {
-			for ( prop in orig ) {
-				if ( !( prop in event ) ) {
-					event[ prop ] = orig[ prop ];
-				}
-			}
-		}
-
-		this.element.trigger( event, data );
-
-		return !( $.isFunction(callback) &&
-			callback.call( this.element[0], event, data ) === false ||
-			event.isDefaultPrevented() );
-	}
-};
-
-}));
+  };
+
+  $.each({ show: 'fadeIn', hide: 'fadeOut' }, function (method, defaultEffect) {
+    $.Widget.prototype['_' + method] = function (element, options, callback) {
+      if (typeof options === 'string') {
+        options = { effect: options };
+      }
+
+      var hasOptions;
+      var effectName = !options
+        ? method
+        : options === true || typeof options === 'number'
+        ? defaultEffect
+        : options.effect || defaultEffect;
+
+      options = options || {};
+      if (typeof options === 'number') {
+        options = { duration: options };
+      }
+
+      hasOptions = !$.isEmptyObject(options);
+      options.complete = callback;
+
+      if (options.delay) {
+        element.delay(options.delay);
+      }
+
+      if (hasOptions && $.effects && $.effects.effect[effectName]) {
+        element[method](options);
+      } else if (effectName !== method && element[effectName]) {
+        element[effectName](options.duration, options.easing, callback);
+      } else {
+        element.queue(function (next) {
+          $(this)[method]();
+          if (callback) {
+            callback.call(element[0]);
+          }
+          next();
+        });
+      }
+    };
+  });
+});

From 9119b9a395d85d2a6e2a21ae8899b5f83c02c272 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Sun, 7 Jun 2020 20:31:05 -0500
Subject: [PATCH 019/671] MC-34467: Updated jQuery File Upload plugin

- Fixed dependency failures
- Fixed static test failure
---
 app/code/Magento/Theme/view/base/requirejs-config.js      | 2 ++
 app/code/Magento/User/view/adminhtml/web/app-config.js    | 1 +
 lib/web/jquery/fileUploader/jquery.fileupload-audio.js    | 4 ++--
 lib/web/jquery/fileUploader/jquery.fileupload-image.js    | 4 ++--
 lib/web/jquery/fileUploader/jquery.fileupload-process.js  | 4 ++--
 lib/web/jquery/fileUploader/jquery.fileupload-validate.js | 6 +++---
 lib/web/jquery/fileUploader/jquery.fileupload-video.js    | 4 ++--
 lib/web/jquery/fileUploader/jquery.fileupload.js          | 2 +-
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index 77af920c8df86..f5f6c01e31e88 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -32,6 +32,8 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
+        'jquery/file-upload': 'jquery/fileUploader/jquery.fileupload',
+        'jquery-ui/ui/widget': 'jquery/fileUploader/vendor/jquery.ui.widget',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index 491378d933ca2..b8eae1c4495d1 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -27,6 +27,7 @@ require.config({
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
+        'jquery/fileupload.js': 'jquery/fileUploader/jquery.fileupload',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
index e5c9202f9730a..c5bcf940fc66b 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
@@ -15,13 +15,13 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'load-image', './jquery.fileupload-process'], factory);
+    define(['jquery', 'load-image', 'jquery/file-uploader'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
       require('blueimp-load-image/js/load-image'),
-      require('./jquery.fileupload-process')
+      require('jquery/file-uploader')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-image.js b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
index 8598461031e2e..15713e6123dfc 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-image.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
@@ -23,7 +23,7 @@
       'load-image-exif',
       'load-image-orientation',
       'canvas-to-blob',
-      './jquery.fileupload-process'
+      'jquery/file-uploader'
     ], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
@@ -35,7 +35,7 @@
       require('blueimp-load-image/js/load-image-exif'),
       require('blueimp-load-image/js/load-image-orientation'),
       require('blueimp-canvas-to-blob'),
-      require('./jquery.fileupload-process')
+      require('jquery/file-uploader')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-process.js b/lib/web/jquery/fileUploader/jquery.fileupload-process.js
index 130778e7f26a6..d8e13a7773020 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-process.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-process.js
@@ -15,10 +15,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', './jquery.fileupload'], factory);
+    define(['jquery', 'jquery/file-upload'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('./jquery.fileupload'));
+    factory(require('jquery'), require('jquery/file-upload'));
   } else {
     // Browser globals:
     factory(window.jQuery);
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
index a277efc46d774..4826efb2c4844 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
@@ -15,10 +15,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', './jquery.fileupload-process'], factory);
+    define(['jquery', 'jquery/file-uploader'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('./jquery.fileupload-process'));
+    factory(require('jquery'), require('jquery/file-uploader'));
   } else {
     // Browser globals:
     factory(window.jQuery);
@@ -57,7 +57,7 @@
             */
 
       // Function returning the current number of files,
-      // has to be overriden for maxNumberOfFiles validation:
+      // has to be over-ridden for maxNumberOfFiles validation:
       getNumberOfFiles: $.noop,
 
       // Error and info messages:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-video.js b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
index 5dc78f36bb829..e2484630aa2a4 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-video.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
@@ -15,13 +15,13 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'load-image', './jquery.fileupload-process'], factory);
+    define(['jquery', 'load-image', 'jquery/file-uploader'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
       require('blueimp-load-image/js/load-image'),
-      require('./jquery.fileupload-process')
+      require('jquery/file-uploader')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload.js b/lib/web/jquery/fileUploader/jquery.fileupload.js
index 184d347216409..dda71f0413c71 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload.js
@@ -19,7 +19,7 @@
     define(['jquery', 'jquery-ui/ui/widget'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('./vendor/jquery.ui.widget'));
+    factory(require('jquery'), require('jquery-ui/ui/widget'));
   } else {
     // Browser globals:
     factory(window.jQuery);

From 31028f856e650a608d6f9855a4335c55d3470c7b Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Mon, 8 Jun 2020 10:55:32 -0500
Subject: [PATCH 020/671] MC-34467: Updated jQuery File Upload plugin

- Fixed dependency issues
---
 .../Magento/Theme/view/base/requirejs-config.js  |  2 --
 .../User/view/adminhtml/web/app-config.js        |  1 -
 .../fileUploader/jquery.fileupload-audio.js      |  4 ++--
 .../fileUploader/jquery.fileupload-image.js      |  4 ++--
 .../fileUploader/jquery.fileupload-process.js    |  4 ++--
 .../jquery/fileUploader/jquery.fileupload-ui.js  | 16 ++++++++--------
 .../fileUploader/jquery.fileupload-validate.js   |  6 +++---
 .../fileUploader/jquery.fileupload-video.js      |  4 ++--
 lib/web/jquery/fileUploader/jquery.fileupload.js |  4 ++--
 9 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index f5f6c01e31e88..77af920c8df86 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -32,8 +32,6 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
-        'jquery/file-upload': 'jquery/fileUploader/jquery.fileupload',
-        'jquery-ui/ui/widget': 'jquery/fileUploader/vendor/jquery.ui.widget',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index b8eae1c4495d1..491378d933ca2 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -27,7 +27,6 @@ require.config({
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
-        'jquery/fileupload.js': 'jquery/fileUploader/jquery.fileupload',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
index c5bcf940fc66b..0bd4c27553dc0 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
@@ -15,13 +15,13 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'load-image', 'jquery/file-uploader'], factory);
+    define(['jquery', 'load-image', 'jquery/fileUploader/jquery.fileupload-process'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
       require('blueimp-load-image/js/load-image'),
-      require('jquery/file-uploader')
+      require('jquery/fileUploader/jquery.fileupload-process')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-image.js b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
index 15713e6123dfc..84349fc9fbf92 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-image.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
@@ -23,7 +23,7 @@
       'load-image-exif',
       'load-image-orientation',
       'canvas-to-blob',
-      'jquery/file-uploader'
+      'jquery/fileUploader/jquery.fileupload-process'
     ], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
@@ -35,7 +35,7 @@
       require('blueimp-load-image/js/load-image-exif'),
       require('blueimp-load-image/js/load-image-orientation'),
       require('blueimp-canvas-to-blob'),
-      require('jquery/file-uploader')
+      require('jquery/fileUploader/jquery.fileupload-process')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-process.js b/lib/web/jquery/fileUploader/jquery.fileupload-process.js
index d8e13a7773020..a2f1009e508d1 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-process.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-process.js
@@ -15,10 +15,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'jquery/file-upload'], factory);
+    define(['jquery', 'jquery/fileUploader/jquery.fileupload'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('jquery/file-upload'));
+    factory(require('jquery'), require('jquery/fileUploader/jquery.fileupload'));
   } else {
     // Browser globals:
     factory(window.jQuery);
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
index 9cc3d3fd0fb1f..4ee566b2b3bcb 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
@@ -18,20 +18,20 @@
     define([
       'jquery',
       'blueimp-tmpl',
-      './jquery.fileupload-image',
-      './jquery.fileupload-audio',
-      './jquery.fileupload-video',
-      './jquery.fileupload-validate'
+      'jquery/fileUploader/jquery.fileupload-image',
+      'jquery/fileUploader/jquery.fileupload-audio',
+      'jquery/fileUploader/jquery.fileupload-video',
+      'jquery/fileUploader/jquery.fileupload-validate'
     ], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
       require('blueimp-tmpl'),
-      require('./jquery.fileupload-image'),
-      require('./jquery.fileupload-audio'),
-      require('./jquery.fileupload-video'),
-      require('./jquery.fileupload-validate')
+      require('jquery/fileUploader/jquery.fileupload-image'),
+      require('jquery/fileUploader/jquery.fileupload-audio'),
+      require('jquery/fileUploader/jquery.fileupload-video'),
+      require('jquery/fileUploader/jquery.fileupload-validate')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
index 4826efb2c4844..9353b01cdcf41 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
@@ -15,10 +15,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'jquery/file-uploader'], factory);
+    define(['jquery', 'jquery/fileUploader/jquery.fileupload-process'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('jquery/file-uploader'));
+    factory(require('jquery'), require('jquery/fileUploader/jquery.fileupload-process'));
   } else {
     // Browser globals:
     factory(window.jQuery);
@@ -57,7 +57,7 @@
             */
 
       // Function returning the current number of files,
-      // has to be over-ridden for maxNumberOfFiles validation:
+      // has to be overriden for maxNumberOfFiles validation:
       getNumberOfFiles: $.noop,
 
       // Error and info messages:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-video.js b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
index e2484630aa2a4..70cd9f1dcfc16 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-video.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
@@ -15,13 +15,13 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'load-image', 'jquery/file-uploader'], factory);
+    define(['jquery', 'load-image', 'jquery/fileUploader/jquery.fileupload-process'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
       require('blueimp-load-image/js/load-image'),
-      require('jquery/file-uploader')
+      require('jquery/fileUploader/jquery.fileupload-process')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload.js b/lib/web/jquery/fileUploader/jquery.fileupload.js
index dda71f0413c71..8f0ff0d4faf03 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload.js
@@ -16,10 +16,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'jquery-ui/ui/widget'], factory);
+    define(['jquery', 'jquery/fileUploader/vendor/jquery.ui.widget'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('jquery-ui/ui/widget'));
+    factory(require('jquery'), require('jquery/fileUploader/vendor/jquery.ui.widget'));
   } else {
     // Browser globals:
     factory(window.jQuery);

From 36167ed430c4e98150e5e60946f08b67c327fa86 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Mon, 8 Jun 2020 13:44:53 -0500
Subject: [PATCH 021/671] MC-34467: Updated jQuery File Upload plugin

- Fixed static test failure
---
 lib/web/jquery/fileUploader/jquery.fileupload-validate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
index 9353b01cdcf41..d23e0f4a24ef7 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-validate.js
@@ -57,7 +57,7 @@
             */
 
       // Function returning the current number of files,
-      // has to be overriden for maxNumberOfFiles validation:
+      // has to be overridden for maxNumberOfFiles validation:
       getNumberOfFiles: $.noop,
 
       // Error and info messages:

From f7b94572d5ba20286785af773df55e884ba8244e Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Tue, 9 Jun 2020 09:02:37 +0300
Subject: [PATCH 022/671] MC-34727: Improve error path view file url

---
 .../Magento/Framework/Error/ProcessorTest.php | 17 ++++++++++++-
 pub/errors/processor.php                      | 24 +++++++++++++------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Error/ProcessorTest.php b/dev/tests/integration/testsuite/Magento/Framework/Error/ProcessorTest.php
index af2f8208afab1..3a2a02a0a5776 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Error/ProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Error/ProcessorTest.php
@@ -31,7 +31,10 @@ protected function setUp(): void
     protected function tearDown(): void
     {
         $reportDir = $this->processor->_reportDir;
-        $this->removeDirRecursively($reportDir);
+
+        if (is_dir($reportDir)) {
+            $this->removeDirRecursively($reportDir);
+        }
     }
 
     /**
@@ -137,4 +140,16 @@ private function removeDirRecursively(string $dir, int $i = 0): bool
         }
         return rmdir($dir);
     }
+
+    /**
+     * @return void
+     */
+    public function testGetViewFileUrl(): void
+    {
+        $this->processor->_indexDir = __DIR__ . '/version1/magento2';
+        $this->processor->_errorDir = __DIR__ . '/version2/magento2';
+
+        $this->assertStringNotContainsString('version2/magento2', $this->processor->getViewFileUrl());
+        $this->assertStringContainsString('pub/errors/', $this->processor->getViewFileUrl());
+    }
 }
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
index 7cab4add51a92..ac335211f97e0 100644
--- a/pub/errors/processor.php
+++ b/pub/errors/processor.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Framework\Error;
 
+use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Escaper;
 use Magento\Framework\App\ObjectManager;
@@ -149,21 +150,29 @@ class Processor
      */
     private $escaper;
 
+    /**
+     * @var DocumentRoot
+     */
+    private $documentRoot;
+
     /**
      * @param Http $response
      * @param Json $serializer
      * @param Escaper $escaper
+     * @param DocumentRoot|null $documentRoot
      */
     public function __construct(
         Http $response,
         Json $serializer = null,
-        Escaper $escaper = null
+        Escaper $escaper = null,
+        DocumentRoot $documentRoot = null
     ) {
         $this->_response = $response;
         $this->_errorDir  = __DIR__ . '/';
         $this->_reportDir = dirname(dirname($this->_errorDir)) . '/var/report/';
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
         $this->escaper = $escaper ?: ObjectManager::getInstance()->get(Escaper::class);
+        $this->documentRoot = $documentRoot ?? ObjectManager::getInstance()->get(DocumentRoot::class);
 
         if (!empty($_SERVER['SCRIPT_NAME'])) {
             if (in_array(basename($_SERVER['SCRIPT_NAME'], '.php'), ['404', '503', 'report'])) {
@@ -255,12 +264,13 @@ public function processReport()
     public function getViewFileUrl()
     {
         //The url needs to be updated base on Document root path.
-        return $this->getBaseUrl() .
-        str_replace(
-            str_replace('\\', '/', $this->_indexDir),
-            '',
-            str_replace('\\', '/', $this->_errorDir)
-        ) . $this->_config->skin . '/';
+        $indexDir = str_replace('\\', '/', $this->_indexDir);
+        $errorDir = str_replace('\\', '/', $this->_errorDir);
+        $errorPathSuffix = $this->documentRoot->isPub() ? 'errors/' : 'pub/errors/';
+        $errorPath = strpos($errorDir, $indexDir) === 0 ?
+            str_replace($indexDir, '', $errorDir) : $errorPathSuffix;
+
+        return $this->getBaseUrl() . $errorPath . $this->_config->skin . '/';
     }
 
     /**

From 6df864fb33d76cffbe9d795462ddb44cf0291cd4 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 02:32:02 -0500
Subject: [PATCH 023/671] MC-34467: Updated jQuery File Upload plugin

- Fixed mftf test failures
---
 .../view/adminhtml/web/js/get-video-information.js        | 8 ++++++--
 lib/web/mage/backend/floating-header.js                   | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
index 5756356d4ff24..7386e438e9961 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -129,7 +129,9 @@ define([
              * Abstract destroying command
              */
             destroy: function () {
-                this._player.destroy();
+                if (this._player) {
+                    this._player.destroy();
+                }
             },
 
             /**
@@ -288,7 +290,9 @@ define([
              */
             destroy: function () {
                 this.stop();
-                this._player.destroy();
+                if (this._player) {
+                    this._player.destroy();
+                }
             }
         });
 
diff --git a/lib/web/mage/backend/floating-header.js b/lib/web/mage/backend/floating-header.js
index a6f767259488a..1f3b49149a6e8 100644
--- a/lib/web/mage/backend/floating-header.js
+++ b/lib/web/mage/backend/floating-header.js
@@ -101,7 +101,9 @@ define([
          * @private
          */
         _destroy: function () {
-            this._placeholder.remove();
+            if (this._placeholder) {
+                this._placeholder.remove();
+            }
             this._off($(window));
         }
     });

From f58e4fc92883aba5cef016a231d5789bfd2c489f Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 9 Jun 2020 11:07:42 +0300
Subject: [PATCH 024/671] add test coverage

---
 .../Quote/Customer/CheckoutEndToEndTest.php   | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
index 7b686ea8c92f9..dba712869e6ce 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CheckoutEndToEndTest.php
@@ -13,6 +13,7 @@
 use Magento\Framework\Registry;
 use Magento\Quote\Model\ResourceModel\Quote\CollectionFactory as QuoteCollectionFactory;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -57,23 +58,31 @@ class CheckoutEndToEndTest extends GraphQlAbstract
      */
     private $orderRepository;
 
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
     /**
      * @var array
      */
     private $headers = [];
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        parent::setUp();
-
         $objectManager = Bootstrap::getObjectManager();
+
         $this->registry = $objectManager->get(Registry::class);
         $this->quoteCollectionFactory = $objectManager->get(QuoteCollectionFactory::class);
         $this->quoteResource = $objectManager->get(QuoteResource::class);
         $this->quoteIdMaskFactory = $objectManager->get(QuoteIdMaskFactory::class);
-        $this->customerRepository = Bootstrap::getObjectManager()->get(CustomerRepositoryInterface::class);
+        $this->customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
         $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->orderFactory = $objectManager->get(OrderFactory::class);
     }
 
     /**
@@ -97,8 +106,13 @@ public function testCheckoutWorkflow()
         $paymentMethod = $this->setShippingMethod($cartId, $shippingMethod);
         $this->setPaymentMethod($cartId, $paymentMethod);
 
-        $orderId = $this->placeOrder($cartId);
-        $this->checkOrderInHistory($orderId);
+        $orderIncrementId = $this->placeOrder($cartId);
+
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId($orderIncrementId);
+
+        $this->checkOrderInHistory($orderIncrementId);
+        $this->assertNotEmpty($order->getEmailSent());
     }
 
     /**
@@ -208,7 +222,7 @@ private function createEmptyCart(): string
     private function addProductToCart(string $cartId, float $qty, string $sku): void
     {
         $query = <<<QUERY
-mutation {  
+mutation {
   addSimpleProductsToCart(
     input: {
       cart_id: "{$cartId}"
@@ -350,7 +364,7 @@ private function setShippingMethod(string $cartId, array $method): array
         $query = <<<QUERY
 mutation {
   setShippingMethodsOnCart(input:  {
-    cart_id: "{$cartId}", 
+    cart_id: "{$cartId}",
     shipping_methods: [
       {
          carrier_code: "{$method['carrier_code']}"

From 67fae82c6278827f2c9b0f63083486a9d7740366 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Tue, 9 Jun 2020 13:19:12 +0300
Subject: [PATCH 025/671] MC-34197: Admin user improvement

---
 .../Model/ResourceModel/Role.php              |  2 +
 .../Magento/Backend/Model/Auth/Session.php    | 31 +++++++++-
 .../Security/Model/UserExpirationManager.php  |  2 +-
 .../Security/Observer/AfterAdminUserSave.php  |  2 +-
 .../Unit/Observer/AfterAdminUserSaveTest.php  | 52 +++++++++++++++--
 .../Adminhtml/User/Role/SaveRole.php          |  8 ++-
 .../Magento/User/Model/ResourceModel/User.php | 49 ++++++++++------
 app/code/Magento/User/Model/User.php          | 27 ++++++++-
 .../_files/expired_users_rollback.php         | 26 +++++++++
 .../testsuite/Magento/User/Model/UserTest.php | 58 ++++++++++++-------
 .../_files/user_with_custom_role_rollback.php | 20 +++++--
 11 files changed, 223 insertions(+), 54 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Security/_files/expired_users_rollback.php

diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Role.php b/app/code/Magento/Authorization/Model/ResourceModel/Role.php
index 48fe65e7f8b92..d23d039b2433d 100644
--- a/app/code/Magento/Authorization/Model/ResourceModel/Role.php
+++ b/app/code/Magento/Authorization/Model/ResourceModel/Role.php
@@ -119,6 +119,8 @@ protected function _afterDelete(\Magento\Framework\Model\AbstractModel $role)
 
         $connection->delete($this->_ruleTable, ['role_id = ?' => (int)$role->getId()]);
 
+        $this->_cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [\Magento\Backend\Block\Menu::CACHE_TAGS]);
+
         return $this;
     }
 
diff --git a/app/code/Magento/Backend/Model/Auth/Session.php b/app/code/Magento/Backend/Model/Auth/Session.php
index 809b78b7b98bc..8f959d873243a 100644
--- a/app/code/Magento/Backend/Model/Auth/Session.php
+++ b/app/code/Magento/Backend/Model/Auth/Session.php
@@ -5,8 +5,10 @@
  */
 namespace Magento\Backend\Model\Auth;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\CookieManagerInterface;
+use Magento\Framework\Message\ManagerInterface;
 
 /**
  * Backend Auth session model
@@ -56,6 +58,11 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      */
     protected $_config;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
     /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -69,6 +76,7 @@ class Session extends \Magento\Framework\Session\SessionManager implements \Mage
      * @param \Magento\Framework\Acl\Builder $aclBuilder
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
      * @param \Magento\Backend\App\ConfigInterface $config
+     * @param ManagerInterface $messageManager
      * @throws \Magento\Framework\Exception\SessionException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -84,11 +92,13 @@ public function __construct(
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Acl\Builder $aclBuilder,
         \Magento\Backend\Model\UrlInterface $backendUrl,
-        \Magento\Backend\App\ConfigInterface $config
+        \Magento\Backend\App\ConfigInterface $config,
+        ManagerInterface $messageManager = null
     ) {
         $this->_config = $config;
         $this->_aclBuilder = $aclBuilder;
         $this->_backendUrl = $backendUrl;
+        $this->messageManager = $messageManager ?? ObjectManager::getInstance()->get(ManagerInterface::class);
         parent::__construct(
             $request,
             $sidResolver,
@@ -171,6 +181,25 @@ public function isLoggedIn()
      */
     public function prolong()
     {
+        $sessionUser = $this->getUser();
+        $errorMessage = '';
+        if ($sessionUser !== null) {
+            if ((int)$sessionUser->getIsActive() !== 1) {
+                $errorMessage = 'The account sign-in was incorrect or your account is disabled temporarily. '
+                    . 'Please wait and try again later.';
+            }
+            if (!$sessionUser->hasAssigned2Role($sessionUser->getId())) {
+                $errorMessage = 'More permissions are needed to access this.';
+            }
+
+            if (!empty($errorMessage)) {
+                $this->destroy();
+                $this->messageManager->addErrorMessage(__($errorMessage));
+
+                return;
+            }
+        }
+
         $lifetime = $this->_config->getValue(self::XML_PATH_SESSION_LIFETIME);
         $cookieValue = $this->cookieManager->getCookie($this->getName());
 
diff --git a/app/code/Magento/Security/Model/UserExpirationManager.php b/app/code/Magento/Security/Model/UserExpirationManager.php
index fe6b87de5a8ec..667ff4841165c 100644
--- a/app/code/Magento/Security/Model/UserExpirationManager.php
+++ b/app/code/Magento/Security/Model/UserExpirationManager.php
@@ -122,12 +122,12 @@ private function processExpiredUsers(ExpiredUsersCollection $expiredRecords): vo
 
         // delete expired records
         $expiredRecordIds = $expiredRecords->getAllIds();
+        $expiredRecords->walk('delete');
 
         // set user is_active to 0
         $users = $this->userCollectionFactory->create()
             ->addFieldToFilter('main_table.user_id', ['in' => $expiredRecordIds]);
         $users->setDataToAll('is_active', 0)->save();
-        $expiredRecords->walk('delete');
     }
 
     /**
diff --git a/app/code/Magento/Security/Observer/AfterAdminUserSave.php b/app/code/Magento/Security/Observer/AfterAdminUserSave.php
index d11c1bfdcdf17..096b0f85f5056 100644
--- a/app/code/Magento/Security/Observer/AfterAdminUserSave.php
+++ b/app/code/Magento/Security/Observer/AfterAdminUserSave.php
@@ -53,7 +53,7 @@ public function execute(Observer $observer)
     {
         /* @var $user \Magento\User\Model\User */
         $user = $observer->getEvent()->getObject();
-        if ($user->getId()) {
+        if ($user->getId() && $user->hasData('expires_at')) {
             $expiresAt = $user->getExpiresAt();
             /** @var \Magento\Security\Model\UserExpiration $userExpiration */
             $userExpiration = $this->userExpirationFactory->create();
diff --git a/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php b/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php
index 6a2a6107e3330..f142b2addfd87 100644
--- a/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php
+++ b/app/code/Magento/Security/Test/Unit/Observer/AfterAdminUserSaveTest.php
@@ -86,7 +86,7 @@ protected function setUp(): void
             ->getMock();
         $this->userMock = $this->getMockBuilder(User::class)
             ->addMethods(['getExpiresAt'])
-            ->onlyMethods(['getId'])
+            ->onlyMethods(['getId', 'hasData'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->userExpirationMock = $this->createPartialMock(
@@ -95,13 +95,20 @@ protected function setUp(): void
         );
     }
 
-    public function testSaveNewUserExpiration()
+    /**
+     * @return void
+     */
+    public function testSaveNewUserExpiration(): void
     {
         $userId = '123';
         $this->eventObserverMock->expects(static::once())->method('getEvent')->willReturn($this->eventMock);
         $this->eventMock->expects(static::once())->method('getObject')->willReturn($this->userMock);
         $this->userMock->expects(static::exactly(3))->method('getId')->willReturn($userId);
         $this->userMock->expects(static::once())->method('getExpiresAt')->willReturn($this->getExpiresDateTime());
+        $this->userMock->expects(static::once())
+            ->method('hasData')
+            ->with('expires_at')
+            ->willReturn(true);
         $this->userExpirationFactoryMock->expects(static::once())->method('create')
             ->willReturn($this->userExpirationMock);
         $this->userExpirationResourceMock->expects(static::once())->method('load')
@@ -119,7 +126,7 @@ public function testSaveNewUserExpiration()
     /**
      * @throws \Exception
      */
-    public function testClearUserExpiration()
+    public function testClearUserExpiration(): void
     {
         $userId = '123';
         $this->userExpirationMock->setId($userId);
@@ -128,6 +135,10 @@ public function testClearUserExpiration()
         $this->eventMock->expects(static::once())->method('getObject')->willReturn($this->userMock);
         $this->userMock->expects(static::exactly(2))->method('getId')->willReturn($userId);
         $this->userMock->expects(static::once())->method('getExpiresAt')->willReturn(null);
+        $this->userMock->expects(static::once())
+            ->method('hasData')
+            ->with('expires_at')
+            ->willReturn(true);
         $this->userExpirationFactoryMock->expects(static::once())->method('create')
             ->willReturn($this->userExpirationMock);
         $this->userExpirationResourceMock->expects(static::once())->method('load')
@@ -139,7 +150,10 @@ public function testClearUserExpiration()
         $this->observer->execute($this->eventObserverMock);
     }
 
-    public function testChangeUserExpiration()
+    /**
+     * @return void
+     */
+    public function testChangeUserExpiration(): void
     {
         $userId = '123';
         $this->userExpirationMock->setId($userId);
@@ -148,6 +162,10 @@ public function testChangeUserExpiration()
         $this->eventMock->expects(static::once())->method('getObject')->willReturn($this->userMock);
         $this->userMock->expects(static::exactly(2))->method('getId')->willReturn($userId);
         $this->userMock->expects(static::once())->method('getExpiresAt')->willReturn($this->getExpiresDateTime());
+        $this->userMock->expects(static::once())
+            ->method('hasData')
+            ->with('expires_at')
+            ->willReturn(true);
         $this->userExpirationFactoryMock->expects(static::once())->method('create')
             ->willReturn($this->userExpirationMock);
         $this->userExpirationResourceMock->expects(static::once())->method('load')
@@ -161,11 +179,35 @@ public function testChangeUserExpiration()
         $this->observer->execute($this->eventObserverMock);
     }
 
+    /**
+     * @return void
+     */
+    public function testExecuteWithoutUserExpiration(): void
+    {
+        $userId = '123';
+        $this->userExpirationMock->setId($userId);
+
+        $this->eventObserverMock->expects(static::once())->method('getEvent')->willReturn($this->eventMock);
+        $this->eventMock->expects(static::once())->method('getObject')->willReturn($this->userMock);
+        $this->userMock->expects(static::once())->method('getId')->willReturn($userId);
+        $this->userMock->expects(static::once())
+            ->method('hasData')
+            ->with('expires_at')
+            ->willReturn(false);
+        $this->userExpirationFactoryMock->expects(static::never())->method('create');
+        $this->userExpirationResourceMock->expects(static::never())->method('load');
+
+        $this->userExpirationMock->expects(static::never())->method('getId');
+        $this->userExpirationMock->expects(static::never())->method('setExpiresAt');
+        $this->userExpirationResourceMock->expects(static::never())->method('save');
+        $this->observer->execute($this->eventObserverMock);
+    }
+
     /**
      * @return string
      * @throws \Exception
      */
-    private function getExpiresDateTime()
+    private function getExpiresDateTime(): string
     {
         $testDate = new \DateTime();
         $testDate->modify('+10 days');
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
index 97ecb778b8cb1..39ee382709e56 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
@@ -102,11 +102,12 @@ public function execute()
                 'admin_permissions_role_prepare_save',
                 ['object' => $role, 'request' => $this->getRequest()]
             );
-            $role->save();
-
-            $this->_rulesFactory->create()->setRoleId($role->getId())->setResources($resource)->saveRel();
             $this->processPreviousUsers($role, $oldRoleUsers);
             $this->processCurrentUsers($role, $roleUsers);
+
+            $role->save();
+            $this->_rulesFactory->create()->setRoleId($role->getId())->setResources($resource)->saveRel();
+
             $this->messageManager->addSuccessMessage(__('You saved the role.'));
         } catch (UserLockedException $e) {
             $this->_auth->logout();
@@ -155,6 +156,7 @@ protected function validateUser()
     private function parseRequestVariable($paramName): array
     {
         $value = $this->getRequest()->getParam($paramName, null);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         parse_str($value, $value);
         $value = array_keys($value);
         return $value;
diff --git a/app/code/Magento/User/Model/ResourceModel/User.php b/app/code/Magento/User/Model/ResourceModel/User.php
index d9bc555b8e391..5fa099c041165 100644
--- a/app/code/Magento/User/Model/ResourceModel/User.php
+++ b/app/code/Magento/User/Model/ResourceModel/User.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Acl\Data\CacheInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\AbstractModel;
 use Magento\User\Model\Backend\Config\ObserverConfig;
 use Magento\User\Model\User as ModelUser;
 
@@ -146,7 +147,7 @@ public function hasAssigned2Role($user)
     {
         if (is_numeric($user)) {
             $userId = $user;
-        } elseif ($user instanceof \Magento\Framework\Model\AbstractModel) {
+        } elseif ($user instanceof AbstractModel) {
             $userId = $user->getUserId();
         } else {
             return null;
@@ -171,13 +172,25 @@ public function hasAssigned2Role($user)
         }
     }
 
+    /**
+     * @inheritDoc
+     */
+    protected function _beforeSave(AbstractModel $user)
+    {
+        if ($user->hasRoleId()) {
+            $user->setReloadAclFlag(1);
+        }
+
+        return parent::_beforeSave($user);
+    }
+
     /**
      * Unserialize user extra data after user save
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return $this
      */
-    protected function _afterSave(\Magento\Framework\Model\AbstractModel $user)
+    protected function _afterSave(AbstractModel $user)
     {
         $user->setExtra($this->getSerializer()->unserialize($user->getExtra()));
         if ($user->hasRoleId()) {
@@ -234,10 +247,10 @@ protected function _createUserRole($parentId, ModelUser $user)
     /**
      * Unserialize user extra data after user load
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return $this
      */
-    protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
+    protected function _afterLoad(AbstractModel $user)
     {
         if (is_string($user->getExtra())) {
             $user->setExtra($this->getSerializer()->unserialize($user->getExtra()));
@@ -248,11 +261,11 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Delete user role record with user
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return bool
      * @throws LocalizedException
      */
-    public function delete(\Magento\Framework\Model\AbstractModel $user)
+    public function delete(AbstractModel $user)
     {
         $uid = $user->getId();
         if (!$uid) {
@@ -283,10 +296,10 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Get user roles
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return array
      */
-    public function getRoles(\Magento\Framework\Model\AbstractModel $user)
+    public function getRoles(AbstractModel $user)
     {
         if (!$user->getId()) {
             return [];
@@ -324,10 +337,10 @@ public function getRoles(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Delete user role
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return $this
      */
-    public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
+    public function deleteFromRole(AbstractModel $user)
     {
         if ($user->getUserId() <= 0) {
             return $this;
@@ -351,10 +364,10 @@ public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Check if role user exists
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return array
      */
-    public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
+    public function roleUserExists(AbstractModel $user)
     {
         if ($user->getUserId() > 0) {
             $roleTable = $this->getTable('authorization_role');
@@ -381,10 +394,10 @@ public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Check if user exists
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return array
      */
-    public function userExists(\Magento\Framework\Model\AbstractModel $user)
+    public function userExists(AbstractModel $user)
     {
         $connection = $this->getConnection();
         $select = $connection->select();
@@ -409,10 +422,10 @@ public function userExists(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Whether a user's identity is confirmed
      *
-     * @param \Magento\Framework\Model\AbstractModel $user
+     * @param AbstractModel $user
      * @return bool
      */
-    public function isUserUnique(\Magento\Framework\Model\AbstractModel $user)
+    public function isUserUnique(AbstractModel $user)
     {
         return !$this->userExists($user);
     }
@@ -420,7 +433,7 @@ public function isUserUnique(\Magento\Framework\Model\AbstractModel $user)
     /**
      * Save user extra data
      *
-     * @param \Magento\Framework\Model\AbstractModel $object
+     * @param AbstractModel $object
      * @param string $data
      * @return $this
      */
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 00d2aa140a991..cd969bab27840 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -149,6 +149,11 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      */
     private $deploymentConfig;
 
+    /**
+     * @var string
+     */
+    protected $_cacheTag = \Magento\Backend\Block\Menu::CACHE_TAGS;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -684,7 +689,27 @@ public function loadByUsername($username)
      */
     public function hasAssigned2Role($user)
     {
-        return $this->getResource()->hasAssigned2Role($user);
+        if ($user instanceof AbstractModel) {
+            $userId = $user->getUserId();
+        } elseif (is_numeric($user) && (int)$user !== 0) {
+            $userId = $user;
+        } else {
+            return null;
+        }
+        $data = $this->_cacheManager->load('assigned_role_' . $userId);
+        if (false === $data) {
+            $data = $this->getResource()->hasAssigned2Role($user);
+
+            $this->_cacheManager->save(
+                $this->serializer->serialize($data),
+                'assigned_role_' . $userId,
+                [\Magento\Backend\Block\Menu::CACHE_TAGS]
+            );
+        } else {
+            $data = $this->serializer->unserialize($data);
+        }
+
+        return $data;
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Security/_files/expired_users_rollback.php b/dev/tests/integration/testsuite/Magento/Security/_files/expired_users_rollback.php
new file mode 100644
index 0000000000000..afee49321e309
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Security/_files/expired_users_rollback.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\User\Model\UserFactory;
+use Magento\User\Model\User;
+
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+$userFactory = $objectManager->get(UserFactory::class);
+$userNames = ['adminUserNotExpired', 'adminUserExpired'];
+
+foreach ($userNames as $userName) {
+    /** @var User $user */
+    $user = $userFactory->create();
+    $user->load($userName, 'username');
+
+    if ($user->getId() !== null) {
+        $user->delete();
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index 04e3e2493cc83..feb50b60a8e4a 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -6,25 +6,32 @@
 
 namespace Magento\User\Model;
 
+use Magento\Authorization\Model\Role;
+use Magento\Framework\App\CacheInterface;
 use Magento\Framework\Encryption\Encryptor;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\User\Model\User as UserModel;
 
 /**
  * @magentoAppArea adminhtml
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UserTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\User\Model\User
+     * @var UserModel
      */
     protected $_model;
 
     /**
-     * @var \Magento\Framework\Stdlib\DateTime
+     * @var DateTime
      */
     protected $_dateTime;
 
     /**
-     * @var \Magento\Authorization\Model\Role
+     * @var Role
      */
     protected static $_newRole;
 
@@ -33,17 +40,26 @@ class UserTest extends \PHPUnit\Framework\TestCase
      */
     private $encryptor;
 
+    /**
+     * @var CacheInterface
+     */
+    private $cache;
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\User\Model\User::class
-        );
-        $this->_dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Framework\Stdlib\DateTime::class
-        );
-        $this->encryptor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            Encryptor::class
-        );
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->_model = $this->objectManager->create(UserModel::class);
+        $this->_dateTime = $this->objectManager->get(DateTime::class);
+        $this->encryptor = $this->objectManager->get(Encryptor::class);
+        $this->cache = $this->objectManager->get(CacheInterface::class);
     }
 
     /**
@@ -109,8 +125,8 @@ public function testUpdateRoleOnSave()
      */
     public static function roleDataFixture()
     {
-        self::$_newRole = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Authorization\Model\Role::class
+        self::$_newRole = Bootstrap::getObjectManager()->create(
+            Role::class
         );
         self::$_newRole->setName('admin_role')->setRoleType('G')->setPid('1');
         self::$_newRole->save();
@@ -150,7 +166,7 @@ public function testGetRole()
     {
         $this->_model->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
         $role = $this->_model->getRole();
-        $this->assertInstanceOf(\Magento\Authorization\Model\Role::class, $role);
+        $this->assertInstanceOf(Role::class, $role);
         $this->assertEquals(\Magento\TestFramework\Bootstrap::ADMIN_ROLE_NAME, $this->_model->getRole()->getRoleName());
         $this->_model->setRoleId(self::$_newRole->getId())->save();
         $role = $this->_model->getRole();
@@ -198,7 +214,7 @@ public function testGetName()
 
     public function testGetUninitializedAclRole()
     {
-        $newuser = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\User\Model\User::class);
+        $newuser = $this->objectManager->create(UserModel::class);
         $newuser->setUserId(10);
         $this->assertNull($newuser->getAclRole(), "User role was not initialized and is expected to be empty.");
     }
@@ -251,17 +267,18 @@ public function testAuthenticateInactiveUser()
     }
 
     /**
+     * @magentoDataFixture Magento/User/_files/user_with_custom_role.php
      * @magentoDbIsolation enabled
      */
     public function testAuthenticateUserWithoutRole()
     {
         $this->expectException(\Magento\Framework\Exception\AuthenticationException::class);
 
-        $this->_model->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
+        $this->_model->loadByUsername('customRoleUser');
         $roles = $this->_model->getRoles();
         $this->_model->setRoleId(reset($roles))->deleteFromRole();
         $this->_model->authenticate(
-            \Magento\TestFramework\Bootstrap::ADMIN_NAME,
+            'customRoleUser',
             \Magento\TestFramework\Bootstrap::ADMIN_PASSWORD
         );
     }
@@ -315,6 +332,7 @@ public function testHasAssigned2Role()
         $this->assertArrayHasKey('role_id', $role[0]);
         $roles = $this->_model->getRoles();
         $this->_model->setRoleId(reset($roles))->deleteFromRole();
+        $this->cache->clean([\Magento\Backend\Block\Menu::CACHE_TAGS]);
         $this->assertEmpty($this->_model->hasAssigned2Role($this->_model));
     }
 
@@ -369,8 +387,8 @@ public function testBeforeSavePasswordHash()
             'Salt is expected to be saved along with the password'
         );
 
-        /** @var \Magento\User\Model\User $model */
-        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\User\Model\User::class);
+        /** @var UserModel $model */
+        $model = $this->objectManager->create(UserModel::class);
         $model->load($this->_model->getId());
         $this->assertEquals(
             $this->_model->getPassword(),
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_rollback.php b/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_rollback.php
index f3c061236a1c3..ab1b87b261ff6 100644
--- a/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/User/_files/user_with_custom_role_rollback.php
@@ -9,20 +9,32 @@
 use Magento\Authorization\Model\RoleFactory;
 use Magento\Authorization\Model\Role;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\User\Model\UserFactory;
 use Magento\User\Model\User;
 use Magento\Authorization\Model\RulesFactory;
 use Magento\Authorization\Model\Rules;
 
 //Deleting the user and the role.
+/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
 /** @var User $user */
-$user = Bootstrap::getObjectManager()->create(User::class);
+$user = $objectManager->create(UserFactory::class)->create();
 $user->load('customRoleUser', 'username');
-$user->delete();
+
+if ($user->getId() !== null) {
+    $user->delete();
+}
+
 /** @var Role $role */
 $role = Bootstrap::getObjectManager()->get(RoleFactory::class)->create();
 $role->load('test_custom_role', 'role_name');
 /** @var Rules $rules */
 $rules = Bootstrap::getObjectManager()->get(RulesFactory::class)->create();
 $rules->load($role->getId(), 'role_id');
-$rules->delete();
-$role->delete();
+
+if ($rules->getId() !== null) {
+    $rules->delete();
+}
+if ($role->getId() !== null) {
+    $role->delete();
+}

From 404a047e80ea5ce08243f81ae46eff9312864698 Mon Sep 17 00:00:00 2001
From: Stas Kozar <stas.kozar@transoftgroup.com>
Date: Tue, 9 Jun 2020 15:40:58 +0300
Subject: [PATCH 026/671] MC-34748: Improve zip archive filename validation

---
 .../Magento/Framework/Archive/Zip.php         | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Archive/Zip.php b/lib/internal/Magento/Framework/Archive/Zip.php
index 20f408a605c10..e86d6911546f0 100644
--- a/lib/internal/Magento/Framework/Archive/Zip.php
+++ b/lib/internal/Magento/Framework/Archive/Zip.php
@@ -53,8 +53,9 @@ public function unpack($source, $destination)
     {
         $zip = new \ZipArchive();
         if ($zip->open($source) === true) {
-            $zip->renameIndex(0, basename($destination));
-            $filename = $zip->getNameIndex(0) ?: '';
+            $baseName = basename($destination);
+            $filename = $this->getFilenameFromZip($zip, $baseName);
+
             if ($filename) {
                 $zip->extractTo(dirname($destination), $filename);
             } else {
@@ -67,4 +68,25 @@ public function unpack($source, $destination)
 
         return $destination;
     }
+
+    /**
+     * Retrieve filename for import from zip archive.
+     *
+     * @param \ZipArchive $zip
+     * @param string $baseName
+     *
+     * @return string
+     */
+    private function getFilenameFromZip(\ZipArchive $zip, string $baseName): string
+    {
+        $index = 0;
+
+        do {
+            $zip->renameIndex($index, $baseName);
+            $filename = $zip->getNameIndex($index);
+            $index++;
+        } while ($baseName !== $filename && $filename !== false);
+
+        return $filename === $baseName ? $filename : '';
+    }
 }

From 74c0fb5b64b679ba59c152f4152ebaf45578816f Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 11:23:55 -0500
Subject: [PATCH 027/671] MC-34467: Updated jQuery File Upload plugin

- Fixed static test failures
---
 .../ProductVideo/view/adminhtml/web/js/get-video-information.js  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
index 7386e438e9961..cb56a085304a7 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -290,6 +290,7 @@ define([
              */
             destroy: function () {
                 this.stop();
+
                 if (this._player) {
                     this._player.destroy();
                 }

From 54a508edf6d93963537a2cacf5f713fe45d49655 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 12:59:47 -0500
Subject: [PATCH 028/671] MC-34467: Updated jQuery File Upload plugin

- Fixed mftf test failures
---
 lib/web/jquery/fileUploader/jquery.fileupload.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web/jquery/fileUploader/jquery.fileupload.js b/lib/web/jquery/fileUploader/jquery.fileupload.js
index 8f0ff0d4faf03..dda71f0413c71 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload.js
@@ -16,10 +16,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'jquery/fileUploader/vendor/jquery.ui.widget'], factory);
+    define(['jquery', 'jquery-ui/ui/widget'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('jquery/fileUploader/vendor/jquery.ui.widget'));
+    factory(require('jquery'), require('jquery-ui/ui/widget'));
   } else {
     // Browser globals:
     factory(window.jQuery);

From 7862cde162b05fc387cbb42300ae2a70d0530bb0 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 14:35:08 -0500
Subject: [PATCH 029/671] MC-34467: Updated jQuery File Upload plugin

- Fixed mftf test failures
---
 lib/web/jquery/fileUploader/jquery.fileupload.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/web/jquery/fileUploader/jquery.fileupload.js b/lib/web/jquery/fileUploader/jquery.fileupload.js
index dda71f0413c71..8852817410478 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload.js
@@ -16,10 +16,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'jquery-ui/ui/widget'], factory);
+    define(['jquery', 'jquery-ui-modules/widget'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('jquery-ui/ui/widget'));
+    factory(require('jquery'), require('jquery-ui-modules/widget'));
   } else {
     // Browser globals:
     factory(window.jQuery);

From 4817eb506ae2735d5a5bd298c1e59350a150cb66 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 17:05:29 -0500
Subject: [PATCH 030/671] MC-34467: Updated jQuery File Upload plugin

- Testing cause of error
---
 .../Magento/Ui/view/base/web/js/form/element/file-uploader.js | 2 +-
 lib/web/jquery/fileUploader/jquery.fileupload.js              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 73bef62910644..a77f29b1326f7 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -426,7 +426,7 @@ define([
             } else { // construct message from all aggregatedErrors
                 _.each(this.aggregatedErrors, function (error) {
                     notification().add({
-                        error: true,
+                        error: 'testing',
                         message: '%s' + error.message, // %s to be used as placeholder for html injection
 
                         /**
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload.js b/lib/web/jquery/fileUploader/jquery.fileupload.js
index 8852817410478..8f0ff0d4faf03 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload.js
@@ -16,10 +16,10 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'jquery-ui-modules/widget'], factory);
+    define(['jquery', 'jquery/fileUploader/vendor/jquery.ui.widget'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
-    factory(require('jquery'), require('jquery-ui-modules/widget'));
+    factory(require('jquery'), require('jquery/fileUploader/vendor/jquery.ui.widget'));
   } else {
     // Browser globals:
     factory(window.jQuery);

From 53a3b7c568a90258739dc9c4422601a09dfbaa97 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 18:25:12 -0500
Subject: [PATCH 031/671] MC-34467: Updated jQuery File Upload plugin

- Testing cause of error
---
 .../Magento/Ui/view/base/web/js/form/element/file-uploader.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index a77f29b1326f7..536622ef3e6d4 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -438,7 +438,7 @@ define([
                             var escapedFileName = $('<div>').text(error.filename).html(),
                                 errorMsgBodyHtml = '<strong>%s</strong> %s.<br>'
                                     .replace('%s', escapedFileName)
-                                    .replace('%s', $t('was not uploaded'));
+                                    .replace('%s', $t('was not uploaded test'));
 
                             // html is escaped in message body for notification widget; prepend unescaped html here
                             constructedMessage = constructedMessage.replace('%s', errorMsgBodyHtml);

From 7bba93bb98b4f13f9a654f86062488393fc68010 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Tue, 9 Jun 2020 19:33:51 -0500
Subject: [PATCH 032/671] MC-34467: Updated jQuery File Upload plugin

- Removed test changes
---
 .../Magento/Ui/view/base/web/js/form/element/file-uploader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
index 536622ef3e6d4..73bef62910644 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/file-uploader.js
@@ -426,7 +426,7 @@ define([
             } else { // construct message from all aggregatedErrors
                 _.each(this.aggregatedErrors, function (error) {
                     notification().add({
-                        error: 'testing',
+                        error: true,
                         message: '%s' + error.message, // %s to be used as placeholder for html injection
 
                         /**
@@ -438,7 +438,7 @@ define([
                             var escapedFileName = $('<div>').text(error.filename).html(),
                                 errorMsgBodyHtml = '<strong>%s</strong> %s.<br>'
                                     .replace('%s', escapedFileName)
-                                    .replace('%s', $t('was not uploaded test'));
+                                    .replace('%s', $t('was not uploaded'));
 
                             // html is escaped in message body for notification widget; prepend unescaped html here
                             constructedMessage = constructedMessage.replace('%s', errorMsgBodyHtml);

From ede9debe73864d002fad9967ca3252c448570f83 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 10 Jun 2020 18:46:26 -0500
Subject: [PATCH 033/671] MC-34467: Updated jQuery File Upload plugin

- Updated file-uploader dependency
---
 .../Theme/view/base/requirejs-config.js       |    2 +-
 .../User/view/adminhtml/web/app-config.js     |    2 +-
 lib/web/jquery/fileUploader/LICENSE.txt       |   20 +
 lib/web/jquery/fileUploader/README.md         |  225 ++++
 lib/web/jquery/fileUploader/SECURITY.md       |  227 ++++
 .../fileUploader/jquery.fileupload-audio.js   |    4 +-
 .../fileUploader/jquery.fileupload-image.js   |   59 +-
 .../fileUploader/jquery.fileupload-ui.js      |    4 +-
 .../fileUploader/jquery.fileupload-video.js   |    4 +-
 .../vendor/blueimp-canvas-to-blob/LICENSE.txt |   20 +
 .../vendor/blueimp-canvas-to-blob/README.md   |  135 +++
 .../js/canvas-to-blob.js                      |  143 +++
 .../vendor/blueimp-load-image/LICENSE.txt     |   20 +
 .../vendor/blueimp-load-image/README.md       | 1070 +++++++++++++++++
 .../vendor/blueimp-load-image/js/index.js     |   12 +
 .../js/load-image-exif-map.js                 |  420 +++++++
 .../blueimp-load-image/js/load-image-exif.js  |  460 +++++++
 .../blueimp-load-image/js/load-image-fetch.js |  103 ++
 .../js/load-image-iptc-map.js                 |  169 +++
 .../blueimp-load-image/js/load-image-iptc.js  |  239 ++++
 .../blueimp-load-image/js/load-image-meta.js  |  259 ++++
 .../js/load-image-orientation.js              |  481 ++++++++
 .../blueimp-load-image/js/load-image-scale.js |  327 +++++
 .../js/load-image.all.min.js                  |    2 +
 .../js/load-image.all.min.js.map              |    1 +
 .../blueimp-load-image/js/load-image.js       |  229 ++++
 .../vendor/blueimp-tmpl/LICENSE.txt           |   20 +
 .../vendor/blueimp-tmpl/README.md             |  436 +++++++
 .../vendor/blueimp-tmpl/js/compile.js         |   91 ++
 .../vendor/blueimp-tmpl/js/runtime.js         |   50 +
 .../vendor/blueimp-tmpl/js/tmpl.js            |   98 ++
 .../vendor/blueimp-tmpl/js/tmpl.min.js        |    2 +
 .../vendor/blueimp-tmpl/js/tmpl.min.js.map    |    1 +
 33 files changed, 5293 insertions(+), 42 deletions(-)
 create mode 100644 lib/web/jquery/fileUploader/LICENSE.txt
 create mode 100644 lib/web/jquery/fileUploader/README.md
 create mode 100644 lib/web/jquery/fileUploader/SECURITY.md
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/LICENSE.txt
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/README.md
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/js/canvas-to-blob.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/LICENSE.txt
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/README.md
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/index.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif-map.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-fetch.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc-map.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/LICENSE.txt
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/README.md
 create mode 100755 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/compile.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/runtime.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js
 create mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index 77af920c8df86..cba1b3307407b 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -31,7 +31,7 @@ var config = {
     'paths': {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-ui',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index 491378d933ca2..f5c8cb9dd19c8 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -26,7 +26,7 @@ require.config({
         'jquery/ui': 'jquery/jquery-ui-1.9.2',
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-process',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-ui',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',
diff --git a/lib/web/jquery/fileUploader/LICENSE.txt b/lib/web/jquery/fileUploader/LICENSE.txt
new file mode 100644
index 0000000000000..ca9e708c6718f
--- /dev/null
+++ b/lib/web/jquery/fileUploader/LICENSE.txt
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright © 2010 Sebastian Tschan, https://blueimp.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/web/jquery/fileUploader/README.md b/lib/web/jquery/fileUploader/README.md
new file mode 100644
index 0000000000000..5a13ef4252e44
--- /dev/null
+++ b/lib/web/jquery/fileUploader/README.md
@@ -0,0 +1,225 @@
+# jQuery File Upload
+
+## Contents
+
+- [Description](#description)
+- [Demo](#demo)
+- [Features](#features)
+- [Security](#security)
+- [Setup](#setup)
+- [Requirements](#requirements)
+  - [Mandatory requirements](#mandatory-requirements)
+  - [Optional requirements](#optional-requirements)
+  - [Cross-domain requirements](#cross-domain-requirements)
+- [Browsers](#browsers)
+  - [Desktop browsers](#desktop-browsers)
+  - [Mobile browsers](#mobile-browsers)
+  - [Extended browser support information](#extended-browser-support-information)
+- [Testing](#testing)
+- [Support](#support)
+- [License](#license)
+
+## Description
+
+> File Upload widget with multiple file selection, drag&amp;drop support,
+> progress bars, validation and preview images, audio and video for jQuery.  
+> Supports cross-domain, chunked and resumable file uploads and client-side
+> image resizing.  
+> Works with any server-side platform (PHP, Python, Ruby on Rails, Java,
+> Node.js, Go etc.) that supports standard HTML form file uploads.
+
+## Demo
+
+[Demo File Upload](https://blueimp.github.io/jQuery-File-Upload/)
+
+## Features
+
+- **Multiple file upload:**  
+  Allows to select multiple files at once and upload them simultaneously.
+- **Drag & Drop support:**  
+  Allows to upload files by dragging them from your desktop or file manager and
+  dropping them on your browser window.
+- **Upload progress bar:**  
+  Shows a progress bar indicating the upload progress for individual files and
+  for all uploads combined.
+- **Cancelable uploads:**  
+  Individual file uploads can be canceled to stop the upload progress.
+- **Resumable uploads:**  
+  Aborted uploads can be resumed with browsers supporting the Blob API.
+- **Chunked uploads:**  
+  Large files can be uploaded in smaller chunks with browsers supporting the
+  Blob API.
+- **Client-side image resizing:**  
+  Images can be automatically resized on client-side with browsers supporting
+  the required JS APIs.
+- **Preview images, audio and video:**  
+  A preview of image, audio and video files can be displayed before uploading
+  with browsers supporting the required APIs.
+- **No browser plugins (e.g. Adobe Flash) required:**  
+  The implementation is based on open standards like HTML5 and JavaScript and
+  requires no additional browser plugins.
+- **Graceful fallback for legacy browsers:**  
+  Uploads files via XMLHttpRequests if supported and uses iframes as fallback
+  for legacy browsers.
+- **HTML file upload form fallback:**  
+  Allows progressive enhancement by using a standard HTML file upload form as
+  widget element.
+- **Cross-site file uploads:**  
+  Supports uploading files to a different domain with cross-site XMLHttpRequests
+  or iframe redirects.
+- **Multiple plugin instances:**  
+  Allows to use multiple plugin instances on the same webpage.
+- **Customizable and extensible:**  
+  Provides an API to set individual options and define callback methods for
+  various upload events.
+- **Multipart and file contents stream uploads:**  
+  Files can be uploaded as standard "multipart/form-data" or file contents
+  stream (HTTP PUT file upload).
+- **Compatible with any server-side application platform:**  
+  Works with any server-side platform (PHP, Python, Ruby on Rails, Java,
+  Node.js, Go etc.) that supports standard HTML form file uploads.
+
+## Security
+
+⚠️ Please read the [VULNERABILITIES](VULNERABILITIES.md) document for a list of
+fixed vulnerabilities
+
+Please also read the [SECURITY](SECURITY.md) document for instructions on how to
+securely configure your Webserver for file uploads.
+
+## Setup
+
+jQuery File Upload can be installed via [NPM](https://www.npmjs.com/):
+
+```sh
+npm install blueimp-file-upload
+```
+
+This allows you to include [jquery.fileupload.js](js/jquery.fileupload.js) and
+its extensions via `node_modules`, e.g:
+
+```html
+<script src="node_modules/blueimp-file-upload/js/jquery.fileupload.js"></script>
+```
+
+The widget can then be initialized on a file upload form the following way:
+
+```js
+$('#fileupload').fileupload();
+```
+
+For further information, please refer to the following guides:
+
+- [Main documentation page](https://github.com/blueimp/jQuery-File-Upload/wiki)
+- [List of all available Options](https://github.com/blueimp/jQuery-File-Upload/wiki/Options)
+- [The plugin API](https://github.com/blueimp/jQuery-File-Upload/wiki/API)
+- [How to setup the plugin on your website](https://github.com/blueimp/jQuery-File-Upload/wiki/Setup)
+- [How to use only the basic plugin.](https://github.com/blueimp/jQuery-File-Upload/wiki/Basic-plugin)
+
+## Requirements
+
+### Mandatory requirements
+
+- [jQuery](https://jquery.com/) v1.7+
+- [jQuery UI widget factory](https://api.jqueryui.com/jQuery.widget/) v1.9+
+  (included): Required for the basic File Upload plugin, but very lightweight
+  without any other dependencies from the jQuery UI suite.
+- [jQuery Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js)
+  (included): Required for
+  [browsers without XHR file upload support](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+
+### Optional requirements
+
+- [JavaScript Templates engine](https://github.com/blueimp/JavaScript-Templates)
+  v3+: Used to render the selected and uploaded files for the Basic Plus UI and
+  jQuery UI versions.
+- [JavaScript Load Image library](https://github.com/blueimp/JavaScript-Load-Image)
+  v2+: Required for the image previews and resizing functionality.
+- [JavaScript Canvas to Blob polyfill](https://github.com/blueimp/JavaScript-Canvas-to-Blob)
+  v3+:Required for the image previews and resizing functionality.
+- [blueimp Gallery](https://github.com/blueimp/Gallery) v2+: Used to display the
+  uploaded images in a lightbox.
+- [Bootstrap](https://getbootstrap.com/) v3+: Used for the demo design.
+- [Glyphicons](https://glyphicons.com/) Icon set used by Bootstrap.
+
+### Cross-domain requirements
+
+[Cross-domain File Uploads](https://github.com/blueimp/jQuery-File-Upload/wiki/Cross-domain-uploads)
+using the
+[Iframe Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/jquery.iframe-transport.js)
+require a redirect back to the origin server to retrieve the upload results. The
+[example implementation](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/main.js)
+makes use of
+[result.html](https://github.com/blueimp/jQuery-File-Upload/blob/master/cors/result.html)
+as a static redirect page for the origin server.
+
+The repository also includes the
+[jQuery XDomainRequest Transport plugin](https://github.com/blueimp/jQuery-File-Upload/blob/master/js/cors/jquery.xdr-transport.js),
+which enables limited cross-domain AJAX requests in Microsoft Internet Explorer
+8 and 9 (IE 10 supports cross-domain XHR requests).  
+The XDomainRequest object allows GET and POST requests only and doesn't support
+file uploads. It is used on the
+[Demo](https://blueimp.github.io/jQuery-File-Upload/) to delete uploaded files
+from the cross-domain demo file upload service.
+
+## Browsers
+
+### Desktop browsers
+
+The File Upload plugin is regularly tested with the latest browser versions and
+supports the following minimal versions:
+
+- Google Chrome
+- Apple Safari 4.0+
+- Mozilla Firefox 3.0+
+- Opera 11.0+
+- Microsoft Internet Explorer 6.0+
+
+### Mobile browsers
+
+The File Upload plugin has been tested with and supports the following mobile
+browsers:
+
+- Apple Safari on iOS 6.0+
+- Google Chrome on iOS 6.0+
+- Google Chrome on Android 4.0+
+- Default Browser on Android 2.3+
+- Opera Mobile 12.0+
+
+### Extended browser support information
+
+For a detailed overview of the features supported by each browser version and
+known operating system / browser bugs, please have a look at the
+[Extended browser support information](https://github.com/blueimp/jQuery-File-Upload/wiki/Browser-support).
+
+## Testing
+
+The project comes with three sets of tests:
+
+1. Code linting using [ESLint](https://eslint.org/).
+2. Unit tests using [Mocha](https://mochajs.org/).
+3. End-to-end tests using [blueimp/wdio](https://github.com/blueimp/wdio).
+
+To run the tests, follow these steps:
+
+1. Start [Docker](https://docs.docker.com/).
+2. Install development dependencies:
+   ```sh
+   npm install
+   ```
+3. Run the tests:
+   ```sh
+   npm test
+   ```
+
+## Support
+
+This project is actively maintained, but there is no official support channel.  
+If you have a question that another developer might help you with, please post
+to
+[Stack Overflow](https://stackoverflow.com/questions/tagged/blueimp+jquery+file-upload)
+and tag your question with `blueimp jquery file upload`.
+
+## License
+
+Released under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/lib/web/jquery/fileUploader/SECURITY.md b/lib/web/jquery/fileUploader/SECURITY.md
new file mode 100644
index 0000000000000..433a6853cdb3a
--- /dev/null
+++ b/lib/web/jquery/fileUploader/SECURITY.md
@@ -0,0 +1,227 @@
+# File Upload Security
+
+## Contents
+
+- [Introduction](#introduction)
+- [Purpose of this project](#purpose-of-this-project)
+- [Mitigations against file upload risks](#mitigations-against-file-upload-risks)
+  - [Prevent code execution on the server](#prevent-code-execution-on-the-server)
+  - [Prevent code execution in the browser](#prevent-code-execution-in-the-browser)
+  - [Prevent distribution of malware](#prevent-distribution-of-malware)
+- [Secure file upload serving configurations](#secure-file-upload-serving-configurations)
+  - [Apache config](#apache-config)
+  - [NGINX config](#nginx-config)
+- [Secure image processing configurations](#secure-image-processing-configurations)
+- [ImageMagick config](#imagemagick-config)
+
+## Introduction
+
+For an in-depth understanding of the potential security risks of providing file
+uploads and possible mitigations, please refer to the
+[OWASP - Unrestricted File Upload](https://owasp.org/www-community/vulnerabilities/Unrestricted_File_Upload)
+documentation.
+
+To securely setup the project to serve uploaded files, please refer to the
+sample
+[Secure file upload serving configurations](#secure-file-upload-serving-configurations).
+
+To mitigate potential vulnerabilities in image processing libraries, please
+refer to the
+[Secure image processing configurations](#secure-image-processing-configurations).
+
+By default, all sample upload handlers allow only upload of image files, which
+mitigates some attack vectors, but should not be relied on as the only
+protection.
+
+Please also have a look at the
+[list of fixed vulnerabilities](VULNERABILITIES.md) in jQuery File Upload, which
+relates mostly to the sample server-side upload handlers and how they have been
+configured.
+
+## Purpose of this project
+
+Please note that this project is not a complete file management product, but
+foremost a client-side file upload library for [jQuery](https://jquery.com/).  
+The server-side sample upload handlers are just examples to demonstrate the
+client-side file upload functionality.
+
+To make this very clear, there is **no user authentication** by default:
+
+- **everyone can upload files**
+- **everyone can delete uploaded files**
+
+In some cases this can be acceptable, but for most projects you will want to
+extend the sample upload handlers to integrate user authentication, or implement
+your own.
+
+It is also up to you to configure your web server to securely serve the uploaded
+files, e.g. using the
+[sample server configurations](#secure-file-upload-serving-configurations).
+
+## Mitigations against file upload risks
+
+### Prevent code execution on the server
+
+To prevent execution of scripts or binaries on server-side, the upload directory
+must be configured to not execute files in the upload directory (e.g.
+`server/php/files` as the default for the PHP upload handler) and only treat
+uploaded files as static content.
+
+The recommended way to do this is to configure the upload directory path to
+point outside of the web application root.  
+Then the web server can be configured to serve files from the upload directory
+with their default static files handler only.
+
+Limiting file uploads to a whitelist of safe file types (e.g. image files) also
+mitigates this issue, but should not be the only protection.
+
+### Prevent code execution in the browser
+
+To prevent execution of scripts on client-side, the following headers must be
+sent when delivering generic uploaded files to the client:
+
+```
+Content-Type: application/octet-stream
+X-Content-Type-Options: nosniff
+```
+
+The `Content-Type: application/octet-stream` header instructs browsers to
+display a download dialog instead of parsing it and possibly executing script
+content e.g. in HTML files.
+
+The `X-Content-Type-Options: nosniff` header prevents browsers to try to detect
+the file mime type despite the given content-type header.
+
+For known safe files, the content-type header can be adjusted using a
+**whitelist**, e.g. sending `Content-Type: image/png` for PNG files.
+
+### Prevent distribution of malware
+
+To prevent attackers from uploading and distributing malware (e.g. computer
+viruses), it is recommended to limit file uploads only to a whitelist of safe
+file types.
+
+Please note that the detection of file types in the sample file upload handlers
+is based on the file extension and not the actual file content. This makes it
+still possible for attackers to upload malware by giving their files an image
+file extension, but should prevent automatic execution on client computers when
+opening those files.
+
+It does not protect at all from exploiting vulnerabilities in image display
+programs, nor from users renaming file extensions to inadvertently execute the
+contained malicious code.
+
+## Secure file upload serving configurations
+
+The following configurations serve uploaded files as static files with the
+proper headers as
+[mitigation against file upload risks](#mitigations-against-file-upload-risks).  
+Please do not simply copy&paste these configurations, but make sure you
+understand what they are doing and that you have implemented them correctly.
+
+> Always test your own setup and make sure that it is secure!
+
+e.g. try uploading PHP scripts (as "example.php", "example.php.png" and
+"example.png") to see if they get executed by your web server, e.g. the content
+of the following sample:
+
+```php
+GIF89ad <?php echo mime_content_type(__FILE__); phpinfo();
+```
+
+### Apache config
+
+Add the following directive to the Apache config (e.g.
+/etc/apache2/apache2.conf), replacing the directory path with the absolute path
+to the upload directory:
+
+```ApacheConf
+<Directory "/path/to/project/server/php/files">
+  # Some of the directives require the Apache Headers module. If it is not
+  # already enabled, please execute the following command and reload Apache:
+  # sudo a2enmod headers
+  #
+  # Please note that the order of directives across configuration files matters,
+  # see also:
+  # https://httpd.apache.org/docs/current/sections.html#merging
+
+  # The following directive matches all files and forces them to be handled as
+  # static content, which prevents the server from parsing and executing files
+  # that are associated with a dynamic runtime, e.g. PHP files.
+  # It also forces their Content-Type header to "application/octet-stream" and
+  # adds a "Content-Disposition: attachment" header to force a download dialog,
+  # which prevents browsers from interpreting files in the context of the
+  # web server, e.g. HTML files containing JavaScript.
+  # Lastly it also prevents browsers from MIME-sniffing the Content-Type,
+  # preventing them from interpreting a file as a different Content-Type than
+  # the one sent by the webserver.
+  <FilesMatch ".*">
+    SetHandler default-handler
+    ForceType application/octet-stream
+    Header set Content-Disposition attachment
+    Header set X-Content-Type-Options nosniff
+  </FilesMatch>
+
+  # The following directive matches known image files and unsets the forced
+  # Content-Type so they can be served with their original mime type.
+  # It also unsets the Content-Disposition header to allow displaying them
+  # inline in the browser.
+  <FilesMatch ".+\.(?i:(gif|jpe?g|png))$">
+    ForceType none
+    Header unset Content-Disposition
+  </FilesMatch>
+</Directory>
+```
+
+### NGINX config
+
+Add the following directive to the NGINX config, replacing the directory path
+with the absolute path to the upload directory:
+
+```Nginx
+location ^~ /path/to/project/server/php/files {
+    root html;
+    default_type application/octet-stream;
+    types {
+        image/gif     gif;
+        image/jpeg    jpg;
+        image/png    png;
+    }
+    add_header X-Content-Type-Options 'nosniff';
+    if ($request_filename ~ /(((?!\.(jpg)|(png)|(gif)$)[^/])+$)) {
+        add_header Content-Disposition 'attachment; filename="$1"';
+        # Add X-Content-Type-Options again, as using add_header in a new context
+        # dismisses all previous add_header calls:
+        add_header X-Content-Type-Options 'nosniff';
+    }
+}
+```
+
+## Secure image processing configurations
+
+The following configuration mitigates
+[potential image processing vulnerabilities with ImageMagick](VULNERABILITIES.md#potential-vulnerabilities-with-php-imagemagick)
+by limiting the attack vectors to a small subset of image types
+(`GIF/JPEG/PNG`).
+
+Please also consider using alternative, safer image processing libraries like
+[libvips](https://github.com/libvips/libvips) or
+[imageflow](https://github.com/imazen/imageflow).
+
+## ImageMagick config
+
+It is recommended to disable all non-required ImageMagick coders via
+[policy.xml](https://wiki.debian.org/imagemagick/security).  
+To do so, locate the ImageMagick `policy.xml` configuration file and add the
+following policies:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ... -->
+<policymap>
+  <!-- ... -->
+  <policy domain="delegate" rights="none" pattern="*" />
+  <policy domain="coder" rights="none" pattern="*" />
+  <policy domain="coder" rights="read | write" pattern="{GIF,JPEG,JPG,PNG}" />
+</policymap>
+```
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
index 0bd4c27553dc0..1435ef20af2f6 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-audio.js
@@ -15,12 +15,12 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'load-image', 'jquery/fileUploader/jquery.fileupload-process'], factory);
+    define(['jquery', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/jquery.fileupload-process'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
-      require('blueimp-load-image/js/load-image'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'),
       require('jquery/fileUploader/jquery.fileupload-process')
     );
   } else {
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-image.js b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
index 84349fc9fbf92..11c63c236247c 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-image.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-image.js
@@ -17,24 +17,24 @@
     // Register as an anonymous AMD module:
     define([
       'jquery',
-      'load-image',
-      'load-image-meta',
-      'load-image-scale',
-      'load-image-exif',
-      'load-image-orientation',
-      'canvas-to-blob',
+      'jquery/fileUploader/vendor/blueimp-load-image/js/load-image',
+      'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta',
+      'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale',
+      'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif',
+      'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation',
+      'jquery/fileUploader/vendor/blueimp-canvas-to-blob/js/canvas-to-blob',
       'jquery/fileUploader/jquery.fileupload-process'
     ], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
-      require('blueimp-load-image/js/load-image'),
-      require('blueimp-load-image/js/load-image-meta'),
-      require('blueimp-load-image/js/load-image-scale'),
-      require('blueimp-load-image/js/load-image-exif'),
-      require('blueimp-load-image/js/load-image-orientation'),
-      require('blueimp-canvas-to-blob'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation'),
+      require('jquery/fileUploader/vendor/blueimp-canvas-to-blob/js/canvas-to-blob'),
       require('jquery/fileUploader/jquery.fileupload-process')
     );
   } else {
@@ -52,7 +52,6 @@
       disableImageHead: '@',
       disableMetaDataParsers: '@',
       disableExif: '@',
-      disableExifThumbnail: '@',
       disableExifOffsets: '@',
       includeExifTags: '@',
       excludeExifTags: '@',
@@ -216,31 +215,23 @@
           },
           thumbnail,
           thumbnailBlob;
-        if (data.exif) {
-          if (options.orientation === true) {
+        if (data.exif && options.thumbnail) {
+          thumbnail = data.exif.get('Thumbnail');
+          thumbnailBlob = thumbnail && thumbnail.get('Blob');
+          if (thumbnailBlob) {
             options.orientation = data.exif.get('Orientation');
+            loadImage(thumbnailBlob, resolve, options);
+            return dfd.promise();
           }
-          if (options.thumbnail) {
-            thumbnail = data.exif.get('Thumbnail');
-            thumbnailBlob = thumbnail && thumbnail.get('Blob');
-            if (thumbnailBlob) {
-              loadImage(thumbnailBlob, resolve, options);
-              return dfd.promise();
-            }
-          }
-          // Prevent orienting browser oriented images:
-          if (loadImage.orientation) {
-            data.orientation = data.orientation || options.orientation;
-          }
+        }
+        if (data.orientation) {
           // Prevent orienting the same image twice:
-          if (data.orientation) {
-            delete options.orientation;
-          } else {
-            data.orientation = options.orientation;
-          }
+          delete options.orientation;
+        } else {
+          data.orientation = options.orientation || loadImage.orientation;
         }
         if (img) {
-          resolve(loadImage.scale(img, options));
+          resolve(loadImage.scale(img, options, data));
           return dfd.promise();
         }
         return data;
@@ -320,7 +311,7 @@
           file = data.files[data.index],
           // eslint-disable-next-line new-cap
           dfd = $.Deferred();
-        if (data.orientation && data.exifOffsets) {
+        if (data.orientation === true && data.exifOffsets) {
           // Reset Exif Orientation data:
           loadImage.writeExifData(data.imageHead, data, 'Orientation', 1);
         }
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
index 4ee566b2b3bcb..caacf95c507bb 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
@@ -17,7 +17,7 @@
     // Register as an anonymous AMD module:
     define([
       'jquery',
-      'blueimp-tmpl',
+      'jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl',
       'jquery/fileUploader/jquery.fileupload-image',
       'jquery/fileUploader/jquery.fileupload-audio',
       'jquery/fileUploader/jquery.fileupload-video',
@@ -27,7 +27,7 @@
     // Node/CommonJS:
     factory(
       require('jquery'),
-      require('blueimp-tmpl'),
+      require('jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl'),
       require('jquery/fileUploader/jquery.fileupload-image'),
       require('jquery/fileUploader/jquery.fileupload-audio'),
       require('jquery/fileUploader/jquery.fileupload-video'),
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-video.js b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
index 70cd9f1dcfc16..bf247f38280a5 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-video.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-video.js
@@ -15,12 +15,12 @@
   'use strict';
   if (typeof define === 'function' && define.amd) {
     // Register as an anonymous AMD module:
-    define(['jquery', 'load-image', 'jquery/fileUploader/jquery.fileupload-process'], factory);
+    define(['jquery', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/jquery.fileupload-process'], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
     factory(
       require('jquery'),
-      require('blueimp-load-image/js/load-image'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'),
       require('jquery/fileUploader/jquery.fileupload-process')
     );
   } else {
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/LICENSE.txt b/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/LICENSE.txt
new file mode 100644
index 0000000000000..e1ad73662d4a5
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/LICENSE.txt
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright © 2012 Sebastian Tschan, https://blueimp.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/README.md b/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/README.md
new file mode 100644
index 0000000000000..92e16c63ce7cd
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/README.md
@@ -0,0 +1,135 @@
+# JavaScript Canvas to Blob
+
+## Contents
+
+- [Description](#description)
+- [Setup](#setup)
+- [Usage](#usage)
+- [Requirements](#requirements)
+- [Browsers](#browsers)
+- [API](#api)
+- [Test](#test)
+- [License](#license)
+
+## Description
+
+Canvas to Blob is a
+[polyfill](https://developer.mozilla.org/en-US/docs/Glossary/Polyfill) for
+Browsers that don't support the standard JavaScript
+[HTMLCanvasElement.toBlob](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob)
+method.
+
+It can be used to create
+[Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) objects from an
+HTML [canvas](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/canvas)
+element.
+
+## Setup
+
+Install via [NPM](https://www.npmjs.com/package/blueimp-canvas-to-blob):
+
+```sh
+npm install blueimp-canvas-to-blob
+```
+
+This will install the JavaScript files inside
+`./node_modules/blueimp-canvas-to-blob/js/` relative to your current directory,
+from where you can copy them into a folder that is served by your web server.
+
+Next include the minified JavaScript Canvas to Blob script in your HTML markup:
+
+```html
+<script src="js/canvas-to-blob.min.js"></script>
+```
+
+Or alternatively, include the non-minified version:
+
+```html
+<script src="js/canvas-to-blob.js"></script>
+```
+
+## Usage
+
+You can use the `canvas.toBlob()` method in the same way as the native
+implementation:
+
+```js
+var canvas = document.createElement('canvas')
+// Edit the canvas ...
+if (canvas.toBlob) {
+  canvas.toBlob(function (blob) {
+    // Do something with the blob object,
+    // e.g. create multipart form data for file uploads:
+    var formData = new FormData()
+    formData.append('file', blob, 'image.jpg')
+    // ...
+  }, 'image/jpeg')
+}
+```
+
+## Requirements
+
+The JavaScript Canvas to Blob function has zero dependencies.
+
+However, it is a very suitable complement to the
+[JavaScript Load Image](https://github.com/blueimp/JavaScript-Load-Image)
+function.
+
+## Browsers
+
+The following browsers have native support for
+[HTMLCanvasElement.toBlob](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob):
+
+- Chrome 50+
+- Firefox 19+
+- Safari 11+
+- Mobile Chrome 50+ (Android)
+- Mobile Firefox 4+ (Android)
+- Mobile Safari 11+ (iOS)
+- Edge 79+
+
+Browsers which implement the following APIs support `canvas.toBlob()` via
+polyfill:
+
+- [HTMLCanvasElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement)
+- [HTMLCanvasElement.toDataURL](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toDataURL)
+- [Blob() constructor](https://developer.mozilla.org/en-US/docs/Web/API/Blob/Blob)
+- [atob](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/atob)
+- [ArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer)
+- [Uint8Array](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array)
+
+This includes the following browsers:
+
+- Chrome 20+
+- Firefox 13+
+- Safari 8+
+- Mobile Chrome 25+ (Android)
+- Mobile Firefox 14+ (Android)
+- Mobile Safari 8+ (iOS)
+- Edge 74+
+- Edge Legacy 12+
+- Internet Explorer 10+
+
+## API
+
+In addition to the `canvas.toBlob()` polyfill, the JavaScript Canvas to Blob
+script exposes its helper function `dataURLtoBlob(url)`:
+
+```js
+// Uncomment the following line when using a module loader like webpack:
+// var dataURLtoBlob = require('blueimp-canvas-to-blob')
+
+// black+white 3x2 GIF, base64 data:
+var b64 = 'R0lGODdhAwACAPEAAAAAAP///yZFySZFySH5BAEAAAIALAAAAAADAAIAAAIDRAJZADs='
+var url = 'data:image/gif;base64,' + b64
+var blob = dataURLtoBlob(url)
+```
+
+## Test
+
+[Unit tests](https://blueimp.github.io/JavaScript-Canvas-to-Blob/test/)
+
+## License
+
+The JavaScript Canvas to Blob script is released under the
+[MIT license](https://opensource.org/licenses/MIT).
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/js/canvas-to-blob.js b/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/js/canvas-to-blob.js
new file mode 100644
index 0000000000000..8cd717bc1205f
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-canvas-to-blob/js/canvas-to-blob.js
@@ -0,0 +1,143 @@
+/*
+ * JavaScript Canvas to Blob
+ * https://github.com/blueimp/JavaScript-Canvas-to-Blob
+ *
+ * Copyright 2012, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ *
+ * Based on stackoverflow user Stoive's code snippet:
+ * http://stackoverflow.com/q/4998908
+ */
+
+/* global define, Uint8Array, ArrayBuffer, module */
+
+;(function (window) {
+  'use strict'
+
+  var CanvasPrototype =
+    window.HTMLCanvasElement && window.HTMLCanvasElement.prototype
+  var hasBlobConstructor =
+    window.Blob &&
+    (function () {
+      try {
+        return Boolean(new Blob())
+      } catch (e) {
+        return false
+      }
+    })()
+  var hasArrayBufferViewSupport =
+    hasBlobConstructor &&
+    window.Uint8Array &&
+    (function () {
+      try {
+        return new Blob([new Uint8Array(100)]).size === 100
+      } catch (e) {
+        return false
+      }
+    })()
+  var BlobBuilder =
+    window.BlobBuilder ||
+    window.WebKitBlobBuilder ||
+    window.MozBlobBuilder ||
+    window.MSBlobBuilder
+  var dataURIPattern = /^data:((.*?)(;charset=.*?)?)(;base64)?,/
+  var dataURLtoBlob =
+    (hasBlobConstructor || BlobBuilder) &&
+    window.atob &&
+    window.ArrayBuffer &&
+    window.Uint8Array &&
+    function (dataURI) {
+      var matches,
+        mediaType,
+        isBase64,
+        dataString,
+        byteString,
+        arrayBuffer,
+        intArray,
+        i,
+        bb
+      // Parse the dataURI components as per RFC 2397
+      matches = dataURI.match(dataURIPattern)
+      if (!matches) {
+        throw new Error('invalid data URI')
+      }
+      // Default to text/plain;charset=US-ASCII
+      mediaType = matches[2]
+        ? matches[1]
+        : 'text/plain' + (matches[3] || ';charset=US-ASCII')
+      isBase64 = !!matches[4]
+      dataString = dataURI.slice(matches[0].length)
+      if (isBase64) {
+        // Convert base64 to raw binary data held in a string:
+        byteString = atob(dataString)
+      } else {
+        // Convert base64/URLEncoded data component to raw binary:
+        byteString = decodeURIComponent(dataString)
+      }
+      // Write the bytes of the string to an ArrayBuffer:
+      arrayBuffer = new ArrayBuffer(byteString.length)
+      intArray = new Uint8Array(arrayBuffer)
+      for (i = 0; i < byteString.length; i += 1) {
+        intArray[i] = byteString.charCodeAt(i)
+      }
+      // Write the ArrayBuffer (or ArrayBufferView) to a blob:
+      if (hasBlobConstructor) {
+        return new Blob([hasArrayBufferViewSupport ? intArray : arrayBuffer], {
+          type: mediaType
+        })
+      }
+      bb = new BlobBuilder()
+      bb.append(arrayBuffer)
+      return bb.getBlob(mediaType)
+    }
+  if (window.HTMLCanvasElement && !CanvasPrototype.toBlob) {
+    if (CanvasPrototype.mozGetAsFile) {
+      CanvasPrototype.toBlob = function (callback, type, quality) {
+        var self = this
+        setTimeout(function () {
+          if (quality && CanvasPrototype.toDataURL && dataURLtoBlob) {
+            callback(dataURLtoBlob(self.toDataURL(type, quality)))
+          } else {
+            callback(self.mozGetAsFile('blob', type))
+          }
+        })
+      }
+    } else if (CanvasPrototype.toDataURL && dataURLtoBlob) {
+      if (CanvasPrototype.msToBlob) {
+        CanvasPrototype.toBlob = function (callback, type, quality) {
+          var self = this
+          setTimeout(function () {
+            if (
+              ((type && type !== 'image/png') || quality) &&
+              CanvasPrototype.toDataURL &&
+              dataURLtoBlob
+            ) {
+              callback(dataURLtoBlob(self.toDataURL(type, quality)))
+            } else {
+              callback(self.msToBlob(type))
+            }
+          })
+        }
+      } else {
+        CanvasPrototype.toBlob = function (callback, type, quality) {
+          var self = this
+          setTimeout(function () {
+            callback(dataURLtoBlob(self.toDataURL(type, quality)))
+          })
+        }
+      }
+    }
+  }
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return dataURLtoBlob
+    })
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = dataURLtoBlob
+  } else {
+    window.dataURLtoBlob = dataURLtoBlob
+  }
+})(window)
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/LICENSE.txt b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/LICENSE.txt
new file mode 100644
index 0000000000000..d6a9d74758be3
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/LICENSE.txt
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright © 2011 Sebastian Tschan, https://blueimp.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/README.md b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/README.md
new file mode 100644
index 0000000000000..5759a126aa172
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/README.md
@@ -0,0 +1,1070 @@
+# JavaScript Load Image
+
+> A JavaScript library to load and transform image files.
+
+## Contents
+
+- [Demo](https://blueimp.github.io/JavaScript-Load-Image/)
+- [Description](#description)
+- [Setup](#setup)
+- [Usage](#usage)
+  - [Image loading](#image-loading)
+  - [Image scaling](#image-scaling)
+- [Requirements](#requirements)
+- [Browser support](#browser-support)
+- [API](#api)
+  - [Callback](#callback)
+    - [Function signature](#function-signature)
+    - [Cancel image loading](#cancel-image-loading)
+    - [Callback arguments](#callback-arguments)
+    - [Error handling](#error-handling)
+  - [Promise](#promise)
+- [Options](#options)
+  - [maxWidth](#maxwidth)
+  - [maxHeight](#maxheight)
+  - [minWidth](#minwidth)
+  - [minHeight](#minheight)
+  - [sourceWidth](#sourcewidth)
+  - [sourceHeight](#sourceheight)
+  - [top](#top)
+  - [right](#right)
+  - [bottom](#bottom)
+  - [left](#left)
+  - [contain](#contain)
+  - [cover](#cover)
+  - [aspectRatio](#aspectratio)
+  - [pixelRatio](#pixelratio)
+  - [downsamplingRatio](#downsamplingratio)
+  - [imageSmoothingEnabled](#imagesmoothingenabled)
+  - [imageSmoothingQuality](#imagesmoothingquality)
+  - [crop](#crop)
+  - [orientation](#orientation)
+  - [meta](#meta)
+  - [canvas](#canvas)
+  - [crossOrigin](#crossorigin)
+  - [noRevoke](#norevoke)
+- [Metadata parsing](#metadata-parsing)
+  - [Image head](#image-head)
+  - [Exif parser](#exif-parser)
+    - [Exif Thumbnail](#exif-thumbnail)
+    - [Exif IFD](#exif-ifd)
+    - [GPSInfo IFD](#gpsinfo-ifd)
+    - [Interoperability IFD](#interoperability-ifd)
+    - [Exif parser options](#exif-parser-options)
+  - [Exif writer](#exif-writer)
+  - [IPTC parser](#iptc-parser)
+    - [IPTC parser options](#iptc-parser-options)
+- [License](#license)
+- [Credits](#credits)
+
+## Description
+
+JavaScript Load Image is a library to load images provided as `File` or `Blob`
+objects or via `URL`. It returns an optionally **scaled**, **cropped** or
+**rotated** HTML `img` or `canvas` element.
+
+It also provides methods to parse image metadata to extract
+[IPTC](https://iptc.org/standards/photo-metadata/) and
+[Exif](https://en.wikipedia.org/wiki/Exif) tags as well as embedded thumbnail
+images, to overwrite the Exif Orientation value and to restore the complete
+image header after resizing.
+
+## Setup
+
+Install via [NPM](https://www.npmjs.com/package/blueimp-load-image):
+
+```sh
+npm install blueimp-load-image
+```
+
+This will install the JavaScript files inside
+`./node_modules/blueimp-load-image/js/` relative to your current directory, from
+where you can copy them into a folder that is served by your web server.
+
+Next include the combined and minified JavaScript Load Image script in your HTML
+markup:
+
+```html
+<script src="js/load-image.all.min.js"></script>
+```
+
+Or alternatively, choose which components you want to include:
+
+```html
+<!-- required for all operations -->
+<script src="js/load-image.js"></script>
+
+<!-- required for scaling, cropping and as dependency for rotation -->
+<script src="js/load-image-scale.js"></script>
+
+<!-- required to parse meta data and to restore the complete image head -->
+<script src="js/load-image-meta.js"></script>
+
+<!-- required to parse meta data from images loaded via URL -->
+<script src="js/load-image-fetch.js"></script>
+
+<!-- required for rotation and cross-browser image orientation -->
+<script src="js/load-image-orientation.js"></script>
+
+<!-- required to parse Exif tags and cross-browser image orientation -->
+<script src="js/load-image-exif.js"></script>
+
+<!-- required to display text mappings for Exif tags -->
+<script src="js/load-image-exif-map.js"></script>
+
+<!-- required to parse IPTC tags -->
+<script src="js/load-image-iptc.js"></script>
+
+<!-- required to display text mappings for IPTC tags -->
+<script src="js/load-image-iptc-map.js"></script>
+```
+
+## Usage
+
+### Image loading
+
+In your application code, use the `loadImage()` function with
+[callback](#callback) style:
+
+```js
+document.getElementById('file-input').onchange = function () {
+  loadImage(
+    this.files[0],
+    function (img) {
+      document.body.appendChild(img)
+    },
+    { maxWidth: 600 } // Options
+  )
+}
+```
+
+Or use the [Promise](#promise) based API like this ([requires](#requirements) a
+polyfill for older browsers):
+
+```js
+document.getElementById('file-input').onchange = function () {
+  loadImage(this.files[0], { maxWidth: 600 }).then(function (data) {
+    document.body.appendChild(data.image)
+  })
+}
+```
+
+With
+[async/await](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Asynchronous/Async_await)
+(requires a modern browser or a code transpiler like
+[Babel](https://babeljs.io/) or [TypeScript](https://www.typescriptlang.org/)):
+
+```js
+document.getElementById('file-input').onchange = async function () {
+  let data = await loadImage(this.files[0], { maxWidth: 600 })
+  document.body.appendChild(data.image)
+}
+```
+
+### Image scaling
+
+It is also possible to use the image scaling functionality directly with an
+existing image:
+
+```js
+var scaledImage = loadImage.scale(
+  img, // img or canvas element
+  { maxWidth: 600 }
+)
+```
+
+## Requirements
+
+The JavaScript Load Image library has zero dependencies, but benefits from the
+following two
+[polyfills](https://developer.mozilla.org/en-US/docs/Glossary/Polyfill):
+
+- [blueimp-canvas-to-blob](https://github.com/blueimp/JavaScript-Canvas-to-Blob)
+  for browsers without native
+  [HTMLCanvasElement.toBlob](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob)
+  support, to create `Blob` objects out of `canvas` elements.
+- [promise-polyfill](https://github.com/taylorhakes/promise-polyfill) to be able
+  to use the
+  [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+  based `loadImage` API in Browsers without native `Promise` support.
+
+## Browser support
+
+Browsers which implement the following APIs support all options:
+
+- Loading images from File and Blob objects:
+  - [URL.createObjectURL](https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL)
+    or
+    [FileReader.readAsDataURL](https://developer.mozilla.org/en-US/docs/Web/API/FileReader/readAsDataURL)
+- Parsing meta data:
+  - [FileReader.readAsArrayBuffer](https://developer.mozilla.org/en-US/docs/Web/API/FileReader/readAsArrayBuffer)
+  - [Blob.slice](https://developer.mozilla.org/en-US/docs/Web/API/Blob/slice)
+  - [DataView](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView)
+    (no [BigInt](https://developer.mozilla.org/en-US/docs/Glossary/BigInt)
+    support required)
+- Parsing meta data from images loaded via URL:
+  - [fetch Response.blob](https://developer.mozilla.org/en-US/docs/Web/API/Body/blob)
+    or
+    [XMLHttpRequest.responseType blob](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseType#blob)
+- Promise based API:
+  - [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+
+This includes (but is not limited to) the following browsers:
+
+- Chrome 32+
+- Firefox 29+
+- Safari 8+
+- Mobile Chrome 42+ (Android)
+- Mobile Firefox 50+ (Android)
+- Mobile Safari 8+ (iOS)
+- Edge 74+
+- Edge Legacy 12+
+- Internet Explorer 10+ `*`
+
+`*` Internet Explorer [requires](#requirements) a polyfill for the `Promise`
+based API.
+
+Loading an image from a URL and applying transformations (scaling, cropping and
+rotating - except `orientation:true`, which requires reading meta data) is
+supported by all browsers which implement the
+[HTMLCanvasElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement)
+interface.
+
+Loading an image from a URL and scaling it in size is supported by all browsers
+which implement the
+[img](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img) element and
+has been tested successfully with browser engines as old as Internet Explorer 5
+(via
+[IE11's emulation mode](<https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/samples/dn255001(v=vs.85)>)).
+
+The `loadImage()` function applies options using
+[progressive enhancement](https://en.wikipedia.org/wiki/Progressive_enhancement)
+and falls back to a configuration that is supported by the browser, e.g. if the
+`canvas` element is not supported, an equivalent `img` element is returned.
+
+## API
+
+### Callback
+
+#### Function signature
+
+The `loadImage()` function accepts a
+[File](https://developer.mozilla.org/en-US/docs/Web/API/File) or
+[Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) object or an image
+URL as first argument.
+
+If a [File](https://developer.mozilla.org/en-US/docs/Web/API/File) or
+[Blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob) is passed as
+parameter, it returns an HTML `img` element if the browser supports the
+[URL](https://developer.mozilla.org/en-US/docs/Web/API/URL) API, alternatively a
+[FileReader](https://developer.mozilla.org/en-US/docs/Web/API/FileReader) object
+if the `FileReader` API is supported, or `false`.
+
+It always returns an HTML
+[img](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Img) element
+when passing an image URL:
+
+```js
+var loadingImage = loadImage(
+  'https://example.org/image.png',
+  function (img) {
+    document.body.appendChild(img)
+  },
+  { maxWidth: 600 }
+)
+```
+
+#### Cancel image loading
+
+Some browsers (e.g. Chrome) will cancel the image loading process if the `src`
+property of an `img` element is changed.  
+To avoid unnecessary requests, we can use the
+[data URL](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs)
+of a 1x1 pixel transparent GIF image as `src` target to cancel the original
+image download.
+
+To disable callback handling, we can also unset the image event handlers and for
+maximum browser compatibility, cancel the file reading process if the returned
+object is a
+[FileReader](https://developer.mozilla.org/en-US/docs/Web/API/FileReader)
+instance:
+
+```js
+var loadingImage = loadImage(
+  'https://example.org/image.png',
+  function (img) {
+    document.body.appendChild(img)
+  },
+  { maxWidth: 600 }
+)
+
+if (loadingImage) {
+  // Unset event handling for the loading image:
+  loadingImage.onload = loadingImage.onerror = null
+
+  // Cancel image loading process:
+  if (loadingImage.abort) {
+    // FileReader instance, stop the file reading process:
+    loadingImage.abort()
+  } else {
+    // HTMLImageElement element, cancel the original image request by changing
+    // the target source to the data URL of a 1x1 pixel transparent image GIF:
+    loadingImage.src =
+      'data:image/gif;base64,' +
+      'R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'
+  }
+}
+```
+
+**Please note:**  
+The `img` element (or `FileReader` instance) for the loading image is only
+returned when using the callback style API and not available with the
+[Promise](#promise) based API.
+
+#### Callback arguments
+
+For the callback style API, the second argument to `loadImage()` must be a
+`callback` function, which is called when the image has been loaded or an error
+occurred while loading the image.
+
+The callback function is passed two arguments:
+
+1. An HTML [img](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img)
+   element or
+   [canvas](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API)
+   element, or an
+   [Event](https://developer.mozilla.org/en-US/docs/Web/API/Event) object of
+   type `error`.
+2. An object with the original image dimensions as properties and potentially
+   additional [metadata](#metadata-parsing).
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    document.body.appendChild(img)
+    console.log('Original image width: ', data.originalWidth)
+    console.log('Original image height: ', data.originalHeight)
+  },
+  { maxWidth: 600, meta: true }
+)
+```
+
+**Please note:**  
+The original image dimensions reflect the natural width and height of the loaded
+image before applying any transformation.  
+For consistent values across browsers, [metadata](#metadata-parsing) parsing has
+to be enabled via `meta:true`, so `loadImage` can detect automatic image
+orientation and normalize the dimensions.
+
+#### Error handling
+
+Example code implementing error handling:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    if (img.type === 'error') {
+      console.error('Error loading image file')
+    } else {
+      document.body.appendChild(img)
+    }
+  },
+  { maxWidth: 600 }
+)
+```
+
+### Promise
+
+If the `loadImage()` function is called without a `callback` function as second
+argument and the
+[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+API is available, it returns a `Promise` object:
+
+```js
+loadImage(fileOrBlobOrUrl, { maxWidth: 600, meta: true })
+  .then(function (data) {
+    document.body.appendChild(data.image)
+    console.log('Original image width: ', data.originalWidth)
+    console.log('Original image height: ', data.originalHeight)
+  })
+  .catch(function (err) {
+    // Handling image loading errors
+    console.log(err)
+  })
+```
+
+The `Promise` resolves with an object with the following properties:
+
+- `image`: An HTML
+  [img](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img) or
+  [canvas](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API) element.
+- `originalWidth`: The original width of the image.
+- `originalHeight`: The original height of the image.
+
+Please also read the note about original image dimensions normalization in the
+[callback arguments](#callback-arguments) section.
+
+If [metadata](#metadata-parsing) has been parsed, additional properties might be
+present on the object.
+
+If image loading fails, the `Promise` rejects with an
+[Event](https://developer.mozilla.org/en-US/docs/Web/API/Event) object of type
+`error`.
+
+## Options
+
+The optional options argument to `loadImage()` allows to configure the image
+loading.
+
+It can be used the following way with the callback style:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img) {
+    document.body.appendChild(img)
+  },
+  {
+    maxWidth: 600,
+    maxHeight: 300,
+    minWidth: 100,
+    minHeight: 50,
+    canvas: true
+  }
+)
+```
+
+Or the following way with the `Promise` based API:
+
+```js
+loadImage(fileOrBlobOrUrl, {
+  maxWidth: 600,
+  maxHeight: 300,
+  minWidth: 100,
+  minHeight: 50,
+  canvas: true
+}).then(function (data) {
+  document.body.appendChild(data.image)
+})
+```
+
+All settings are optional. By default, the image is returned as HTML `img`
+element without any image size restrictions.
+
+### maxWidth
+
+Defines the maximum width of the `img`/`canvas` element.
+
+### maxHeight
+
+Defines the maximum height of the `img`/`canvas` element.
+
+### minWidth
+
+Defines the minimum width of the `img`/`canvas` element.
+
+### minHeight
+
+Defines the minimum height of the `img`/`canvas` element.
+
+### sourceWidth
+
+The width of the sub-rectangle of the source image to draw into the destination
+canvas.  
+Defaults to the source image width and requires `canvas: true`.
+
+### sourceHeight
+
+The height of the sub-rectangle of the source image to draw into the destination
+canvas.  
+Defaults to the source image height and requires `canvas: true`.
+
+### top
+
+The top margin of the sub-rectangle of the source image.  
+Defaults to `0` and requires `canvas: true`.
+
+### right
+
+The right margin of the sub-rectangle of the source image.  
+Defaults to `0` and requires `canvas: true`.
+
+### bottom
+
+The bottom margin of the sub-rectangle of the source image.  
+Defaults to `0` and requires `canvas: true`.
+
+### left
+
+The left margin of the sub-rectangle of the source image.  
+Defaults to `0` and requires `canvas: true`.
+
+### contain
+
+Scales the image up/down to contain it in the max dimensions if set to `true`.  
+This emulates the CSS feature
+[background-image: contain](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images#contain).
+
+### cover
+
+Scales the image up/down to cover the max dimensions with the image dimensions
+if set to `true`.  
+This emulates the CSS feature
+[background-image: cover](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Backgrounds_and_Borders/Resizing_background_images#cover).
+
+### aspectRatio
+
+Crops the image to the given aspect ratio (e.g. `16/9`).  
+Setting the `aspectRatio` also enables the `crop` option.
+
+### pixelRatio
+
+Defines the ratio of the canvas pixels to the physical image pixels on the
+screen.  
+Should be set to
+[window.devicePixelRatio](https://developer.mozilla.org/en-US/docs/Web/API/Window/devicePixelRatio)
+unless the scaled image is not rendered on screen.  
+Defaults to `1` and requires `canvas: true`.
+
+### downsamplingRatio
+
+Defines the ratio in which the image is downsampled (scaled down in steps).  
+By default, images are downsampled in one step.  
+With a ratio of `0.5`, each step scales the image to half the size, before
+reaching the target dimensions.  
+Requires `canvas: true`.
+
+### imageSmoothingEnabled
+
+If set to `false`,
+[disables image smoothing](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/imageSmoothingEnabled).  
+Defaults to `true` and requires `canvas: true`.
+
+### imageSmoothingQuality
+
+Sets the
+[quality of image smoothing](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/imageSmoothingQuality).  
+Possible values: `'low'`, `'medium'`, `'high'`  
+Defaults to `'low'` and requires `canvas: true`.
+
+### crop
+
+Crops the image to the `maxWidth`/`maxHeight` constraints if set to `true`.  
+Enabling the `crop` option also enables the `canvas` option.
+
+### orientation
+
+Transform the canvas according to the specified Exif orientation, which can be
+an `integer` in the range of `1` to `8` or the boolean value `true`.
+
+When set to `true`, it will set the orientation value based on the Exif data of
+the image, which will be parsed automatically if the Exif extension is
+available.
+
+Exif orientation values to correctly display the letter F:
+
+```
+    1             2
+  ██████        ██████
+  ██                ██
+  ████            ████
+  ██                ██
+  ██                ██
+
+    3             4
+      ██        ██
+      ██        ██
+    ████        ████
+      ██        ██
+  ██████        ██████
+
+    5             6
+██████████    ██
+██  ██        ██  ██
+██            ██████████
+
+    7             8
+        ██    ██████████
+    ██  ██        ██  ██
+██████████            ██
+```
+
+Setting `orientation` to `true` enables the `canvas` and `meta` options, unless
+the browser supports automatic image orientation (see
+[browser support for image-orientation](https://caniuse.com/#feat=css-image-orientation)).
+
+Setting `orientation` to `1` enables the `canvas` and `meta` options if the
+browser does support automatic image orientation (to allow reset of the
+orientation).
+
+Setting `orientation` to an integer in the range of `2` to `8` always enables
+the `canvas` option and also enables the `meta` option if the browser supports
+automatic image orientation (again to allow reset).
+
+### meta
+
+Automatically parses the image metadata if set to `true`.
+
+If metadata has been found, the data object passed as second argument to the
+callback function has additional properties (see
+[metadata parsing](#metadata-parsing)).
+
+If the file is given as URL and the browser supports the
+[fetch API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) or the
+XHR
+[responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/responseType)
+`blob`, fetches the file as `Blob` to be able to parse the metadata.
+
+### canvas
+
+Returns the image as
+[canvas](https://developer.mozilla.org/en-US/docs/Web/API/Canvas_API) element if
+set to `true`.
+
+### crossOrigin
+
+Sets the `crossOrigin` property on the `img` element for loading
+[CORS enabled images](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_enabled_image).
+
+### noRevoke
+
+By default, the
+[created object URL](https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL)
+is revoked after the image has been loaded, except when this option is set to
+`true`.
+
+## Metadata parsing
+
+If the Load Image Meta extension is included, it is possible to parse image meta
+data automatically with the `meta` option:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    console.log('Original image head: ', data.imageHead)
+    console.log('Exif data: ', data.exif) // requires exif extension
+    console.log('IPTC data: ', data.iptc) // requires iptc extension
+  },
+  { meta: true }
+)
+```
+
+Or alternatively via `loadImage.parseMetaData`, which can be used with an
+available `File` or `Blob` object as first argument:
+
+```js
+loadImage.parseMetaData(
+  fileOrBlob,
+  function (data) {
+    console.log('Original image head: ', data.imageHead)
+    console.log('Exif data: ', data.exif) // requires exif extension
+    console.log('IPTC data: ', data.iptc) // requires iptc extension
+  },
+  {
+    maxMetaDataSize: 262144
+  }
+)
+```
+
+Or using the
+[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+based API:
+
+```js
+loadImage
+  .parseMetaData(fileOrBlob, {
+    maxMetaDataSize: 262144
+  })
+  .then(function (data) {
+    console.log('Original image head: ', data.imageHead)
+    console.log('Exif data: ', data.exif) // requires exif extension
+    console.log('IPTC data: ', data.iptc) // requires iptc extension
+  })
+```
+
+The Metadata extension adds additional options used for the `parseMetaData`
+method:
+
+- `maxMetaDataSize`: Maximum number of bytes of metadata to parse.
+- `disableImageHead`: Disable parsing the original image head.
+- `disableMetaDataParsers`: Disable parsing metadata (image head only)
+
+### Image head
+
+Resized JPEG images can be combined with their original image head via
+`loadImage.replaceHead`, which requires the resized image as `Blob` object as
+first argument and an `ArrayBuffer` image head as second argument.
+
+With callback style, the third argument must be a `callback` function, which is
+called with the new `Blob` object:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    if (data.imageHead) {
+      img.toBlob(function (blob) {
+        loadImage.replaceHead(blob, data.imageHead, function (newBlob) {
+          // do something with the new Blob object
+        })
+      }, 'image/jpeg')
+    }
+  },
+  { meta: true, canvas: true, maxWidth: 800 }
+)
+```
+
+Or using the
+[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+based API like this:
+
+```js
+loadImage(fileOrBlobOrUrl, { meta: true, canvas: true, maxWidth: 800 })
+  .then(function (data) {
+    if (!data.imageHead) throw new Error('Could not parse image metadata')
+    return new Promise(function (resolve) {
+      data.image.toBlob(function (blob) {
+        data.blob = blob
+        resolve(data)
+      }, 'image/jpeg')
+    })
+  })
+  .then(function (data) {
+    return loadImage.replaceHead(data.blob, data.imageHead)
+  })
+  .then(function (blob) {
+    // do something with the new Blob object
+  })
+  .catch(function (err) {
+    console.error(err)
+  })
+```
+
+**Please note:**  
+`Blob` objects of resized images can be created via
+[HTMLCanvasElement.toBlob](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob).  
+[blueimp-canvas-to-blob](https://github.com/blueimp/JavaScript-Canvas-to-Blob)
+provides a polyfill for browsers without native `canvas.toBlob()` support.
+
+### Exif parser
+
+If you include the Load Image Exif Parser extension, the argument passed to the
+callback for `parseMetaData` will contain the following additional properties if
+Exif data could be found in the given image:
+
+- `exif`: The parsed Exif tags
+- `exifOffsets`: The parsed Exif tag offsets
+- `exifTiffOffset`: TIFF header offset (used for offset pointers)
+- `exifLittleEndian`: little endian order if true, big endian if false
+
+The `exif` object stores the parsed Exif tags:
+
+```js
+var orientation = data.exif[0x0112] // Orientation
+```
+
+The `exif` and `exifOffsets` objects also provide a `get()` method to retrieve
+the tag value/offset via the tag's mapped name:
+
+```js
+var orientation = data.exif.get('Orientation')
+var orientationOffset = data.exifOffsets.get('Orientation')
+```
+
+By default, only the following names are mapped:
+
+- `Orientation`
+- `Thumbnail` (see [Exif Thumbnail](#exif-thumbnail))
+- `Exif` (see [Exif IFD](#exif-ifd))
+- `GPSInfo` (see [GPSInfo IFD](#gpsinfo-ifd))
+- `Interoperability` (see [Interoperability IFD](#interoperability-ifd))
+
+If you also include the Load Image Exif Map library, additional tag mappings
+become available, as well as three additional methods:
+
+- `exif.getText()`
+- `exif.getName()`
+- `exif.getAll()`
+
+```js
+var orientationText = data.exif.getText('Orientation') // e.g. "Rotate 90° CW"
+
+var name = data.exif.getName(0x0112) // "Orientation"
+
+// A map of all parsed tags with their mapped names/text as keys/values:
+var allTags = data.exif.getAll()
+```
+
+#### Exif Thumbnail
+
+Example code displaying a thumbnail image embedded into the Exif metadata:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    var exif = data.exif
+    var thumbnail = exif && exif.get('Thumbnail')
+    var blob = thumbnail && thumbnail.get('Blob')
+    if (blob) {
+      loadImage(
+        blob,
+        function (thumbImage) {
+          document.body.appendChild(thumbImage)
+        },
+        { orientation: exif.get('Orientation') }
+      )
+    }
+  },
+  { meta: true }
+)
+```
+
+#### Exif IFD
+
+Example code displaying data from the Exif IFD (Image File Directory) that
+contains Exif specified TIFF tags:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    var exifIFD = data.exif && data.exif.get('Exif')
+    if (exifIFD) {
+      // Map of all Exif IFD tags with their mapped names/text as keys/values:
+      console.log(exifIFD.getAll())
+      // A specific Exif IFD tag value:
+      console.log(exifIFD.get('UserComment'))
+    }
+  },
+  { meta: true }
+)
+```
+
+#### GPSInfo IFD
+
+Example code displaying data from the Exif IFD (Image File Directory) that
+contains [GPS](https://en.wikipedia.org/wiki/Global_Positioning_System) info:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    var gpsInfo = data.exif && data.exif.get('GPSInfo')
+    if (gpsInfo) {
+      // Map of all GPSInfo tags with their mapped names/text as keys/values:
+      console.log(gpsInfo.getAll())
+      // A specific GPSInfo tag value:
+      console.log(gpsInfo.get('GPSLatitude'))
+    }
+  },
+  { meta: true }
+)
+```
+
+#### Interoperability IFD
+
+Example code displaying data from the Exif IFD (Image File Directory) that
+contains Interoperability data:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    var interoperabilityData = data.exif && data.exif.get('Interoperability')
+    if (interoperabilityData) {
+      // The InteroperabilityIndex tag value:
+      console.log(interoperabilityData.get('InteroperabilityIndex'))
+    }
+  },
+  { meta: true }
+)
+```
+
+#### Exif parser options
+
+The Exif parser adds additional options:
+
+- `disableExif`: Disables Exif parsing when `true`.
+- `disableExifOffsets`: Disables storing Exif tag offsets when `true`.
+- `includeExifTags`: A map of Exif tags to include for parsing (includes all but
+  the excluded tags by default).
+- `excludeExifTags`: A map of Exif tags to exclude from parsing (defaults to
+  exclude `Exif` `MakerNote`).
+
+An example parsing only Orientation, Thumbnail and ExifVersion tags:
+
+```js
+loadImage.parseMetaData(
+  fileOrBlob,
+  function (data) {
+    console.log('Exif data: ', data.exif)
+  },
+  {
+    includeExifTags: {
+      0x0112: true, // Orientation
+      ifd1: {
+        0x0201: true, // JPEGInterchangeFormat (Thumbnail data offset)
+        0x0202: true // JPEGInterchangeFormatLength (Thumbnail data length)
+      },
+      0x8769: {
+        // ExifIFDPointer
+        0x9000: true // ExifVersion
+      }
+    }
+  }
+)
+```
+
+An example excluding `Exif` `MakerNote` and `GPSInfo`:
+
+```js
+loadImage.parseMetaData(
+  fileOrBlob,
+  function (data) {
+    console.log('Exif data: ', data.exif)
+  },
+  {
+    excludeExifTags: {
+      0x8769: {
+        // ExifIFDPointer
+        0x927c: true // MakerNote
+      },
+      0x8825: true // GPSInfoIFDPointer
+    }
+  }
+)
+```
+
+### Exif writer
+
+The Exif parser extension also includes a minimal writer that allows to override
+the Exif `Orientation` value in the parsed `imageHead` `ArrayBuffer`:
+
+```js
+loadImage(
+  fileOrBlobOrUrl,
+  function (img, data) {
+    if (data.imageHead && data.exif) {
+      // Reset Exif Orientation data:
+      loadImage.writeExifData(data.imageHead, data, 'Orientation', 1)
+      img.toBlob(function (blob) {
+        loadImage.replaceHead(blob, data.imageHead, function (newBlob) {
+          // do something with newBlob
+        })
+      }, 'image/jpeg')
+    }
+  },
+  { meta: true, orientation: true, canvas: true, maxWidth: 800 }
+)
+```
+
+**Please note:**  
+The Exif writer relies on the Exif tag offsets being available as
+`data.exifOffsets` property, which requires that Exif data has been parsed from
+the image.  
+The Exif writer can only change existing values, not add new tags, e.g. it
+cannot add an Exif `Orientation` tag for an image that does not have one.
+
+### IPTC parser
+
+If you include the Load Image IPTC Parser extension, the argument passed to the
+callback for `parseMetaData` will contain the following additional properties if
+IPTC data could be found in the given image:
+
+- `iptc`: The parsed IPTC tags
+- `iptcOffsets`: The parsed IPTC tag offsets
+
+The `iptc` object stores the parsed IPTC tags:
+
+```js
+var objectname = data.iptc[5]
+```
+
+The `iptc` and `iptcOffsets` objects also provide a `get()` method to retrieve
+the tag value/offset via the tag's mapped name:
+
+```js
+var objectname = data.iptc.get('ObjectName')
+```
+
+By default, only the following names are mapped:
+
+- `ObjectName`
+
+If you also include the Load Image IPTC Map library, additional tag mappings
+become available, as well as three additional methods:
+
+- `iptc.getText()`
+- `iptc.getName()`
+- `iptc.getAll()`
+
+```js
+var keywords = data.iptc.getText('Keywords') // e.g.: ['Weather','Sky']
+
+var name = data.iptc.getName(5) // ObjectName
+
+// A map of all parsed tags with their mapped names/text as keys/values:
+var allTags = data.iptc.getAll()
+```
+
+#### IPTC parser options
+
+The IPTC parser adds additional options:
+
+- `disableIptc`: Disables IPTC parsing when true.
+- `disableIptcOffsets`: Disables storing IPTC tag offsets when `true`.
+- `includeIptcTags`: A map of IPTC tags to include for parsing (includes all but
+  the excluded tags by default).
+- `excludeIptcTags`: A map of IPTC tags to exclude from parsing (defaults to
+  exclude `ObjectPreviewData`).
+
+An example parsing only the `ObjectName` tag:
+
+```js
+loadImage.parseMetaData(
+  fileOrBlob,
+  function (data) {
+    console.log('IPTC data: ', data.iptc)
+  },
+  {
+    includeIptcTags: {
+      5: true // ObjectName
+    }
+  }
+)
+```
+
+An example excluding `ApplicationRecordVersion` and `ObjectPreviewData`:
+
+```js
+loadImage.parseMetaData(
+  fileOrBlob,
+  function (data) {
+    console.log('IPTC data: ', data.iptc)
+  },
+  {
+    excludeIptcTags: {
+      0: true, // ApplicationRecordVersion
+      202: true // ObjectPreviewData
+    }
+  }
+)
+```
+
+## License
+
+The JavaScript Load Image library is released under the
+[MIT license](https://opensource.org/licenses/MIT).
+
+## Credits
+
+- Original image metadata handling implemented with the help and contribution of
+  Achim Stöhr.
+- Original Exif tags mapping based on Jacob Seidelin's
+  [exif-js](https://github.com/exif-js/exif-js) library.
+- Original IPTC parser implementation by
+  [Dave Bevan](https://github.com/bevand10).
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/index.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/index.js
new file mode 100644
index 0000000000000..20875a2d08535
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/index.js
@@ -0,0 +1,12 @@
+/* global module, require */
+
+module.exports = require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image')
+
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-fetch')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif-map')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc-map')
+require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation')
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif-map.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif-map.js
new file mode 100644
index 0000000000000..29f11aff226fc
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif-map.js
@@ -0,0 +1,420 @@
+/*
+ * JavaScript Load Image Exif Map
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Exif tags mapping based on
+ * https://github.com/jseidelin/exif-js
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'), require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  var ExifMapProto = loadImage.ExifMap.prototype
+
+  ExifMapProto.tags = {
+    // =================
+    // TIFF tags (IFD0):
+    // =================
+    0x0100: 'ImageWidth',
+    0x0101: 'ImageHeight',
+    0x0102: 'BitsPerSample',
+    0x0103: 'Compression',
+    0x0106: 'PhotometricInterpretation',
+    0x0112: 'Orientation',
+    0x0115: 'SamplesPerPixel',
+    0x011c: 'PlanarConfiguration',
+    0x0212: 'YCbCrSubSampling',
+    0x0213: 'YCbCrPositioning',
+    0x011a: 'XResolution',
+    0x011b: 'YResolution',
+    0x0128: 'ResolutionUnit',
+    0x0111: 'StripOffsets',
+    0x0116: 'RowsPerStrip',
+    0x0117: 'StripByteCounts',
+    0x0201: 'JPEGInterchangeFormat',
+    0x0202: 'JPEGInterchangeFormatLength',
+    0x012d: 'TransferFunction',
+    0x013e: 'WhitePoint',
+    0x013f: 'PrimaryChromaticities',
+    0x0211: 'YCbCrCoefficients',
+    0x0214: 'ReferenceBlackWhite',
+    0x0132: 'DateTime',
+    0x010e: 'ImageDescription',
+    0x010f: 'Make',
+    0x0110: 'Model',
+    0x0131: 'Software',
+    0x013b: 'Artist',
+    0x8298: 'Copyright',
+    0x8769: {
+      // ExifIFDPointer
+      0x9000: 'ExifVersion', // EXIF version
+      0xa000: 'FlashpixVersion', // Flashpix format version
+      0xa001: 'ColorSpace', // Color space information tag
+      0xa002: 'PixelXDimension', // Valid width of meaningful image
+      0xa003: 'PixelYDimension', // Valid height of meaningful image
+      0xa500: 'Gamma',
+      0x9101: 'ComponentsConfiguration', // Information about channels
+      0x9102: 'CompressedBitsPerPixel', // Compressed bits per pixel
+      0x927c: 'MakerNote', // Any desired information written by the manufacturer
+      0x9286: 'UserComment', // Comments by user
+      0xa004: 'RelatedSoundFile', // Name of related sound file
+      0x9003: 'DateTimeOriginal', // Date and time when the original image was generated
+      0x9004: 'DateTimeDigitized', // Date and time when the image was stored digitally
+      0x9010: 'OffsetTime', // Time zone when the image file was last changed
+      0x9011: 'OffsetTimeOriginal', // Time zone when the image was stored digitally
+      0x9012: 'OffsetTimeDigitized', // Time zone when the image was stored digitally
+      0x9290: 'SubSecTime', // Fractions of seconds for DateTime
+      0x9291: 'SubSecTimeOriginal', // Fractions of seconds for DateTimeOriginal
+      0x9292: 'SubSecTimeDigitized', // Fractions of seconds for DateTimeDigitized
+      0x829a: 'ExposureTime', // Exposure time (in seconds)
+      0x829d: 'FNumber',
+      0x8822: 'ExposureProgram', // Exposure program
+      0x8824: 'SpectralSensitivity', // Spectral sensitivity
+      0x8827: 'PhotographicSensitivity', // EXIF 2.3, ISOSpeedRatings in EXIF 2.2
+      0x8828: 'OECF', // Optoelectric conversion factor
+      0x8830: 'SensitivityType',
+      0x8831: 'StandardOutputSensitivity',
+      0x8832: 'RecommendedExposureIndex',
+      0x8833: 'ISOSpeed',
+      0x8834: 'ISOSpeedLatitudeyyy',
+      0x8835: 'ISOSpeedLatitudezzz',
+      0x9201: 'ShutterSpeedValue', // Shutter speed
+      0x9202: 'ApertureValue', // Lens aperture
+      0x9203: 'BrightnessValue', // Value of brightness
+      0x9204: 'ExposureBias', // Exposure bias
+      0x9205: 'MaxApertureValue', // Smallest F number of lens
+      0x9206: 'SubjectDistance', // Distance to subject in meters
+      0x9207: 'MeteringMode', // Metering mode
+      0x9208: 'LightSource', // Kind of light source
+      0x9209: 'Flash', // Flash status
+      0x9214: 'SubjectArea', // Location and area of main subject
+      0x920a: 'FocalLength', // Focal length of the lens in mm
+      0xa20b: 'FlashEnergy', // Strobe energy in BCPS
+      0xa20c: 'SpatialFrequencyResponse',
+      0xa20e: 'FocalPlaneXResolution', // Number of pixels in width direction per FPRUnit
+      0xa20f: 'FocalPlaneYResolution', // Number of pixels in height direction per FPRUnit
+      0xa210: 'FocalPlaneResolutionUnit', // Unit for measuring the focal plane resolution
+      0xa214: 'SubjectLocation', // Location of subject in image
+      0xa215: 'ExposureIndex', // Exposure index selected on camera
+      0xa217: 'SensingMethod', // Image sensor type
+      0xa300: 'FileSource', // Image source (3 == DSC)
+      0xa301: 'SceneType', // Scene type (1 == directly photographed)
+      0xa302: 'CFAPattern', // Color filter array geometric pattern
+      0xa401: 'CustomRendered', // Special processing
+      0xa402: 'ExposureMode', // Exposure mode
+      0xa403: 'WhiteBalance', // 1 = auto white balance, 2 = manual
+      0xa404: 'DigitalZoomRatio', // Digital zoom ratio
+      0xa405: 'FocalLengthIn35mmFilm',
+      0xa406: 'SceneCaptureType', // Type of scene
+      0xa407: 'GainControl', // Degree of overall image gain adjustment
+      0xa408: 'Contrast', // Direction of contrast processing applied by camera
+      0xa409: 'Saturation', // Direction of saturation processing applied by camera
+      0xa40a: 'Sharpness', // Direction of sharpness processing applied by camera
+      0xa40b: 'DeviceSettingDescription',
+      0xa40c: 'SubjectDistanceRange', // Distance to subject
+      0xa420: 'ImageUniqueID', // Identifier assigned uniquely to each image
+      0xa430: 'CameraOwnerName',
+      0xa431: 'BodySerialNumber',
+      0xa432: 'LensSpecification',
+      0xa433: 'LensMake',
+      0xa434: 'LensModel',
+      0xa435: 'LensSerialNumber'
+    },
+    0x8825: {
+      // GPSInfoIFDPointer
+      0x0000: 'GPSVersionID',
+      0x0001: 'GPSLatitudeRef',
+      0x0002: 'GPSLatitude',
+      0x0003: 'GPSLongitudeRef',
+      0x0004: 'GPSLongitude',
+      0x0005: 'GPSAltitudeRef',
+      0x0006: 'GPSAltitude',
+      0x0007: 'GPSTimeStamp',
+      0x0008: 'GPSSatellites',
+      0x0009: 'GPSStatus',
+      0x000a: 'GPSMeasureMode',
+      0x000b: 'GPSDOP',
+      0x000c: 'GPSSpeedRef',
+      0x000d: 'GPSSpeed',
+      0x000e: 'GPSTrackRef',
+      0x000f: 'GPSTrack',
+      0x0010: 'GPSImgDirectionRef',
+      0x0011: 'GPSImgDirection',
+      0x0012: 'GPSMapDatum',
+      0x0013: 'GPSDestLatitudeRef',
+      0x0014: 'GPSDestLatitude',
+      0x0015: 'GPSDestLongitudeRef',
+      0x0016: 'GPSDestLongitude',
+      0x0017: 'GPSDestBearingRef',
+      0x0018: 'GPSDestBearing',
+      0x0019: 'GPSDestDistanceRef',
+      0x001a: 'GPSDestDistance',
+      0x001b: 'GPSProcessingMethod',
+      0x001c: 'GPSAreaInformation',
+      0x001d: 'GPSDateStamp',
+      0x001e: 'GPSDifferential',
+      0x001f: 'GPSHPositioningError'
+    },
+    0xa005: {
+      // InteroperabilityIFDPointer
+      0x0001: 'InteroperabilityIndex'
+    }
+  }
+
+  // IFD1 directory can contain any IFD0 tags:
+  ExifMapProto.tags.ifd1 = ExifMapProto.tags
+
+  ExifMapProto.stringValues = {
+    ExposureProgram: {
+      0: 'Undefined',
+      1: 'Manual',
+      2: 'Normal program',
+      3: 'Aperture priority',
+      4: 'Shutter priority',
+      5: 'Creative program',
+      6: 'Action program',
+      7: 'Portrait mode',
+      8: 'Landscape mode'
+    },
+    MeteringMode: {
+      0: 'Unknown',
+      1: 'Average',
+      2: 'CenterWeightedAverage',
+      3: 'Spot',
+      4: 'MultiSpot',
+      5: 'Pattern',
+      6: 'Partial',
+      255: 'Other'
+    },
+    LightSource: {
+      0: 'Unknown',
+      1: 'Daylight',
+      2: 'Fluorescent',
+      3: 'Tungsten (incandescent light)',
+      4: 'Flash',
+      9: 'Fine weather',
+      10: 'Cloudy weather',
+      11: 'Shade',
+      12: 'Daylight fluorescent (D 5700 - 7100K)',
+      13: 'Day white fluorescent (N 4600 - 5400K)',
+      14: 'Cool white fluorescent (W 3900 - 4500K)',
+      15: 'White fluorescent (WW 3200 - 3700K)',
+      17: 'Standard light A',
+      18: 'Standard light B',
+      19: 'Standard light C',
+      20: 'D55',
+      21: 'D65',
+      22: 'D75',
+      23: 'D50',
+      24: 'ISO studio tungsten',
+      255: 'Other'
+    },
+    Flash: {
+      0x0000: 'Flash did not fire',
+      0x0001: 'Flash fired',
+      0x0005: 'Strobe return light not detected',
+      0x0007: 'Strobe return light detected',
+      0x0009: 'Flash fired, compulsory flash mode',
+      0x000d: 'Flash fired, compulsory flash mode, return light not detected',
+      0x000f: 'Flash fired, compulsory flash mode, return light detected',
+      0x0010: 'Flash did not fire, compulsory flash mode',
+      0x0018: 'Flash did not fire, auto mode',
+      0x0019: 'Flash fired, auto mode',
+      0x001d: 'Flash fired, auto mode, return light not detected',
+      0x001f: 'Flash fired, auto mode, return light detected',
+      0x0020: 'No flash function',
+      0x0041: 'Flash fired, red-eye reduction mode',
+      0x0045: 'Flash fired, red-eye reduction mode, return light not detected',
+      0x0047: 'Flash fired, red-eye reduction mode, return light detected',
+      0x0049: 'Flash fired, compulsory flash mode, red-eye reduction mode',
+      0x004d: 'Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected',
+      0x004f: 'Flash fired, compulsory flash mode, red-eye reduction mode, return light detected',
+      0x0059: 'Flash fired, auto mode, red-eye reduction mode',
+      0x005d: 'Flash fired, auto mode, return light not detected, red-eye reduction mode',
+      0x005f: 'Flash fired, auto mode, return light detected, red-eye reduction mode'
+    },
+    SensingMethod: {
+      1: 'Undefined',
+      2: 'One-chip color area sensor',
+      3: 'Two-chip color area sensor',
+      4: 'Three-chip color area sensor',
+      5: 'Color sequential area sensor',
+      7: 'Trilinear sensor',
+      8: 'Color sequential linear sensor'
+    },
+    SceneCaptureType: {
+      0: 'Standard',
+      1: 'Landscape',
+      2: 'Portrait',
+      3: 'Night scene'
+    },
+    SceneType: {
+      1: 'Directly photographed'
+    },
+    CustomRendered: {
+      0: 'Normal process',
+      1: 'Custom process'
+    },
+    WhiteBalance: {
+      0: 'Auto white balance',
+      1: 'Manual white balance'
+    },
+    GainControl: {
+      0: 'None',
+      1: 'Low gain up',
+      2: 'High gain up',
+      3: 'Low gain down',
+      4: 'High gain down'
+    },
+    Contrast: {
+      0: 'Normal',
+      1: 'Soft',
+      2: 'Hard'
+    },
+    Saturation: {
+      0: 'Normal',
+      1: 'Low saturation',
+      2: 'High saturation'
+    },
+    Sharpness: {
+      0: 'Normal',
+      1: 'Soft',
+      2: 'Hard'
+    },
+    SubjectDistanceRange: {
+      0: 'Unknown',
+      1: 'Macro',
+      2: 'Close view',
+      3: 'Distant view'
+    },
+    FileSource: {
+      3: 'DSC'
+    },
+    ComponentsConfiguration: {
+      0: '',
+      1: 'Y',
+      2: 'Cb',
+      3: 'Cr',
+      4: 'R',
+      5: 'G',
+      6: 'B'
+    },
+    Orientation: {
+      1: 'Original',
+      2: 'Horizontal flip',
+      3: 'Rotate 180° CCW',
+      4: 'Vertical flip',
+      5: 'Vertical flip + Rotate 90° CW',
+      6: 'Rotate 90° CW',
+      7: 'Horizontal flip + Rotate 90° CW',
+      8: 'Rotate 90° CCW'
+    }
+  }
+
+  ExifMapProto.getText = function (name) {
+    var value = this.get(name)
+    switch (name) {
+      case 'LightSource':
+      case 'Flash':
+      case 'MeteringMode':
+      case 'ExposureProgram':
+      case 'SensingMethod':
+      case 'SceneCaptureType':
+      case 'SceneType':
+      case 'CustomRendered':
+      case 'WhiteBalance':
+      case 'GainControl':
+      case 'Contrast':
+      case 'Saturation':
+      case 'Sharpness':
+      case 'SubjectDistanceRange':
+      case 'FileSource':
+      case 'Orientation':
+        return this.stringValues[name][value]
+      case 'ExifVersion':
+      case 'FlashpixVersion':
+        if (!value) return
+        return String.fromCharCode(value[0], value[1], value[2], value[3])
+      case 'ComponentsConfiguration':
+        if (!value) return
+        return (
+          this.stringValues[name][value[0]] +
+          this.stringValues[name][value[1]] +
+          this.stringValues[name][value[2]] +
+          this.stringValues[name][value[3]]
+        )
+      case 'GPSVersionID':
+        if (!value) return
+        return value[0] + '.' + value[1] + '.' + value[2] + '.' + value[3]
+    }
+    return String(value)
+  }
+
+  ExifMapProto.getAll = function () {
+    var map = {}
+    var prop
+    var obj
+    var name
+    for (prop in this) {
+      if (Object.prototype.hasOwnProperty.call(this, prop)) {
+        obj = this[prop]
+        if (obj && obj.getAll) {
+          map[this.ifds[prop].name] = obj.getAll()
+        } else {
+          name = this.tags[prop]
+          if (name) map[name] = this.getText(name)
+        }
+      }
+    }
+    return map
+  }
+
+  ExifMapProto.getName = function (tagCode) {
+    var name = this.tags[tagCode]
+    if (typeof name === 'object') return this.ifds[tagCode].name
+    return name
+  }
+
+  // Extend the map of tag names to tag codes:
+  ;(function () {
+    var tags = ExifMapProto.tags
+    var prop
+    var ifd
+    var subTags
+    // Map the tag names to tags:
+    for (prop in tags) {
+      if (Object.prototype.hasOwnProperty.call(tags, prop)) {
+        ifd = ExifMapProto.ifds[prop]
+        if (ifd) {
+          subTags = tags[prop]
+          for (prop in subTags) {
+            if (Object.prototype.hasOwnProperty.call(subTags, prop)) {
+              ifd.map[subTags[prop]] = Number(prop)
+            }
+          }
+        } else {
+          ExifMapProto.map[tags[prop]] = Number(prop)
+        }
+      }
+    }
+  })()
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif.js
new file mode 100644
index 0000000000000..3c0937b8b590a
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-exif.js
@@ -0,0 +1,460 @@
+/*
+ * JavaScript Load Image Exif Parser
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require, DataView */
+
+/* eslint-disable no-console */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'), require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  /**
+   * Exif tag map
+   *
+   * @name ExifMap
+   * @class
+   * @param {number|string} tagCode IFD tag code
+   */
+  function ExifMap(tagCode) {
+    if (tagCode) {
+      Object.defineProperty(this, 'map', {
+        value: this.ifds[tagCode].map
+      })
+      Object.defineProperty(this, 'tags', {
+        value: (this.tags && this.tags[tagCode]) || {}
+      })
+    }
+  }
+
+  ExifMap.prototype.map = {
+    Orientation: 0x0112,
+    Thumbnail: 'ifd1',
+    Blob: 0x0201, // Alias for JPEGInterchangeFormat
+    Exif: 0x8769,
+    GPSInfo: 0x8825,
+    Interoperability: 0xa005
+  }
+
+  ExifMap.prototype.ifds = {
+    ifd1: { name: 'Thumbnail', map: ExifMap.prototype.map },
+    0x8769: { name: 'Exif', map: {} },
+    0x8825: { name: 'GPSInfo', map: {} },
+    0xa005: { name: 'Interoperability', map: {} }
+  }
+
+  /**
+   * Retrieves exif tag value
+   *
+   * @param {number|string} id Exif tag code or name
+   * @returns {object} Exif tag value
+   */
+  ExifMap.prototype.get = function (id) {
+    return this[id] || this[this.map[id]]
+  }
+
+  /**
+   * Returns the Exif Thumbnail data as Blob.
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} offset Thumbnail data offset
+   * @param {number} length Thumbnail data length
+   * @returns {undefined|Blob} Returns the Thumbnail Blob or undefined
+   */
+  function getExifThumbnail(dataView, offset, length) {
+    if (!length) return
+    if (offset + length > dataView.byteLength) {
+      console.log('Invalid Exif data: Invalid thumbnail data.')
+      return
+    }
+    return new Blob(
+      [loadImage.bufferSlice.call(dataView.buffer, offset, offset + length)],
+      {
+        type: 'image/jpeg'
+      }
+    )
+  }
+
+  var ExifTagTypes = {
+    // byte, 8-bit unsigned int:
+    1: {
+      getValue: function (dataView, dataOffset) {
+        return dataView.getUint8(dataOffset)
+      },
+      size: 1
+    },
+    // ascii, 8-bit byte:
+    2: {
+      getValue: function (dataView, dataOffset) {
+        return String.fromCharCode(dataView.getUint8(dataOffset))
+      },
+      size: 1,
+      ascii: true
+    },
+    // short, 16 bit int:
+    3: {
+      getValue: function (dataView, dataOffset, littleEndian) {
+        return dataView.getUint16(dataOffset, littleEndian)
+      },
+      size: 2
+    },
+    // long, 32 bit int:
+    4: {
+      getValue: function (dataView, dataOffset, littleEndian) {
+        return dataView.getUint32(dataOffset, littleEndian)
+      },
+      size: 4
+    },
+    // rational = two long values, first is numerator, second is denominator:
+    5: {
+      getValue: function (dataView, dataOffset, littleEndian) {
+        return (
+          dataView.getUint32(dataOffset, littleEndian) /
+          dataView.getUint32(dataOffset + 4, littleEndian)
+        )
+      },
+      size: 8
+    },
+    // slong, 32 bit signed int:
+    9: {
+      getValue: function (dataView, dataOffset, littleEndian) {
+        return dataView.getInt32(dataOffset, littleEndian)
+      },
+      size: 4
+    },
+    // srational, two slongs, first is numerator, second is denominator:
+    10: {
+      getValue: function (dataView, dataOffset, littleEndian) {
+        return (
+          dataView.getInt32(dataOffset, littleEndian) /
+          dataView.getInt32(dataOffset + 4, littleEndian)
+        )
+      },
+      size: 8
+    }
+  }
+  // undefined, 8-bit byte, value depending on field:
+  ExifTagTypes[7] = ExifTagTypes[1]
+
+  /**
+   * Returns Exif tag value.
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} tiffOffset TIFF offset
+   * @param {number} offset Tag offset
+   * @param {number} type Tag type
+   * @param {number} length Tag length
+   * @param {boolean} littleEndian Little endian encoding
+   * @returns {object} Tag value
+   */
+  function getExifValue(
+    dataView,
+    tiffOffset,
+    offset,
+    type,
+    length,
+    littleEndian
+  ) {
+    var tagType = ExifTagTypes[type]
+    var tagSize
+    var dataOffset
+    var values
+    var i
+    var str
+    var c
+    if (!tagType) {
+      console.log('Invalid Exif data: Invalid tag type.')
+      return
+    }
+    tagSize = tagType.size * length
+    // Determine if the value is contained in the dataOffset bytes,
+    // or if the value at the dataOffset is a pointer to the actual data:
+    dataOffset =
+      tagSize > 4
+        ? tiffOffset + dataView.getUint32(offset + 8, littleEndian)
+        : offset + 8
+    if (dataOffset + tagSize > dataView.byteLength) {
+      console.log('Invalid Exif data: Invalid data offset.')
+      return
+    }
+    if (length === 1) {
+      return tagType.getValue(dataView, dataOffset, littleEndian)
+    }
+    values = []
+    for (i = 0; i < length; i += 1) {
+      values[i] = tagType.getValue(
+        dataView,
+        dataOffset + i * tagType.size,
+        littleEndian
+      )
+    }
+    if (tagType.ascii) {
+      str = ''
+      // Concatenate the chars:
+      for (i = 0; i < values.length; i += 1) {
+        c = values[i]
+        // Ignore the terminating NULL byte(s):
+        if (c === '\u0000') {
+          break
+        }
+        str += c
+      }
+      return str
+    }
+    return values
+  }
+
+  /**
+   * Determines if the given tag should be included.
+   *
+   * @param {object} includeTags Map of tags to include
+   * @param {object} excludeTags Map of tags to exclude
+   * @param {number|string} tagCode Tag code to check
+   * @returns {boolean} True if the tag should be included
+   */
+  function shouldIncludeTag(includeTags, excludeTags, tagCode) {
+    return (
+      (!includeTags || includeTags[tagCode]) &&
+      (!excludeTags || excludeTags[tagCode] !== true)
+    )
+  }
+
+  /**
+   * Parses Exif tags.
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} tiffOffset TIFF offset
+   * @param {number} dirOffset Directory offset
+   * @param {boolean} littleEndian Little endian encoding
+   * @param {ExifMap} tags Map to store parsed exif tags
+   * @param {ExifMap} tagOffsets Map to store parsed exif tag offsets
+   * @param {object} includeTags Map of tags to include
+   * @param {object} excludeTags Map of tags to exclude
+   * @returns {number} Next directory offset
+   */
+  function parseExifTags(
+    dataView,
+    tiffOffset,
+    dirOffset,
+    littleEndian,
+    tags,
+    tagOffsets,
+    includeTags,
+    excludeTags
+  ) {
+    var tagsNumber, dirEndOffset, i, tagOffset, tagNumber, tagValue
+    if (dirOffset + 6 > dataView.byteLength) {
+      console.log('Invalid Exif data: Invalid directory offset.')
+      return
+    }
+    tagsNumber = dataView.getUint16(dirOffset, littleEndian)
+    dirEndOffset = dirOffset + 2 + 12 * tagsNumber
+    if (dirEndOffset + 4 > dataView.byteLength) {
+      console.log('Invalid Exif data: Invalid directory size.')
+      return
+    }
+    for (i = 0; i < tagsNumber; i += 1) {
+      tagOffset = dirOffset + 2 + 12 * i
+      tagNumber = dataView.getUint16(tagOffset, littleEndian)
+      if (!shouldIncludeTag(includeTags, excludeTags, tagNumber)) continue
+      tagValue = getExifValue(
+        dataView,
+        tiffOffset,
+        tagOffset,
+        dataView.getUint16(tagOffset + 2, littleEndian), // tag type
+        dataView.getUint32(tagOffset + 4, littleEndian), // tag length
+        littleEndian
+      )
+      tags[tagNumber] = tagValue
+      if (tagOffsets) {
+        tagOffsets[tagNumber] = tagOffset
+      }
+    }
+    // Return the offset to the next directory:
+    return dataView.getUint32(dirEndOffset, littleEndian)
+  }
+
+  /**
+   * Parses tags in a given IFD (Image File Directory).
+   *
+   * @param {object} data Data object to store exif tags and offsets
+   * @param {number|string} tagCode IFD tag code
+   * @param {DataView} dataView Data view interface
+   * @param {number} tiffOffset TIFF offset
+   * @param {boolean} littleEndian Little endian encoding
+   * @param {object} includeTags Map of tags to include
+   * @param {object} excludeTags Map of tags to exclude
+   */
+  function parseExifIFD(
+    data,
+    tagCode,
+    dataView,
+    tiffOffset,
+    littleEndian,
+    includeTags,
+    excludeTags
+  ) {
+    var dirOffset = data.exif[tagCode]
+    if (dirOffset) {
+      data.exif[tagCode] = new ExifMap(tagCode)
+      if (data.exifOffsets) {
+        data.exifOffsets[tagCode] = new ExifMap(tagCode)
+      }
+      parseExifTags(
+        dataView,
+        tiffOffset,
+        tiffOffset + dirOffset,
+        littleEndian,
+        data.exif[tagCode],
+        data.exifOffsets && data.exifOffsets[tagCode],
+        includeTags && includeTags[tagCode],
+        excludeTags && excludeTags[tagCode]
+      )
+    }
+  }
+
+  loadImage.parseExifData = function (dataView, offset, length, data, options) {
+    if (options.disableExif) {
+      return
+    }
+    var includeTags = options.includeExifTags
+    var excludeTags = options.excludeExifTags || {
+      0x8769: {
+        // ExifIFDPointer
+        0x927c: true // MakerNote
+      }
+    }
+    var tiffOffset = offset + 10
+    var littleEndian
+    var dirOffset
+    var thumbnailIFD
+    // Check for the ASCII code for "Exif" (0x45786966):
+    if (dataView.getUint32(offset + 4) !== 0x45786966) {
+      // No Exif data, might be XMP data instead
+      return
+    }
+    if (tiffOffset + 8 > dataView.byteLength) {
+      console.log('Invalid Exif data: Invalid segment size.')
+      return
+    }
+    // Check for the two null bytes:
+    if (dataView.getUint16(offset + 8) !== 0x0000) {
+      console.log('Invalid Exif data: Missing byte alignment offset.')
+      return
+    }
+    // Check the byte alignment:
+    switch (dataView.getUint16(tiffOffset)) {
+      case 0x4949:
+        littleEndian = true
+        break
+      case 0x4d4d:
+        littleEndian = false
+        break
+      default:
+        console.log('Invalid Exif data: Invalid byte alignment marker.')
+        return
+    }
+    // Check for the TIFF tag marker (0x002A):
+    if (dataView.getUint16(tiffOffset + 2, littleEndian) !== 0x002a) {
+      console.log('Invalid Exif data: Missing TIFF marker.')
+      return
+    }
+    // Retrieve the directory offset bytes, usually 0x00000008 or 8 decimal:
+    dirOffset = dataView.getUint32(tiffOffset + 4, littleEndian)
+    // Create the exif object to store the tags:
+    data.exif = new ExifMap()
+    if (!options.disableExifOffsets) {
+      data.exifOffsets = new ExifMap()
+      data.exifTiffOffset = tiffOffset
+      data.exifLittleEndian = littleEndian
+    }
+    // Parse the tags of the main image directory (IFD0) and retrieve the
+    // offset to the next directory (IFD1), usually the thumbnail directory:
+    dirOffset = parseExifTags(
+      dataView,
+      tiffOffset,
+      tiffOffset + dirOffset,
+      littleEndian,
+      data.exif,
+      data.exifOffsets,
+      includeTags,
+      excludeTags
+    )
+    if (dirOffset && shouldIncludeTag(includeTags, excludeTags, 'ifd1')) {
+      data.exif.ifd1 = dirOffset
+      if (data.exifOffsets) {
+        data.exifOffsets.ifd1 = tiffOffset + dirOffset
+      }
+    }
+    Object.keys(data.exif.ifds).forEach(function (tagCode) {
+      parseExifIFD(
+        data,
+        tagCode,
+        dataView,
+        tiffOffset,
+        littleEndian,
+        includeTags,
+        excludeTags
+      )
+    })
+    thumbnailIFD = data.exif.ifd1
+    // Check for JPEG Thumbnail offset and data length:
+    if (thumbnailIFD && thumbnailIFD[0x0201]) {
+      thumbnailIFD[0x0201] = getExifThumbnail(
+        dataView,
+        tiffOffset + thumbnailIFD[0x0201],
+        thumbnailIFD[0x0202] // Thumbnail data length
+      )
+    }
+  }
+
+  // Registers the Exif parser for the APP1 JPEG metadata segment:
+  loadImage.metaDataParsers.jpeg[0xffe1].push(loadImage.parseExifData)
+
+  loadImage.exifWriters = {
+    // Orientation writer:
+    0x0112: function (buffer, data, value) {
+      var orientationOffset = data.exifOffsets[0x0112]
+      if (!orientationOffset) return buffer
+      var view = new DataView(buffer, orientationOffset + 8, 2)
+      view.setUint16(0, value, data.exifLittleEndian)
+      return buffer
+    }
+  }
+
+  loadImage.writeExifData = function (buffer, data, id, value) {
+    loadImage.exifWriters[data.exif.map[id]](buffer, data, value)
+  }
+
+  loadImage.ExifMap = ExifMap
+
+  // Adds the following properties to the parseMetaData callback data:
+  // - exif: The parsed Exif tags
+  // - exifOffsets: The parsed Exif tag offsets
+  // - exifTiffOffset: TIFF header offset (used for offset pointers)
+  // - exifLittleEndian: little endian order if true, big endian if false
+
+  // Adds the following options to the parseMetaData method:
+  // - disableExif: Disables Exif parsing when true.
+  // - disableExifOffsets: Disables storing Exif tag offsets when true.
+  // - includeExifTags: A map of Exif tags to include for parsing.
+  // - excludeExifTags: A map of Exif tags to exclude from parsing.
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-fetch.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-fetch.js
new file mode 100644
index 0000000000000..28a28fb83e6cd
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-fetch.js
@@ -0,0 +1,103 @@
+/*
+ * JavaScript Load Image Fetch
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2017, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require, Promise */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  var global = loadImage.global
+
+  if (
+    global.fetch &&
+    global.Request &&
+    global.Response &&
+    global.Response.prototype.blob
+  ) {
+    loadImage.fetchBlob = function (url, callback, options) {
+      /**
+       * Fetch response handler.
+       *
+       * @param {Response} response Fetch response
+       * @returns {Blob} Fetched Blob.
+       */
+      function responseHandler(response) {
+        return response.blob()
+      }
+      if (global.Promise && typeof callback !== 'function') {
+        return fetch(new Request(url, callback)).then(responseHandler)
+      }
+      fetch(new Request(url, options))
+        .then(responseHandler)
+        .then(callback)
+        [
+          // Avoid parsing error in IE<9, where catch is a reserved word.
+          // eslint-disable-next-line dot-notation
+          'catch'
+        ](function (err) {
+          callback(null, err)
+        })
+    }
+  } else if (
+    global.XMLHttpRequest &&
+    // https://xhr.spec.whatwg.org/#the-responsetype-attribute
+    new XMLHttpRequest().responseType === ''
+  ) {
+    loadImage.fetchBlob = function (url, callback, options) {
+      /**
+       * Promise executor
+       *
+       * @param {Function} resolve Resolution function
+       * @param {Function} reject Rejection function
+       */
+      function executor(resolve, reject) {
+        options = options || {} // eslint-disable-line no-param-reassign
+        var req = new XMLHttpRequest()
+        req.open(options.method || 'GET', url)
+        if (options.headers) {
+          Object.keys(options.headers).forEach(function (key) {
+            req.setRequestHeader(key, options.headers[key])
+          })
+        }
+        req.withCredentials = options.credentials === 'include'
+        req.responseType = 'blob'
+        req.onload = function () {
+          resolve(req.response)
+        }
+        req.onerror = req.onabort = req.ontimeout = function (err) {
+          if (resolve === reject) {
+            // Not using Promises
+            reject(null, err)
+          } else {
+            reject(err)
+          }
+        }
+        req.send(options.body)
+      }
+      if (global.Promise && typeof callback !== 'function') {
+        options = callback // eslint-disable-line no-param-reassign
+        return new Promise(executor)
+      }
+      return executor(callback, callback)
+    }
+  }
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc-map.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc-map.js
new file mode 100644
index 0000000000000..cd959a24b3541
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc-map.js
@@ -0,0 +1,169 @@
+/*
+ * JavaScript Load Image IPTC Map
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2013, Sebastian Tschan
+ * Copyright 2018, Dave Bevan
+ *
+ * IPTC tags mapping based on
+ * https://iptc.org/standards/photo-metadata
+ * https://exiftool.org/TagNames/IPTC.html
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'), require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  var IptcMapProto = loadImage.IptcMap.prototype
+
+  IptcMapProto.tags = {
+    0: 'ApplicationRecordVersion',
+    3: 'ObjectTypeReference',
+    4: 'ObjectAttributeReference',
+    5: 'ObjectName',
+    7: 'EditStatus',
+    8: 'EditorialUpdate',
+    10: 'Urgency',
+    12: 'SubjectReference',
+    15: 'Category',
+    20: 'SupplementalCategories',
+    22: 'FixtureIdentifier',
+    25: 'Keywords',
+    26: 'ContentLocationCode',
+    27: 'ContentLocationName',
+    30: 'ReleaseDate',
+    35: 'ReleaseTime',
+    37: 'ExpirationDate',
+    38: 'ExpirationTime',
+    40: 'SpecialInstructions',
+    42: 'ActionAdvised',
+    45: 'ReferenceService',
+    47: 'ReferenceDate',
+    50: 'ReferenceNumber',
+    55: 'DateCreated',
+    60: 'TimeCreated',
+    62: 'DigitalCreationDate',
+    63: 'DigitalCreationTime',
+    65: 'OriginatingProgram',
+    70: 'ProgramVersion',
+    75: 'ObjectCycle',
+    80: 'Byline',
+    85: 'BylineTitle',
+    90: 'City',
+    92: 'Sublocation',
+    95: 'State',
+    100: 'CountryCode',
+    101: 'Country',
+    103: 'OriginalTransmissionReference',
+    105: 'Headline',
+    110: 'Credit',
+    115: 'Source',
+    116: 'CopyrightNotice',
+    118: 'Contact',
+    120: 'Caption',
+    121: 'LocalCaption',
+    122: 'Writer',
+    125: 'RasterizedCaption',
+    130: 'ImageType',
+    131: 'ImageOrientation',
+    135: 'LanguageIdentifier',
+    150: 'AudioType',
+    151: 'AudioSamplingRate',
+    152: 'AudioSamplingResolution',
+    153: 'AudioDuration',
+    154: 'AudioOutcue',
+    184: 'JobID',
+    185: 'MasterDocumentID',
+    186: 'ShortDocumentID',
+    187: 'UniqueDocumentID',
+    188: 'OwnerID',
+    200: 'ObjectPreviewFileFormat',
+    201: 'ObjectPreviewFileVersion',
+    202: 'ObjectPreviewData',
+    221: 'Prefs',
+    225: 'ClassifyState',
+    228: 'SimilarityIndex',
+    230: 'DocumentNotes',
+    231: 'DocumentHistory',
+    232: 'ExifCameraInfo',
+    255: 'CatalogSets'
+  }
+
+  IptcMapProto.stringValues = {
+    10: {
+      0: '0 (reserved)',
+      1: '1 (most urgent)',
+      2: '2',
+      3: '3',
+      4: '4',
+      5: '5 (normal urgency)',
+      6: '6',
+      7: '7',
+      8: '8 (least urgent)',
+      9: '9 (user-defined priority)'
+    },
+    75: {
+      a: 'Morning',
+      b: 'Both Morning and Evening',
+      p: 'Evening'
+    },
+    131: {
+      L: 'Landscape',
+      P: 'Portrait',
+      S: 'Square'
+    }
+  }
+
+  IptcMapProto.getText = function (id) {
+    var value = this.get(id)
+    var tagCode = this.map[id]
+    var stringValue = this.stringValues[tagCode]
+    if (stringValue) return stringValue[value]
+    return String(value)
+  }
+
+  IptcMapProto.getAll = function () {
+    var map = {}
+    var prop
+    var name
+    for (prop in this) {
+      if (Object.prototype.hasOwnProperty.call(this, prop)) {
+        name = this.tags[prop]
+        if (name) map[name] = this.getText(name)
+      }
+    }
+    return map
+  }
+
+  IptcMapProto.getName = function (tagCode) {
+    return this.tags[tagCode]
+  }
+
+  // Extend the map of tag names to tag codes:
+  ;(function () {
+    var tags = IptcMapProto.tags
+    var map = IptcMapProto.map || {}
+    var prop
+    // Map the tag names to tags:
+    for (prop in tags) {
+      if (Object.prototype.hasOwnProperty.call(tags, prop)) {
+        map[tags[prop]] = Number(prop)
+      }
+    }
+  })()
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc.js
new file mode 100644
index 0000000000000..f6b4594f9e130
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-iptc.js
@@ -0,0 +1,239 @@
+/*
+ * JavaScript Load Image IPTC Parser
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2013, Sebastian Tschan
+ * Copyright 2018, Dave Bevan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require, DataView */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'), require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  /**
+   * IPTC tag map
+   *
+   * @name IptcMap
+   * @class
+   */
+  function IptcMap() {}
+
+  IptcMap.prototype.map = {
+    ObjectName: 5
+  }
+
+  IptcMap.prototype.types = {
+    0: 'Uint16', // ApplicationRecordVersion
+    200: 'Uint16', // ObjectPreviewFileFormat
+    201: 'Uint16', // ObjectPreviewFileVersion
+    202: 'binary' // ObjectPreviewData
+  }
+
+  /**
+   * Retrieves IPTC tag value
+   *
+   * @param {number|string} id IPTC tag code or name
+   * @returns {object} IPTC tag value
+   */
+  IptcMap.prototype.get = function (id) {
+    return this[id] || this[this.map[id]]
+  }
+
+  /**
+   * Retrieves string for the given DataView and range
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} offset Offset start
+   * @param {number} length Offset length
+   * @returns {string} String value
+   */
+  function getStringValue(dataView, offset, length) {
+    var outstr = ''
+    var end = offset + length
+    for (var n = offset; n < end; n += 1) {
+      outstr += String.fromCharCode(dataView.getUint8(n))
+    }
+    return outstr
+  }
+
+  /**
+   * Retrieves tag value for the given DataView and range
+   *
+   * @param {number} tagCode tag code
+   * @param {IptcMap} map IPTC tag map
+   * @param {DataView} dataView Data view interface
+   * @param {number} offset Range start
+   * @param {number} length Range length
+   * @returns {object} Tag value
+   */
+  function getTagValue(tagCode, map, dataView, offset, length) {
+    if (map.types[tagCode] === 'binary') {
+      return new Blob([dataView.buffer.slice(offset, offset + length)])
+    }
+    if (map.types[tagCode] === 'Uint16') {
+      return dataView.getUint16(offset)
+    }
+    return getStringValue(dataView, offset, length)
+  }
+
+  /**
+   * Combines IPTC value with existing ones.
+   *
+   * @param {object} value Existing IPTC field value
+   * @param {object} newValue New IPTC field value
+   * @returns {object} Resulting IPTC field value
+   */
+  function combineTagValues(value, newValue) {
+    if (value === undefined) return newValue
+    if (value instanceof Array) {
+      value.push(newValue)
+      return value
+    }
+    return [value, newValue]
+  }
+
+  /**
+   * Parses IPTC tags.
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} segmentOffset Segment offset
+   * @param {number} segmentLength Segment length
+   * @param {object} data Data export object
+   * @param {object} includeTags Map of tags to include
+   * @param {object} excludeTags Map of tags to exclude
+   */
+  function parseIptcTags(
+    dataView,
+    segmentOffset,
+    segmentLength,
+    data,
+    includeTags,
+    excludeTags
+  ) {
+    var value, tagSize, tagCode
+    var segmentEnd = segmentOffset + segmentLength
+    var offset = segmentOffset
+    while (offset < segmentEnd) {
+      if (
+        dataView.getUint8(offset) === 0x1c && // tag marker
+        dataView.getUint8(offset + 1) === 0x02 // record number, only handles v2
+      ) {
+        tagCode = dataView.getUint8(offset + 2)
+        if (
+          (!includeTags || includeTags[tagCode]) &&
+          (!excludeTags || !excludeTags[tagCode])
+        ) {
+          tagSize = dataView.getInt16(offset + 3)
+          value = getTagValue(tagCode, data.iptc, dataView, offset + 5, tagSize)
+          data.iptc[tagCode] = combineTagValues(data.iptc[tagCode], value)
+          if (data.iptcOffsets) {
+            data.iptcOffsets[tagCode] = offset
+          }
+        }
+      }
+      offset += 1
+    }
+  }
+
+  /**
+   * Tests if field segment starts at offset.
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} offset Segment offset
+   * @returns {boolean} True if '8BIM<EOT><EOT>' exists at offset
+   */
+  function isSegmentStart(dataView, offset) {
+    return (
+      dataView.getUint32(offset) === 0x3842494d && // Photoshop segment start
+      dataView.getUint16(offset + 4) === 0x0404 // IPTC segment start
+    )
+  }
+
+  /**
+   * Returns header length.
+   *
+   * @param {DataView} dataView Data view interface
+   * @param {number} offset Segment offset
+   * @returns {number} Header length
+   */
+  function getHeaderLength(dataView, offset) {
+    var length = dataView.getUint8(offset + 7)
+    if (length % 2 !== 0) length += 1
+    // Check for pre photoshop 6 format
+    if (length === 0) {
+      // Always 4
+      length = 4
+    }
+    return length
+  }
+
+  loadImage.parseIptcData = function (dataView, offset, length, data, options) {
+    if (options.disableIptc) {
+      return
+    }
+    var markerLength = offset + length
+    while (offset + 8 < markerLength) {
+      if (isSegmentStart(dataView, offset)) {
+        var headerLength = getHeaderLength(dataView, offset)
+        var segmentOffset = offset + 8 + headerLength
+        if (segmentOffset > markerLength) {
+          // eslint-disable-next-line no-console
+          console.log('Invalid IPTC data: Invalid segment offset.')
+          break
+        }
+        var segmentLength = dataView.getUint16(offset + 6 + headerLength)
+        if (offset + segmentLength > markerLength) {
+          // eslint-disable-next-line no-console
+          console.log('Invalid IPTC data: Invalid segment size.')
+          break
+        }
+        // Create the iptc object to store the tags:
+        data.iptc = new IptcMap()
+        if (!options.disableIptcOffsets) {
+          data.iptcOffsets = new IptcMap()
+        }
+        parseIptcTags(
+          dataView,
+          segmentOffset,
+          segmentLength,
+          data,
+          options.includeIptcTags,
+          options.excludeIptcTags || { 202: true } // ObjectPreviewData
+        )
+        return
+      }
+      // eslint-disable-next-line no-param-reassign
+      offset += 1
+    }
+  }
+
+  // Registers this IPTC parser for the APP13 JPEG metadata segment:
+  loadImage.metaDataParsers.jpeg[0xffed].push(loadImage.parseIptcData)
+
+  loadImage.IptcMap = IptcMap
+
+  // Adds the following properties to the parseMetaData callback data:
+  // - iptc: The iptc tags, parsed by the parseIptcData method
+
+  // Adds the following options to the parseMetaData method:
+  // - disableIptc: Disables IPTC parsing when true.
+  // - disableIptcOffsets: Disables storing IPTC tag offsets when true.
+  // - includeIptcTags: A map of IPTC tags to include for parsing.
+  // - excludeIptcTags: A map of IPTC tags to exclude from parsing.
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta.js
new file mode 100644
index 0000000000000..20a06184c640d
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta.js
@@ -0,0 +1,259 @@
+/*
+ * JavaScript Load Image Meta
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Image metadata handling implementation
+ * based on the help and contribution of
+ * Achim Stöhr.
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require, Promise, DataView, Uint8Array, ArrayBuffer */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  var global = loadImage.global
+  var originalTransform = loadImage.transform
+
+  var blobSlice =
+    global.Blob &&
+    (Blob.prototype.slice ||
+      Blob.prototype.webkitSlice ||
+      Blob.prototype.mozSlice)
+
+  var bufferSlice =
+    (global.ArrayBuffer && ArrayBuffer.prototype.slice) ||
+    function (begin, end) {
+      // Polyfill for IE10, which does not support ArrayBuffer.slice
+      // eslint-disable-next-line no-param-reassign
+      end = end || this.byteLength - begin
+      var arr1 = new Uint8Array(this, begin, end)
+      var arr2 = new Uint8Array(end)
+      arr2.set(arr1)
+      return arr2.buffer
+    }
+
+  var metaDataParsers = {
+    jpeg: {
+      0xffe1: [], // APP1 marker
+      0xffed: [] // APP13 marker
+    }
+  }
+
+  /**
+   * Parses image metadata and calls the callback with an object argument
+   * with the following property:
+   * - imageHead: The complete image head as ArrayBuffer
+   * The options argument accepts an object and supports the following
+   * properties:
+   * - maxMetaDataSize: Defines the maximum number of bytes to parse.
+   * - disableImageHead: Disables creating the imageHead property.
+   *
+   * @param {Blob} file Blob object
+   * @param {Function} [callback] Callback function
+   * @param {object} [options] Parsing options
+   * @param {object} [data] Result data object
+   * @returns {Promise<object>|undefined} Returns Promise if no callback given.
+   */
+  function parseMetaData(file, callback, options, data) {
+    var that = this
+    /**
+     * Promise executor
+     *
+     * @param {Function} resolve Resolution function
+     * @param {Function} reject Rejection function
+     * @returns {undefined} Undefined
+     */
+    function executor(resolve, reject) {
+      if (
+        !(
+          global.DataView &&
+          blobSlice &&
+          file &&
+          file.size >= 12 &&
+          file.type === 'image/jpeg'
+        )
+      ) {
+        // Nothing to parse
+        return resolve(data)
+      }
+      // 256 KiB should contain all EXIF/ICC/IPTC segments:
+      var maxMetaDataSize = options.maxMetaDataSize || 262144
+      if (
+        !loadImage.readFile(
+          blobSlice.call(file, 0, maxMetaDataSize),
+          function (buffer) {
+            // Note on endianness:
+            // Since the marker and length bytes in JPEG files are always
+            // stored in big endian order, we can leave the endian parameter
+            // of the DataView methods undefined, defaulting to big endian.
+            var dataView = new DataView(buffer)
+            // Check for the JPEG marker (0xffd8):
+            if (dataView.getUint16(0) !== 0xffd8) {
+              return reject(
+                new Error('Invalid JPEG file: Missing JPEG marker.')
+              )
+            }
+            var offset = 2
+            var maxOffset = dataView.byteLength - 4
+            var headLength = offset
+            var markerBytes
+            var markerLength
+            var parsers
+            var i
+            while (offset < maxOffset) {
+              markerBytes = dataView.getUint16(offset)
+              // Search for APPn (0xffeN) and COM (0xfffe) markers,
+              // which contain application-specific metadata like
+              // Exif, ICC and IPTC data and text comments:
+              if (
+                (markerBytes >= 0xffe0 && markerBytes <= 0xffef) ||
+                markerBytes === 0xfffe
+              ) {
+                // The marker bytes (2) are always followed by
+                // the length bytes (2), indicating the length of the
+                // marker segment, which includes the length bytes,
+                // but not the marker bytes, so we add 2:
+                markerLength = dataView.getUint16(offset + 2) + 2
+                if (offset + markerLength > dataView.byteLength) {
+                  // eslint-disable-next-line no-console
+                  console.log('Invalid JPEG metadata: Invalid segment size.')
+                  break
+                }
+                parsers = metaDataParsers.jpeg[markerBytes]
+                if (parsers && !options.disableMetaDataParsers) {
+                  for (i = 0; i < parsers.length; i += 1) {
+                    parsers[i].call(
+                      that,
+                      dataView,
+                      offset,
+                      markerLength,
+                      data,
+                      options
+                    )
+                  }
+                }
+                offset += markerLength
+                headLength = offset
+              } else {
+                // Not an APPn or COM marker, probably safe to
+                // assume that this is the end of the metadata
+                break
+              }
+            }
+            // Meta length must be longer than JPEG marker (2)
+            // plus APPn marker (2), followed by length bytes (2):
+            if (!options.disableImageHead && headLength > 6) {
+              data.imageHead = bufferSlice.call(buffer, 0, headLength)
+            }
+            resolve(data)
+          },
+          reject,
+          'readAsArrayBuffer'
+        )
+      ) {
+        // No support for the FileReader interface, nothing to parse
+        resolve(data)
+      }
+    }
+    options = options || {} // eslint-disable-line no-param-reassign
+    if (global.Promise && typeof callback !== 'function') {
+      options = callback || {} // eslint-disable-line no-param-reassign
+      data = options // eslint-disable-line no-param-reassign
+      return new Promise(executor)
+    }
+    data = data || {} // eslint-disable-line no-param-reassign
+    return executor(callback, callback)
+  }
+
+  /**
+   * Replaces the head of a JPEG Blob
+   *
+   * @param {Blob} blob Blob object
+   * @param {ArrayBuffer} oldHead Old JPEG head
+   * @param {ArrayBuffer} newHead New JPEG head
+   * @returns {Blob} Combined Blob
+   */
+  function replaceJPEGHead(blob, oldHead, newHead) {
+    if (!blob || !oldHead || !newHead) return null
+    return new Blob([newHead, blobSlice.call(blob, oldHead.byteLength)], {
+      type: 'image/jpeg'
+    })
+  }
+
+  /**
+   * Replaces the image head of a JPEG blob with the given one.
+   * Returns a Promise or calls the callback with the new Blob.
+   *
+   * @param {Blob} blob Blob object
+   * @param {ArrayBuffer} head New JPEG head
+   * @param {Function} [callback] Callback function
+   * @returns {Promise<Blob|null>|undefined} Combined Blob
+   */
+  function replaceHead(blob, head, callback) {
+    var options = { maxMetaDataSize: 256, disableMetaDataParsers: true }
+    if (!callback && global.Promise) {
+      return parseMetaData(blob, options).then(function (data) {
+        return replaceJPEGHead(blob, data.imageHead, head)
+      })
+    }
+    parseMetaData(
+      blob,
+      function (data) {
+        callback(replaceJPEGHead(blob, data.imageHead, head))
+      },
+      options
+    )
+  }
+
+  loadImage.transform = function (img, options, callback, file, data) {
+    if (loadImage.requiresMetaData(options)) {
+      data = data || {} // eslint-disable-line no-param-reassign
+      parseMetaData(
+        file,
+        function (result) {
+          if (result !== data) {
+            // eslint-disable-next-line no-console
+            if (global.console) console.log(result)
+            result = data // eslint-disable-line no-param-reassign
+          }
+          originalTransform.call(
+            loadImage,
+            img,
+            options,
+            callback,
+            file,
+            result
+          )
+        },
+        options,
+        data
+      )
+    } else {
+      originalTransform.apply(loadImage, arguments)
+    }
+  }
+
+  loadImage.blobSlice = blobSlice
+  loadImage.bufferSlice = bufferSlice
+  loadImage.replaceHead = replaceHead
+  loadImage.parseMetaData = parseMetaData
+  loadImage.metaDataParsers = metaDataParsers
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation.js
new file mode 100644
index 0000000000000..2b32a368e5f54
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-orientation.js
@@ -0,0 +1,481 @@
+/*
+ * JavaScript Load Image Orientation
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2013, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/*
+Exif orientation values to correctly display the letter F:
+
+    1             2
+  ██████        ██████
+  ██                ██
+  ████            ████
+  ██                ██
+  ██                ██
+
+    3             4
+      ██        ██
+      ██        ██
+    ████        ████
+      ██        ██
+  ██████        ██████
+
+    5             6
+██████████    ██
+██  ██        ██  ██
+██            ██████████
+
+    7             8
+        ██    ██████████
+    ██  ██        ██  ██
+██████████            ██
+
+*/
+
+/* global define, module, require */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale', 'jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale'),
+      require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image-meta')
+    )
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  var originalTransform = loadImage.transform
+  var originalRequiresCanvas = loadImage.requiresCanvas
+  var originalRequiresMetaData = loadImage.requiresMetaData
+  var originalTransformCoordinates = loadImage.transformCoordinates
+  var originalGetTransformedOptions = loadImage.getTransformedOptions
+
+  ;(function ($) {
+    // Guard for non-browser environments (e.g. server-side rendering):
+    if (!$.global.document) return
+    // black+white 3x2 JPEG, with the following meta information set:
+    // - EXIF Orientation: 6 (Rotated 90° CCW)
+    // Image data layout (B=black, F=white):
+    // BFF
+    // BBB
+    var testImageURL =
+      'data:image/jpeg;base64,/9j/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAYAAAA' +
+      'AAAD/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA' +
+      'QEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE' +
+      'BAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAIAAwMBEQACEQEDEQH/x' +
+      'ABRAAEAAAAAAAAAAAAAAAAAAAAKEAEBAQADAQEAAAAAAAAAAAAGBQQDCAkCBwEBAAAAAAA' +
+      'AAAAAAAAAAAAAABEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AG8T9NfSMEVMhQ' +
+      'voP3fFiRZ+MTHDifa/95OFSZU5OzRzxkyejv8ciEfhSceSXGjS8eSdLnZc2HDm4M3BxcXw' +
+      'H/9k='
+    var img = document.createElement('img')
+    img.onload = function () {
+      // Check if the browser supports automatic image orientation:
+      $.orientation = img.width === 2 && img.height === 3
+      if ($.orientation) {
+        var canvas = $.createCanvas(1, 1, true)
+        var ctx = canvas.getContext('2d')
+        ctx.drawImage(img, 1, 1, 1, 1, 0, 0, 1, 1)
+        // Check if the source image coordinates (sX, sY, sWidth, sHeight) are
+        // correctly applied to the auto-orientated image, which should result
+        // in a white opaque pixel (e.g. in Safari).
+        // Browsers that show a transparent pixel (e.g. Chromium) fail to crop
+        // auto-oriented images correctly and require a workaround, e.g.
+        // drawing the complete source image to an intermediate canvas first.
+        // See https://bugs.chromium.org/p/chromium/issues/detail?id=1074354
+        $.orientationCropBug =
+          ctx.getImageData(0, 0, 1, 1).data.toString() !== '255,255,255,255'
+      }
+    }
+    img.src = testImageURL
+  })(loadImage)
+
+  /**
+   * Determines if the orientation requires a canvas element.
+   *
+   * @param {object} [options] Options object
+   * @param {boolean} [withMetaData] Is metadata required for orientation
+   * @returns {boolean} Returns true if orientation requires canvas/meta
+   */
+  function requiresCanvasOrientation(options, withMetaData) {
+    var orientation = options && options.orientation
+    return (
+      // Exif orientation for browsers without automatic image orientation:
+      (orientation === true && !loadImage.orientation) ||
+      // Orientation reset for browsers with automatic image orientation:
+      (orientation === 1 && loadImage.orientation) ||
+      // Orientation to defined value, requires meta for orientation reset only:
+      ((!withMetaData || loadImage.orientation) &&
+        orientation > 1 &&
+        orientation < 9)
+    )
+  }
+
+  /**
+   * Determines if the image requires an orientation change.
+   *
+   * @param {number} [orientation] Defined orientation value
+   * @param {number} [autoOrientation] Auto-orientation based on Exif data
+   * @returns {boolean} Returns true if an orientation change is required
+   */
+  function requiresOrientationChange(orientation, autoOrientation) {
+    return (
+      orientation !== autoOrientation &&
+      ((orientation === 1 && autoOrientation > 1 && autoOrientation < 9) ||
+        (orientation > 1 && orientation < 9))
+    )
+  }
+
+  /**
+   * Determines orientation combinations that require a rotation by 180°.
+   *
+   * The following is a list of combinations that return true:
+   *
+   * 2 (flip) => 5 (rot90,flip), 7 (rot90,flip), 6 (rot90), 8 (rot90)
+   * 4 (flip) => 5 (rot90,flip), 7 (rot90,flip), 6 (rot90), 8 (rot90)
+   *
+   * 5 (rot90,flip) => 2 (flip), 4 (flip), 6 (rot90), 8 (rot90)
+   * 7 (rot90,flip) => 2 (flip), 4 (flip), 6 (rot90), 8 (rot90)
+   *
+   * 6 (rot90) => 2 (flip), 4 (flip), 5 (rot90,flip), 7 (rot90,flip)
+   * 8 (rot90) => 2 (flip), 4 (flip), 5 (rot90,flip), 7 (rot90,flip)
+   *
+   * @param {number} [orientation] Defined orientation value
+   * @param {number} [autoOrientation] Auto-orientation based on Exif data
+   * @returns {boolean} Returns true if rotation by 180° is required
+   */
+  function requiresRot180(orientation, autoOrientation) {
+    if (autoOrientation > 1 && autoOrientation < 9) {
+      switch (orientation) {
+        case 2:
+        case 4:
+          return autoOrientation > 4
+        case 5:
+        case 7:
+          return autoOrientation % 2 === 0
+        case 6:
+        case 8:
+          return (
+            autoOrientation === 2 ||
+            autoOrientation === 4 ||
+            autoOrientation === 5 ||
+            autoOrientation === 7
+          )
+      }
+    }
+    return false
+  }
+
+  // Determines if the target image should be a canvas element:
+  loadImage.requiresCanvas = function (options) {
+    return (
+      requiresCanvasOrientation(options) ||
+      originalRequiresCanvas.call(loadImage, options)
+    )
+  }
+
+  // Determines if metadata should be loaded automatically:
+  loadImage.requiresMetaData = function (options) {
+    return (
+      requiresCanvasOrientation(options, true) ||
+      originalRequiresMetaData.call(loadImage, options)
+    )
+  }
+
+  loadImage.transform = function (img, options, callback, file, data) {
+    originalTransform.call(
+      loadImage,
+      img,
+      options,
+      function (img, data) {
+        if (data) {
+          var autoOrientation =
+            loadImage.orientation && data.exif && data.exif.get('Orientation')
+          if (autoOrientation > 4 && autoOrientation < 9) {
+            // Automatic image orientation switched image dimensions
+            var originalWidth = data.originalWidth
+            var originalHeight = data.originalHeight
+            data.originalWidth = originalHeight
+            data.originalHeight = originalWidth
+          }
+        }
+        callback(img, data)
+      },
+      file,
+      data
+    )
+  }
+
+  // Transforms coordinate and dimension options
+  // based on the given orientation option:
+  loadImage.getTransformedOptions = function (img, opts, data) {
+    var options = originalGetTransformedOptions.call(loadImage, img, opts)
+    var exifOrientation = data.exif && data.exif.get('Orientation')
+    var orientation = options.orientation
+    var autoOrientation = loadImage.orientation && exifOrientation
+    if (orientation === true) orientation = exifOrientation
+    if (!requiresOrientationChange(orientation, autoOrientation)) {
+      return options
+    }
+    var top = options.top
+    var right = options.right
+    var bottom = options.bottom
+    var left = options.left
+    var newOptions = {}
+    for (var i in options) {
+      if (Object.prototype.hasOwnProperty.call(options, i)) {
+        newOptions[i] = options[i]
+      }
+    }
+    newOptions.orientation = orientation
+    if (
+      (orientation > 4 && !(autoOrientation > 4)) ||
+      (orientation < 5 && autoOrientation > 4)
+    ) {
+      // Image dimensions and target dimensions are switched
+      newOptions.maxWidth = options.maxHeight
+      newOptions.maxHeight = options.maxWidth
+      newOptions.minWidth = options.minHeight
+      newOptions.minHeight = options.minWidth
+      newOptions.sourceWidth = options.sourceHeight
+      newOptions.sourceHeight = options.sourceWidth
+    }
+    if (autoOrientation > 1) {
+      // Browsers which correctly apply source image coordinates to
+      // auto-oriented images
+      switch (autoOrientation) {
+        case 2:
+          // Horizontal flip
+          right = options.left
+          left = options.right
+          break
+        case 3:
+          // 180° Rotate CCW
+          top = options.bottom
+          right = options.left
+          bottom = options.top
+          left = options.right
+          break
+        case 4:
+          // Vertical flip
+          top = options.bottom
+          bottom = options.top
+          break
+        case 5:
+          // Horizontal flip + 90° Rotate CCW
+          top = options.left
+          right = options.bottom
+          bottom = options.right
+          left = options.top
+          break
+        case 6:
+          // 90° Rotate CCW
+          top = options.left
+          right = options.top
+          bottom = options.right
+          left = options.bottom
+          break
+        case 7:
+          // Vertical flip + 90° Rotate CCW
+          top = options.right
+          right = options.top
+          bottom = options.left
+          left = options.bottom
+          break
+        case 8:
+          // 90° Rotate CW
+          top = options.right
+          right = options.bottom
+          bottom = options.left
+          left = options.top
+          break
+      }
+      // Some orientation combinations require additional rotation by 180°:
+      if (requiresRot180(orientation, autoOrientation)) {
+        var tmpTop = top
+        var tmpRight = right
+        top = bottom
+        right = left
+        bottom = tmpTop
+        left = tmpRight
+      }
+    }
+    newOptions.top = top
+    newOptions.right = right
+    newOptions.bottom = bottom
+    newOptions.left = left
+    // Account for defined browser orientation:
+    switch (orientation) {
+      case 2:
+        // Horizontal flip
+        newOptions.right = left
+        newOptions.left = right
+        break
+      case 3:
+        // 180° Rotate CCW
+        newOptions.top = bottom
+        newOptions.right = left
+        newOptions.bottom = top
+        newOptions.left = right
+        break
+      case 4:
+        // Vertical flip
+        newOptions.top = bottom
+        newOptions.bottom = top
+        break
+      case 5:
+        // Vertical flip + 90° Rotate CW
+        newOptions.top = left
+        newOptions.right = bottom
+        newOptions.bottom = right
+        newOptions.left = top
+        break
+      case 6:
+        // 90° Rotate CW
+        newOptions.top = right
+        newOptions.right = bottom
+        newOptions.bottom = left
+        newOptions.left = top
+        break
+      case 7:
+        // Horizontal flip + 90° Rotate CW
+        newOptions.top = right
+        newOptions.right = top
+        newOptions.bottom = left
+        newOptions.left = bottom
+        break
+      case 8:
+        // 90° Rotate CCW
+        newOptions.top = left
+        newOptions.right = top
+        newOptions.bottom = right
+        newOptions.left = bottom
+        break
+    }
+    return newOptions
+  }
+
+  // Transform image orientation based on the given EXIF orientation option:
+  loadImage.transformCoordinates = function (canvas, options, data) {
+    originalTransformCoordinates.call(loadImage, canvas, options, data)
+    var orientation = options.orientation
+    var autoOrientation =
+      loadImage.orientation && data.exif && data.exif.get('Orientation')
+    if (!requiresOrientationChange(orientation, autoOrientation)) {
+      return
+    }
+    var ctx = canvas.getContext('2d')
+    var width = canvas.width
+    var height = canvas.height
+    var sourceWidth = width
+    var sourceHeight = height
+    if (
+      (orientation > 4 && !(autoOrientation > 4)) ||
+      (orientation < 5 && autoOrientation > 4)
+    ) {
+      // Image dimensions and target dimensions are switched
+      canvas.width = height
+      canvas.height = width
+    }
+    if (orientation > 4) {
+      // Destination and source dimensions are switched
+      sourceWidth = height
+      sourceHeight = width
+    }
+    // Reset automatic browser orientation:
+    switch (autoOrientation) {
+      case 2:
+        // Horizontal flip
+        ctx.translate(sourceWidth, 0)
+        ctx.scale(-1, 1)
+        break
+      case 3:
+        // 180° Rotate CCW
+        ctx.translate(sourceWidth, sourceHeight)
+        ctx.rotate(Math.PI)
+        break
+      case 4:
+        // Vertical flip
+        ctx.translate(0, sourceHeight)
+        ctx.scale(1, -1)
+        break
+      case 5:
+        // Horizontal flip + 90° Rotate CCW
+        ctx.rotate(-0.5 * Math.PI)
+        ctx.scale(-1, 1)
+        break
+      case 6:
+        // 90° Rotate CCW
+        ctx.rotate(-0.5 * Math.PI)
+        ctx.translate(-sourceWidth, 0)
+        break
+      case 7:
+        // Vertical flip + 90° Rotate CCW
+        ctx.rotate(-0.5 * Math.PI)
+        ctx.translate(-sourceWidth, sourceHeight)
+        ctx.scale(1, -1)
+        break
+      case 8:
+        // 90° Rotate CW
+        ctx.rotate(0.5 * Math.PI)
+        ctx.translate(0, -sourceHeight)
+        break
+    }
+    // Some orientation combinations require additional rotation by 180°:
+    if (requiresRot180(orientation, autoOrientation)) {
+      ctx.translate(sourceWidth, sourceHeight)
+      ctx.rotate(Math.PI)
+    }
+    switch (orientation) {
+      case 2:
+        // Horizontal flip
+        ctx.translate(width, 0)
+        ctx.scale(-1, 1)
+        break
+      case 3:
+        // 180° Rotate CCW
+        ctx.translate(width, height)
+        ctx.rotate(Math.PI)
+        break
+      case 4:
+        // Vertical flip
+        ctx.translate(0, height)
+        ctx.scale(1, -1)
+        break
+      case 5:
+        // Vertical flip + 90° Rotate CW
+        ctx.rotate(0.5 * Math.PI)
+        ctx.scale(1, -1)
+        break
+      case 6:
+        // 90° Rotate CW
+        ctx.rotate(0.5 * Math.PI)
+        ctx.translate(0, -height)
+        break
+      case 7:
+        // Horizontal flip + 90° Rotate CW
+        ctx.rotate(0.5 * Math.PI)
+        ctx.translate(width, -height)
+        ctx.scale(-1, 1)
+        break
+      case 8:
+        // 90° Rotate CCW
+        ctx.rotate(-0.5 * Math.PI)
+        ctx.translate(-width, 0)
+        break
+    }
+  }
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale.js
new file mode 100644
index 0000000000000..80cc5e544fecb
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image-scale.js
@@ -0,0 +1,327 @@
+/*
+ * JavaScript Load Image Scaling
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, require */
+
+;(function (factory) {
+  'use strict'
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define(['jquery/fileUploader/vendor/blueimp-load-image/js/load-image'], factory)
+  } else if (typeof module === 'object' && module.exports) {
+    factory(require('jquery/fileUploader/vendor/blueimp-load-image/js/load-image'))
+  } else {
+    // Browser globals:
+    factory(window.loadImage)
+  }
+})(function (loadImage) {
+  'use strict'
+
+  var originalTransform = loadImage.transform
+
+  loadImage.createCanvas = function (width, height, offscreen) {
+    if (offscreen && loadImage.global.OffscreenCanvas) {
+      return new OffscreenCanvas(width, height)
+    }
+    var canvas = document.createElement('canvas')
+    canvas.width = width
+    canvas.height = height
+    return canvas
+  }
+
+  loadImage.transform = function (img, options, callback, file, data) {
+    originalTransform.call(
+      loadImage,
+      loadImage.scale(img, options, data),
+      options,
+      callback,
+      file,
+      data
+    )
+  }
+
+  // Transform image coordinates, allows to override e.g.
+  // the canvas orientation based on the orientation option,
+  // gets canvas, options and data passed as arguments:
+  loadImage.transformCoordinates = function () {}
+
+  // Returns transformed options, allows to override e.g.
+  // maxWidth, maxHeight and crop options based on the aspectRatio.
+  // gets img, options, data passed as arguments:
+  loadImage.getTransformedOptions = function (img, options) {
+    var aspectRatio = options.aspectRatio
+    var newOptions
+    var i
+    var width
+    var height
+    if (!aspectRatio) {
+      return options
+    }
+    newOptions = {}
+    for (i in options) {
+      if (Object.prototype.hasOwnProperty.call(options, i)) {
+        newOptions[i] = options[i]
+      }
+    }
+    newOptions.crop = true
+    width = img.naturalWidth || img.width
+    height = img.naturalHeight || img.height
+    if (width / height > aspectRatio) {
+      newOptions.maxWidth = height * aspectRatio
+      newOptions.maxHeight = height
+    } else {
+      newOptions.maxWidth = width
+      newOptions.maxHeight = width / aspectRatio
+    }
+    return newOptions
+  }
+
+  // Canvas render method, allows to implement a different rendering algorithm:
+  loadImage.drawImage = function (
+    img,
+    canvas,
+    sourceX,
+    sourceY,
+    sourceWidth,
+    sourceHeight,
+    destWidth,
+    destHeight,
+    options
+  ) {
+    var ctx = canvas.getContext('2d')
+    if (options.imageSmoothingEnabled === false) {
+      ctx.msImageSmoothingEnabled = false
+      ctx.imageSmoothingEnabled = false
+    } else if (options.imageSmoothingQuality) {
+      ctx.imageSmoothingQuality = options.imageSmoothingQuality
+    }
+    ctx.drawImage(
+      img,
+      sourceX,
+      sourceY,
+      sourceWidth,
+      sourceHeight,
+      0,
+      0,
+      destWidth,
+      destHeight
+    )
+    return ctx
+  }
+
+  // Determines if the target image should be a canvas element:
+  loadImage.requiresCanvas = function (options) {
+    return options.canvas || options.crop || !!options.aspectRatio
+  }
+
+  // Scales and/or crops the given image (img or canvas HTML element)
+  // using the given options:
+  loadImage.scale = function (img, options, data) {
+    // eslint-disable-next-line no-param-reassign
+    options = options || {}
+    // eslint-disable-next-line no-param-reassign
+    data = data || {}
+    var useCanvas =
+      img.getContext ||
+      (loadImage.requiresCanvas(options) &&
+        !!loadImage.global.HTMLCanvasElement)
+    var width = img.naturalWidth || img.width
+    var height = img.naturalHeight || img.height
+    var destWidth = width
+    var destHeight = height
+    var maxWidth
+    var maxHeight
+    var minWidth
+    var minHeight
+    var sourceWidth
+    var sourceHeight
+    var sourceX
+    var sourceY
+    var pixelRatio
+    var downsamplingRatio
+    var tmp
+    var canvas
+    /**
+     * Scales up image dimensions
+     */
+    function scaleUp() {
+      var scale = Math.max(
+        (minWidth || destWidth) / destWidth,
+        (minHeight || destHeight) / destHeight
+      )
+      if (scale > 1) {
+        destWidth *= scale
+        destHeight *= scale
+      }
+    }
+    /**
+     * Scales down image dimensions
+     */
+    function scaleDown() {
+      var scale = Math.min(
+        (maxWidth || destWidth) / destWidth,
+        (maxHeight || destHeight) / destHeight
+      )
+      if (scale < 1) {
+        destWidth *= scale
+        destHeight *= scale
+      }
+    }
+    if (useCanvas) {
+      // eslint-disable-next-line no-param-reassign
+      options = loadImage.getTransformedOptions(img, options, data)
+      sourceX = options.left || 0
+      sourceY = options.top || 0
+      if (options.sourceWidth) {
+        sourceWidth = options.sourceWidth
+        if (options.right !== undefined && options.left === undefined) {
+          sourceX = width - sourceWidth - options.right
+        }
+      } else {
+        sourceWidth = width - sourceX - (options.right || 0)
+      }
+      if (options.sourceHeight) {
+        sourceHeight = options.sourceHeight
+        if (options.bottom !== undefined && options.top === undefined) {
+          sourceY = height - sourceHeight - options.bottom
+        }
+      } else {
+        sourceHeight = height - sourceY - (options.bottom || 0)
+      }
+      destWidth = sourceWidth
+      destHeight = sourceHeight
+    }
+    maxWidth = options.maxWidth
+    maxHeight = options.maxHeight
+    minWidth = options.minWidth
+    minHeight = options.minHeight
+    if (useCanvas && maxWidth && maxHeight && options.crop) {
+      destWidth = maxWidth
+      destHeight = maxHeight
+      tmp = sourceWidth / sourceHeight - maxWidth / maxHeight
+      if (tmp < 0) {
+        sourceHeight = (maxHeight * sourceWidth) / maxWidth
+        if (options.top === undefined && options.bottom === undefined) {
+          sourceY = (height - sourceHeight) / 2
+        }
+      } else if (tmp > 0) {
+        sourceWidth = (maxWidth * sourceHeight) / maxHeight
+        if (options.left === undefined && options.right === undefined) {
+          sourceX = (width - sourceWidth) / 2
+        }
+      }
+    } else {
+      if (options.contain || options.cover) {
+        minWidth = maxWidth = maxWidth || minWidth
+        minHeight = maxHeight = maxHeight || minHeight
+      }
+      if (options.cover) {
+        scaleDown()
+        scaleUp()
+      } else {
+        scaleUp()
+        scaleDown()
+      }
+    }
+    if (useCanvas) {
+      pixelRatio = options.pixelRatio
+      if (
+        pixelRatio > 1 &&
+        // Check if the image has not yet had the device pixel ratio applied:
+        !(
+          img.style.width &&
+          Math.floor(parseFloat(img.style.width, 10)) ===
+            Math.floor(width / pixelRatio)
+        )
+      ) {
+        destWidth *= pixelRatio
+        destHeight *= pixelRatio
+      }
+      // Check if workaround for Chromium orientation crop bug is required:
+      // https://bugs.chromium.org/p/chromium/issues/detail?id=1074354
+      if (
+        loadImage.orientationCropBug &&
+        !img.getContext &&
+        (sourceX || sourceY || sourceWidth !== width || sourceHeight !== height)
+      ) {
+        // Write the complete source image to an intermediate canvas first:
+        tmp = img
+        // eslint-disable-next-line no-param-reassign
+        img = loadImage.createCanvas(width, height, true)
+        loadImage.drawImage(
+          tmp,
+          img,
+          0,
+          0,
+          width,
+          height,
+          width,
+          height,
+          options
+        )
+      }
+      downsamplingRatio = options.downsamplingRatio
+      if (
+        downsamplingRatio > 0 &&
+        downsamplingRatio < 1 &&
+        destWidth < sourceWidth &&
+        destHeight < sourceHeight
+      ) {
+        while (sourceWidth * downsamplingRatio > destWidth) {
+          canvas = loadImage.createCanvas(
+            sourceWidth * downsamplingRatio,
+            sourceHeight * downsamplingRatio,
+            true
+          )
+          loadImage.drawImage(
+            img,
+            canvas,
+            sourceX,
+            sourceY,
+            sourceWidth,
+            sourceHeight,
+            canvas.width,
+            canvas.height,
+            options
+          )
+          sourceX = 0
+          sourceY = 0
+          sourceWidth = canvas.width
+          sourceHeight = canvas.height
+          // eslint-disable-next-line no-param-reassign
+          img = canvas
+        }
+      }
+      canvas = loadImage.createCanvas(destWidth, destHeight)
+      loadImage.transformCoordinates(canvas, options, data)
+      if (pixelRatio > 1) {
+        canvas.style.width = canvas.width / pixelRatio + 'px'
+      }
+      loadImage
+        .drawImage(
+          img,
+          canvas,
+          sourceX,
+          sourceY,
+          sourceWidth,
+          sourceHeight,
+          destWidth,
+          destHeight,
+          options
+        )
+        .setTransform(1, 0, 0, 1, 0, 0) // reset to the identity matrix
+      return canvas
+    }
+    img.width = destWidth
+    img.height = destHeight
+    return img
+  }
+})
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js
new file mode 100644
index 0000000000000..8651c3489378a
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js
@@ -0,0 +1,2 @@
+!function(c){"use strict";var t=c.URL||c.webkitURL;function f(e){return!!t&&t.createObjectURL(e)}function i(e){return!!t&&t.revokeObjectURL(e)}function u(e,t){!e||"blob:"!==e.slice(0,5)||t&&t.noRevoke||i(e)}function d(e,t,i,a){if(!c.FileReader)return!1;var n=new FileReader;n.onload=function(){t.call(n,this.result)},i&&(n.onabort=n.onerror=function(){i.call(n,this.error)});var r=n[a||"readAsDataURL"];return r?(r.call(n,e),n):void 0}function g(e,t){return Object.prototype.toString.call(t)==="[object "+e+"]"}function m(s,e,l){function t(i,a){var n,r=document.createElement("img");function o(e,t){i!==a?e instanceof Error?a(e):((t=t||{}).image=e,i(t)):i&&i(e,t)}function e(e,t){t&&c.console&&console.log(t),e&&g("Blob",e)?n=f(s=e):(n=s,l&&l.crossOrigin&&(r.crossOrigin=l.crossOrigin)),r.src=n}return r.onerror=function(e){u(n,l),a&&a.call(r,e)},r.onload=function(){u(n,l);var e={originalWidth:r.naturalWidth||r.width,originalHeight:r.naturalHeight||r.height};try{m.transform(r,l,o,s,e)}catch(t){a&&a(t)}},"string"==typeof s?(m.requiresMetaData(l)?m.fetchBlob(s,e,l):e(),r):g("Blob",s)||g("File",s)?(n=f(s))?(r.src=n,r):d(s,function(e){r.src=e},a):void 0}return c.Promise&&"function"!=typeof e?(l=e,new Promise(t)):t(e,e)}m.requiresMetaData=function(e){return e&&e.meta},m.fetchBlob=function(e,t){t()},m.transform=function(e,t,i,a,n){i(e,n)},m.global=c,m.readFile=d,m.isInstanceOf=g,m.createObjectURL=f,m.revokeObjectURL=i,"function"==typeof define&&define.amd?define(function(){return m}):"object"==typeof module&&module.exports?module.exports=m:c.loadImage=m}("undefined"!=typeof window&&window||this),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):"object"==typeof module&&module.exports?e(require("./load-image")):e(window.loadImage)}(function(E){"use strict";var r=E.transform;E.createCanvas=function(e,t,i){if(i&&E.global.OffscreenCanvas)return new OffscreenCanvas(e,t);var a=document.createElement("canvas");return a.width=e,a.height=t,a},E.transform=function(e,t,i,a,n){r.call(E,E.scale(e,t,n),t,i,a,n)},E.transformCoordinates=function(){},E.getTransformedOptions=function(e,t){var i,a,n,r,o=t.aspectRatio;if(!o)return t;for(a in i={},t)Object.prototype.hasOwnProperty.call(t,a)&&(i[a]=t[a]);return i.crop=!0,o<(n=e.naturalWidth||e.width)/(r=e.naturalHeight||e.height)?(i.maxWidth=r*o,i.maxHeight=r):(i.maxWidth=n,i.maxHeight=n/o),i},E.drawImage=function(e,t,i,a,n,r,o,s,l){var c=t.getContext("2d");return!1===l.imageSmoothingEnabled?(c.msImageSmoothingEnabled=!1,c.imageSmoothingEnabled=!1):l.imageSmoothingQuality&&(c.imageSmoothingQuality=l.imageSmoothingQuality),c.drawImage(e,i,a,n,r,0,0,o,s),c},E.requiresCanvas=function(e){return e.canvas||e.crop||!!e.aspectRatio},E.scale=function(e,t,i){t=t||{},i=i||{};var a,n,r,o,s,l,c,f,u,d,g,m,h=e.getContext||E.requiresCanvas(t)&&!!E.global.HTMLCanvasElement,p=e.naturalWidth||e.width,A=e.naturalHeight||e.height,b=p,y=A;function S(){var e=Math.max((r||b)/b,(o||y)/y);1<e&&(b*=e,y*=e)}function v(){var e=Math.min((a||b)/b,(n||y)/y);e<1&&(b*=e,y*=e)}if(h&&(c=(t=E.getTransformedOptions(e,t,i)).left||0,f=t.top||0,t.sourceWidth?(s=t.sourceWidth,t.right!==undefined&&t.left===undefined&&(c=p-s-t.right)):s=p-c-(t.right||0),t.sourceHeight?(l=t.sourceHeight,t.bottom!==undefined&&t.top===undefined&&(f=A-l-t.bottom)):l=A-f-(t.bottom||0),b=s,y=l),a=t.maxWidth,n=t.maxHeight,r=t.minWidth,o=t.minHeight,h&&a&&n&&t.crop?(g=s/l-(b=a)/(y=n))<0?(l=n*s/a,t.top===undefined&&t.bottom===undefined&&(f=(A-l)/2)):0<g&&(s=a*l/n,t.left===undefined&&t.right===undefined&&(c=(p-s)/2)):((t.contain||t.cover)&&(r=a=a||r,o=n=n||o),t.cover?(v(),S()):(S(),v())),h){if(1<(u=t.pixelRatio)&&(!e.style.width||Math.floor(parseFloat(e.style.width,10))!==Math.floor(p/u))&&(b*=u,y*=u),E.orientationCropBug&&!e.getContext&&(c||f||s!==p||l!==A)&&(g=e,e=E.createCanvas(p,A,!0),E.drawImage(g,e,0,0,p,A,p,A,t)),0<(d=t.downsamplingRatio)&&d<1&&b<s&&y<l)for(;b<s*d;)m=E.createCanvas(s*d,l*d,!0),E.drawImage(e,m,c,f,s,l,m.width,m.height,t),f=c=0,s=m.width,l=m.height,e=m;return m=E.createCanvas(b,y),E.transformCoordinates(m,t,i),1<u&&(m.style.width=m.width/u+"px"),E.drawImage(e,m,c,f,s,l,b,y,t).setTransform(1,0,0,1,0,0),m}return e.width=b,e.height=y,e}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):"object"==typeof module&&module.exports?e(require("./load-image")):e(window.loadImage)}(function(o){"use strict";var s=o.global,l=o.transform,a=s.Blob&&(Blob.prototype.slice||Blob.prototype.webkitSlice||Blob.prototype.mozSlice),m=s.ArrayBuffer&&ArrayBuffer.prototype.slice||function(e,t){t=t||this.byteLength-e;var i=new Uint8Array(this,e,t),a=new Uint8Array(t);return a.set(i),a.buffer},h={jpeg:{65505:[],65517:[]}};function c(t,e,u,d){var g=this;function i(c,f){if(!(s.DataView&&a&&t&&12<=t.size&&"image/jpeg"===t.type))return c(d);var e=u.maxMetaDataSize||262144;o.readFile(a.call(t,0,e),function(e){var t=new DataView(e);if(65496!==t.getUint16(0))return f(new Error("Invalid JPEG file: Missing JPEG marker."));for(var i,a,n,r,o=2,s=t.byteLength-4,l=o;o<s&&(65504<=(i=t.getUint16(o))&&i<=65519||65534===i);){if(o+(a=t.getUint16(o+2)+2)>t.byteLength){console.log("Invalid JPEG metadata: Invalid segment size.");break}if((n=h.jpeg[i])&&!u.disableMetaDataParsers)for(r=0;r<n.length;r+=1)n[r].call(g,t,o,a,d,u);l=o+=a}!u.disableImageHead&&6<l&&(d.imageHead=m.call(e,0,l)),c(d)},f,"readAsArrayBuffer")||c(d)}return u=u||{},s.Promise&&"function"!=typeof e?(d=u=e||{},new Promise(i)):(d=d||{},i(e,e))}function n(e,t,i){return e&&t&&i?new Blob([i,a.call(e,t.byteLength)],{type:"image/jpeg"}):null}o.transform=function(t,i,a,n,r){o.requiresMetaData(i)?c(n,function(e){e!==r&&(s.console&&console.log(e),e=r),l.call(o,t,i,a,n,e)},i,r=r||{}):l.apply(o,arguments)},o.blobSlice=a,o.bufferSlice=m,o.replaceHead=function(t,i,a){var e={maxMetaDataSize:256,disableMetaDataParsers:!0};if(!a&&s.Promise)return c(t,e).then(function(e){return n(t,e.imageHead,i)});c(t,function(e){a(n(t,e.imageHead,i))},e)},o.parseMetaData=c,o.metaDataParsers=h}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):"object"==typeof module&&module.exports?e(require("./load-image")):e(window.loadImage)}(function(e){"use strict";var r=e.global;r.fetch&&r.Request&&r.Response&&r.Response.prototype.blob?e.fetchBlob=function(e,t,i){function a(e){return e.blob()}if(r.Promise&&"function"!=typeof t)return fetch(new Request(e,t)).then(a);fetch(new Request(e,i)).then(a).then(t)["catch"](function(e){t(null,e)})}:r.XMLHttpRequest&&""===(new XMLHttpRequest).responseType&&(e.fetchBlob=function(e,t,n){function i(t,i){n=n||{};var a=new XMLHttpRequest;a.open(n.method||"GET",e),n.headers&&Object.keys(n.headers).forEach(function(e){a.setRequestHeader(e,n.headers[e])}),a.withCredentials="include"===n.credentials,a.responseType="blob",a.onload=function(){t(a.response)},a.onerror=a.onabort=a.ontimeout=function(e){t===i?i(null,e):i(e)},a.send(n.body)}return r.Promise&&"function"!=typeof t?(n=t,new Promise(i)):i(t,t)})}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-scale","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-scale"),require("./load-image-meta")):e(window.loadImage)}(function(h){"use strict";var t,i,n=h.transform,a=h.requiresCanvas,r=h.requiresMetaData,f=h.transformCoordinates,p=h.getTransformedOptions;function o(e,t){var i=e&&e.orientation;return!0===i&&!h.orientation||1===i&&h.orientation||(!t||h.orientation)&&1<i&&i<9}function A(e,t){return e!==t&&(1===e&&1<t&&t<9||1<e&&e<9)}function b(e,t){if(1<t&&t<9)switch(e){case 2:case 4:return 4<t;case 5:case 7:return t%2==0;case 6:case 8:return 2===t||4===t||5===t||7===t}}(t=h).global.document&&((i=document.createElement("img")).onload=function(){var e;t.orientation=2===i.width&&3===i.height,t.orientation&&((e=t.createCanvas(1,1,!0).getContext("2d")).drawImage(i,1,1,1,1,0,0,1,1),t.orientationCropBug="255,255,255,255"!==e.getImageData(0,0,1,1).data.toString())},i.src="data:image/jpeg;base64,/9j/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAYAAAAAAAD/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAIAAwMBEQACEQEDEQH/xABRAAEAAAAAAAAAAAAAAAAAAAAKEAEBAQADAQEAAAAAAAAAAAAGBQQDCAkCBwEBAAAAAAAAAAAAAAAAAAAAABEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AG8T9NfSMEVMhQvoP3fFiRZ+MTHDifa/95OFSZU5OzRzxkyejv8ciEfhSceSXGjS8eSdLnZc2HDm4M3BxcXwH/9k="),h.requiresCanvas=function(e){return o(e)||a.call(h,e)},h.requiresMetaData=function(e){return o(e,!0)||r.call(h,e)},h.transform=function(e,t,r,i,a){n.call(h,e,t,function(e,t){var i,a,n;!t||4<(i=h.orientation&&t.exif&&t.exif.get("Orientation"))&&i<9&&(a=t.originalWidth,n=t.originalHeight,t.originalWidth=n,t.originalHeight=a),r(e,t)},i,a)},h.getTransformedOptions=function(e,t,i){var a=p.call(h,e,t),n=i.exif&&i.exif.get("Orientation"),r=a.orientation,o=h.orientation&&n;if(!0===r&&(r=n),!A(r,o))return a;var s,l,c=a.top,f=a.right,u=a.bottom,d=a.left,g={};for(var m in a)Object.prototype.hasOwnProperty.call(a,m)&&(g[m]=a[m]);if((4<(g.orientation=r)&&!(4<o)||r<5&&4<o)&&(g.maxWidth=a.maxHeight,g.maxHeight=a.maxWidth,g.minWidth=a.minHeight,g.minHeight=a.minWidth,g.sourceWidth=a.sourceHeight,g.sourceHeight=a.sourceWidth),1<o){switch(o){case 2:f=a.left,d=a.right;break;case 3:c=a.bottom,f=a.left,u=a.top,d=a.right;break;case 4:c=a.bottom,u=a.top;break;case 5:c=a.left,f=a.bottom,u=a.right,d=a.top;break;case 6:c=a.left,f=a.top,u=a.right,d=a.bottom;break;case 7:c=a.right,f=a.top,u=a.left,d=a.bottom;break;case 8:c=a.right,f=a.bottom,u=a.left,d=a.top}b(r,o)&&(s=c,l=f,c=u,f=d,u=s,d=l)}switch(g.top=c,g.right=f,g.bottom=u,g.left=d,r){case 2:g.right=d,g.left=f;break;case 3:g.top=u,g.right=d,g.bottom=c,g.left=f;break;case 4:g.top=u,g.bottom=c;break;case 5:g.top=d,g.right=u,g.bottom=f,g.left=c;break;case 6:g.top=f,g.right=u,g.bottom=d,g.left=c;break;case 7:g.top=f,g.right=c,g.bottom=d,g.left=u;break;case 8:g.top=d,g.right=c,g.bottom=f,g.left=u}return g},h.transformCoordinates=function(e,t,i){f.call(h,e,t,i);var a=t.orientation,n=h.orientation&&i.exif&&i.exif.get("Orientation");if(A(a,n)){var r=e.getContext("2d"),o=e.width,s=e.height,l=o,c=s;switch((4<a&&!(4<n)||a<5&&4<n)&&(e.width=s,e.height=o),4<a&&(l=s,c=o),n){case 2:r.translate(l,0),r.scale(-1,1);break;case 3:r.translate(l,c),r.rotate(Math.PI);break;case 4:r.translate(0,c),r.scale(1,-1);break;case 5:r.rotate(-.5*Math.PI),r.scale(-1,1);break;case 6:r.rotate(-.5*Math.PI),r.translate(-l,0);break;case 7:r.rotate(-.5*Math.PI),r.translate(-l,c),r.scale(1,-1);break;case 8:r.rotate(.5*Math.PI),r.translate(0,-c)}switch(b(a,n)&&(r.translate(l,c),r.rotate(Math.PI)),a){case 2:r.translate(o,0),r.scale(-1,1);break;case 3:r.translate(o,s),r.rotate(Math.PI);break;case 4:r.translate(0,s),r.scale(1,-1);break;case 5:r.rotate(.5*Math.PI),r.scale(1,-1);break;case 6:r.rotate(.5*Math.PI),r.translate(0,-s);break;case 7:r.rotate(.5*Math.PI),r.translate(o,-s),r.scale(-1,1);break;case 8:r.rotate(-.5*Math.PI),r.translate(-o,0)}}}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(r){"use strict";function h(e){e&&(Object.defineProperty(this,"map",{value:this.ifds[e].map}),Object.defineProperty(this,"tags",{value:this.tags&&this.tags[e]||{}}))}h.prototype.ifds={ifd1:{name:"Thumbnail",map:h.prototype.map={Orientation:274,Thumbnail:"ifd1",Blob:513,Exif:34665,GPSInfo:34853,Interoperability:40965}},34665:{name:"Exif",map:{}},34853:{name:"GPSInfo",map:{}},40965:{name:"Interoperability",map:{}}},h.prototype.get=function(e){return this[e]||this[this.map[e]]};var m={1:{getValue:function(e,t){return e.getUint8(t)},size:1},2:{getValue:function(e,t){return String.fromCharCode(e.getUint8(t))},size:1,ascii:!0},3:{getValue:function(e,t,i){return e.getUint16(t,i)},size:2},4:{getValue:function(e,t,i){return e.getUint32(t,i)},size:4},5:{getValue:function(e,t,i){return e.getUint32(t,i)/e.getUint32(t+4,i)},size:8},9:{getValue:function(e,t,i){return e.getInt32(t,i)},size:4},10:{getValue:function(e,t,i){return e.getInt32(t,i)/e.getInt32(t+4,i)},size:8}};function p(e,t,i){return(!e||e[i])&&(!t||!0!==t[i])}function A(e,t,i,a,n,r,o,s){var l,c,f,u,d,g;if(i+6>e.byteLength)console.log("Invalid Exif data: Invalid directory offset.");else{if(!((c=i+2+12*(l=e.getUint16(i,a)))+4>e.byteLength)){for(f=0;f<l;f+=1)u=i+2+12*f,p(o,s,d=e.getUint16(u,a))&&(g=function(e,t,i,a,n,r){var o,s,l,c,f,u,d=m[a];if(d){if(!((s=4<(o=d.size*n)?t+e.getUint32(i+8,r):i+8)+o>e.byteLength)){if(1===n)return d.getValue(e,s,r);for(l=[],c=0;c<n;c+=1)l[c]=d.getValue(e,s+c*d.size,r);if(d.ascii){for(f="",c=0;c<l.length&&"\0"!==(u=l[c]);c+=1)f+=u;return f}return l}console.log("Invalid Exif data: Invalid data offset.")}else console.log("Invalid Exif data: Invalid tag type.")}(e,t,u,e.getUint16(u+2,a),e.getUint32(u+4,a),a),n[d]=g,r&&(r[d]=u));return e.getUint32(c,a)}console.log("Invalid Exif data: Invalid directory size.")}}m[7]=m[1],r.parseExifData=function(c,e,t,f,i){if(!i.disableExif){var u,a,n,d=i.includeExifTags,g=i.excludeExifTags||{34665:{37500:!0}},m=e+10;if(1165519206===c.getUint32(e+4))if(m+8>c.byteLength)console.log("Invalid Exif data: Invalid segment size.");else if(0===c.getUint16(e+8)){switch(c.getUint16(m)){case 18761:u=!0;break;case 19789:u=!1;break;default:return void console.log("Invalid Exif data: Invalid byte alignment marker.")}42===c.getUint16(m+2,u)?(a=c.getUint32(m+4,u),f.exif=new h,i.disableExifOffsets||(f.exifOffsets=new h,f.exifTiffOffset=m,f.exifLittleEndian=u),(a=A(c,m,m+a,u,f.exif,f.exifOffsets,d,g))&&p(d,g,"ifd1")&&(f.exif.ifd1=a,f.exifOffsets&&(f.exifOffsets.ifd1=m+a)),Object.keys(f.exif.ifds).forEach(function(e){var t,i,a,n,r,o,s,l;i=e,a=c,n=m,r=u,o=d,s=g,(l=(t=f).exif[i])&&(t.exif[i]=new h(i),t.exifOffsets&&(t.exifOffsets[i]=new h(i)),A(a,n,n+l,r,t.exif[i],t.exifOffsets&&t.exifOffsets[i],o&&o[i],s&&s[i]))}),(n=f.exif.ifd1)&&n[513]&&(n[513]=function(e,t,i){if(i){if(!(t+i>e.byteLength))return new Blob([r.bufferSlice.call(e.buffer,t,t+i)],{type:"image/jpeg"});console.log("Invalid Exif data: Invalid thumbnail data.")}}(c,m+n[513],n[514]))):console.log("Invalid Exif data: Missing TIFF marker.")}else console.log("Invalid Exif data: Missing byte alignment offset.")}},r.metaDataParsers.jpeg[65505].push(r.parseExifData),r.exifWriters={274:function(e,t,i){var a=t.exifOffsets[274];return a&&new DataView(e,a+8,2).setUint16(0,i,t.exifLittleEndian),e}},r.writeExifData=function(e,t,i,a){r.exifWriters[t.exif.map[i]](e,t,a)},r.ExifMap=h}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-exif"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-exif")):e(window.loadImage)}(function(e){"use strict";var n=e.ExifMap.prototype;n.tags={256:"ImageWidth",257:"ImageHeight",258:"BitsPerSample",259:"Compression",262:"PhotometricInterpretation",274:"Orientation",277:"SamplesPerPixel",284:"PlanarConfiguration",530:"YCbCrSubSampling",531:"YCbCrPositioning",282:"XResolution",283:"YResolution",296:"ResolutionUnit",273:"StripOffsets",278:"RowsPerStrip",279:"StripByteCounts",513:"JPEGInterchangeFormat",514:"JPEGInterchangeFormatLength",301:"TransferFunction",318:"WhitePoint",319:"PrimaryChromaticities",529:"YCbCrCoefficients",532:"ReferenceBlackWhite",306:"DateTime",270:"ImageDescription",271:"Make",272:"Model",305:"Software",315:"Artist",33432:"Copyright",34665:{36864:"ExifVersion",40960:"FlashpixVersion",40961:"ColorSpace",40962:"PixelXDimension",40963:"PixelYDimension",42240:"Gamma",37121:"ComponentsConfiguration",37122:"CompressedBitsPerPixel",37500:"MakerNote",37510:"UserComment",40964:"RelatedSoundFile",36867:"DateTimeOriginal",36868:"DateTimeDigitized",36880:"OffsetTime",36881:"OffsetTimeOriginal",36882:"OffsetTimeDigitized",37520:"SubSecTime",37521:"SubSecTimeOriginal",37522:"SubSecTimeDigitized",33434:"ExposureTime",33437:"FNumber",34850:"ExposureProgram",34852:"SpectralSensitivity",34855:"PhotographicSensitivity",34856:"OECF",34864:"SensitivityType",34865:"StandardOutputSensitivity",34866:"RecommendedExposureIndex",34867:"ISOSpeed",34868:"ISOSpeedLatitudeyyy",34869:"ISOSpeedLatitudezzz",37377:"ShutterSpeedValue",37378:"ApertureValue",37379:"BrightnessValue",37380:"ExposureBias",37381:"MaxApertureValue",37382:"SubjectDistance",37383:"MeteringMode",37384:"LightSource",37385:"Flash",37396:"SubjectArea",37386:"FocalLength",41483:"FlashEnergy",41484:"SpatialFrequencyResponse",41486:"FocalPlaneXResolution",41487:"FocalPlaneYResolution",41488:"FocalPlaneResolutionUnit",41492:"SubjectLocation",41493:"ExposureIndex",41495:"SensingMethod",41728:"FileSource",41729:"SceneType",41730:"CFAPattern",41985:"CustomRendered",41986:"ExposureMode",41987:"WhiteBalance",41988:"DigitalZoomRatio",41989:"FocalLengthIn35mmFilm",41990:"SceneCaptureType",41991:"GainControl",41992:"Contrast",41993:"Saturation",41994:"Sharpness",41995:"DeviceSettingDescription",41996:"SubjectDistanceRange",42016:"ImageUniqueID",42032:"CameraOwnerName",42033:"BodySerialNumber",42034:"LensSpecification",42035:"LensMake",42036:"LensModel",42037:"LensSerialNumber"},34853:{0:"GPSVersionID",1:"GPSLatitudeRef",2:"GPSLatitude",3:"GPSLongitudeRef",4:"GPSLongitude",5:"GPSAltitudeRef",6:"GPSAltitude",7:"GPSTimeStamp",8:"GPSSatellites",9:"GPSStatus",10:"GPSMeasureMode",11:"GPSDOP",12:"GPSSpeedRef",13:"GPSSpeed",14:"GPSTrackRef",15:"GPSTrack",16:"GPSImgDirectionRef",17:"GPSImgDirection",18:"GPSMapDatum",19:"GPSDestLatitudeRef",20:"GPSDestLatitude",21:"GPSDestLongitudeRef",22:"GPSDestLongitude",23:"GPSDestBearingRef",24:"GPSDestBearing",25:"GPSDestDistanceRef",26:"GPSDestDistance",27:"GPSProcessingMethod",28:"GPSAreaInformation",29:"GPSDateStamp",30:"GPSDifferential",31:"GPSHPositioningError"},40965:{1:"InteroperabilityIndex"}},n.tags.ifd1=n.tags,n.stringValues={ExposureProgram:{0:"Undefined",1:"Manual",2:"Normal program",3:"Aperture priority",4:"Shutter priority",5:"Creative program",6:"Action program",7:"Portrait mode",8:"Landscape mode"},MeteringMode:{0:"Unknown",1:"Average",2:"CenterWeightedAverage",3:"Spot",4:"MultiSpot",5:"Pattern",6:"Partial",255:"Other"},LightSource:{0:"Unknown",1:"Daylight",2:"Fluorescent",3:"Tungsten (incandescent light)",4:"Flash",9:"Fine weather",10:"Cloudy weather",11:"Shade",12:"Daylight fluorescent (D 5700 - 7100K)",13:"Day white fluorescent (N 4600 - 5400K)",14:"Cool white fluorescent (W 3900 - 4500K)",15:"White fluorescent (WW 3200 - 3700K)",17:"Standard light A",18:"Standard light B",19:"Standard light C",20:"D55",21:"D65",22:"D75",23:"D50",24:"ISO studio tungsten",255:"Other"},Flash:{0:"Flash did not fire",1:"Flash fired",5:"Strobe return light not detected",7:"Strobe return light detected",9:"Flash fired, compulsory flash mode",13:"Flash fired, compulsory flash mode, return light not detected",15:"Flash fired, compulsory flash mode, return light detected",16:"Flash did not fire, compulsory flash mode",24:"Flash did not fire, auto mode",25:"Flash fired, auto mode",29:"Flash fired, auto mode, return light not detected",31:"Flash fired, auto mode, return light detected",32:"No flash function",65:"Flash fired, red-eye reduction mode",69:"Flash fired, red-eye reduction mode, return light not detected",71:"Flash fired, red-eye reduction mode, return light detected",73:"Flash fired, compulsory flash mode, red-eye reduction mode",77:"Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",79:"Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",89:"Flash fired, auto mode, red-eye reduction mode",93:"Flash fired, auto mode, return light not detected, red-eye reduction mode",95:"Flash fired, auto mode, return light detected, red-eye reduction mode"},SensingMethod:{1:"Undefined",2:"One-chip color area sensor",3:"Two-chip color area sensor",4:"Three-chip color area sensor",5:"Color sequential area sensor",7:"Trilinear sensor",8:"Color sequential linear sensor"},SceneCaptureType:{0:"Standard",1:"Landscape",2:"Portrait",3:"Night scene"},SceneType:{1:"Directly photographed"},CustomRendered:{0:"Normal process",1:"Custom process"},WhiteBalance:{0:"Auto white balance",1:"Manual white balance"},GainControl:{0:"None",1:"Low gain up",2:"High gain up",3:"Low gain down",4:"High gain down"},Contrast:{0:"Normal",1:"Soft",2:"Hard"},Saturation:{0:"Normal",1:"Low saturation",2:"High saturation"},Sharpness:{0:"Normal",1:"Soft",2:"Hard"},SubjectDistanceRange:{0:"Unknown",1:"Macro",2:"Close view",3:"Distant view"},FileSource:{3:"DSC"},ComponentsConfiguration:{0:"",1:"Y",2:"Cb",3:"Cr",4:"R",5:"G",6:"B"},Orientation:{1:"Original",2:"Horizontal flip",3:"Rotate 180° CCW",4:"Vertical flip",5:"Vertical flip + Rotate 90° CW",6:"Rotate 90° CW",7:"Horizontal flip + Rotate 90° CW",8:"Rotate 90° CCW"}},n.getText=function(e){var t=this.get(e);switch(e){case"LightSource":case"Flash":case"MeteringMode":case"ExposureProgram":case"SensingMethod":case"SceneCaptureType":case"SceneType":case"CustomRendered":case"WhiteBalance":case"GainControl":case"Contrast":case"Saturation":case"Sharpness":case"SubjectDistanceRange":case"FileSource":case"Orientation":return this.stringValues[e][t];case"ExifVersion":case"FlashpixVersion":if(!t)return;return String.fromCharCode(t[0],t[1],t[2],t[3]);case"ComponentsConfiguration":if(!t)return;return this.stringValues[e][t[0]]+this.stringValues[e][t[1]]+this.stringValues[e][t[2]]+this.stringValues[e][t[3]];case"GPSVersionID":if(!t)return;return t[0]+"."+t[1]+"."+t[2]+"."+t[3]}return String(t)},n.getAll=function(){var e,t,i,a={};for(e in this)Object.prototype.hasOwnProperty.call(this,e)&&((t=this[e])&&t.getAll?a[this.ifds[e].name]=t.getAll():(i=this.tags[e])&&(a[i]=this.getText(i)));return a},n.getName=function(e){var t=this.tags[e];return"object"==typeof t?this.ifds[e].name:t},function(){var e,t,i,a=n.tags;for(e in a)if(Object.prototype.hasOwnProperty.call(a,e))if(t=n.ifds[e])for(e in i=a[e])Object.prototype.hasOwnProperty.call(i,e)&&(t.map[i[e]]=Number(e));else n.map[a[e]]=Number(e)}()}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(e){"use strict";function g(){}function m(e,t,i,a,n){return"binary"===t.types[e]?new Blob([i.buffer.slice(a,a+n)]):"Uint16"===t.types[e]?i.getUint16(a):function(e,t,i){for(var a="",n=t+i,r=t;r<n;r+=1)a+=String.fromCharCode(e.getUint8(r));return a}(i,a,n)}function h(e,t,i,a,n,r){for(var o,s,l,c,f,u=t+i,d=t;d<u;)28===e.getUint8(d)&&2===e.getUint8(d+1)&&(l=e.getUint8(d+2),n&&!n[l]||r&&r[l]||(s=e.getInt16(d+3),o=m(l,a.iptc,e,d+5,s),a.iptc[l]=(c=a.iptc[l],f=o,c===undefined?f:c instanceof Array?(c.push(f),c):[c,f]),a.iptcOffsets&&(a.iptcOffsets[l]=d))),d+=1}g.prototype.map={ObjectName:5},g.prototype.types={0:"Uint16",200:"Uint16",201:"Uint16",202:"binary"},g.prototype.get=function(e){return this[e]||this[this.map[e]]},e.parseIptcData=function(e,t,i,a,n){if(!n.disableIptc)for(var r,o,s,l,c=t+i;t+8<c;){if(l=t,943868237===(s=e).getUint32(l)&&1028===s.getUint16(l+4)){var f=(r=t,o=void 0,(o=e.getUint8(r+7))%2!=0&&(o+=1),0===o&&(o=4),o),u=t+8+f;if(c<u){console.log("Invalid IPTC data: Invalid segment offset.");break}var d=e.getUint16(t+6+f);if(c<t+d){console.log("Invalid IPTC data: Invalid segment size.");break}return a.iptc=new g,n.disableIptcOffsets||(a.iptcOffsets=new g),void h(e,u,d,a,n.includeIptcTags,n.excludeIptcTags||{202:!0})}t+=1}},e.metaDataParsers.jpeg[65517].push(e.parseIptcData),e.IptcMap=g}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-iptc"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-iptc")):e(window.loadImage)}(function(e){"use strict";var a=e.IptcMap.prototype;a.tags={0:"ApplicationRecordVersion",3:"ObjectTypeReference",4:"ObjectAttributeReference",5:"ObjectName",7:"EditStatus",8:"EditorialUpdate",10:"Urgency",12:"SubjectReference",15:"Category",20:"SupplementalCategories",22:"FixtureIdentifier",25:"Keywords",26:"ContentLocationCode",27:"ContentLocationName",30:"ReleaseDate",35:"ReleaseTime",37:"ExpirationDate",38:"ExpirationTime",40:"SpecialInstructions",42:"ActionAdvised",45:"ReferenceService",47:"ReferenceDate",50:"ReferenceNumber",55:"DateCreated",60:"TimeCreated",62:"DigitalCreationDate",63:"DigitalCreationTime",65:"OriginatingProgram",70:"ProgramVersion",75:"ObjectCycle",80:"Byline",85:"BylineTitle",90:"City",92:"Sublocation",95:"State",100:"CountryCode",101:"Country",103:"OriginalTransmissionReference",105:"Headline",110:"Credit",115:"Source",116:"CopyrightNotice",118:"Contact",120:"Caption",121:"LocalCaption",122:"Writer",125:"RasterizedCaption",130:"ImageType",131:"ImageOrientation",135:"LanguageIdentifier",150:"AudioType",151:"AudioSamplingRate",152:"AudioSamplingResolution",153:"AudioDuration",154:"AudioOutcue",184:"JobID",185:"MasterDocumentID",186:"ShortDocumentID",187:"UniqueDocumentID",188:"OwnerID",200:"ObjectPreviewFileFormat",201:"ObjectPreviewFileVersion",202:"ObjectPreviewData",221:"Prefs",225:"ClassifyState",228:"SimilarityIndex",230:"DocumentNotes",231:"DocumentHistory",232:"ExifCameraInfo",255:"CatalogSets"},a.stringValues={10:{0:"0 (reserved)",1:"1 (most urgent)",2:"2",3:"3",4:"4",5:"5 (normal urgency)",6:"6",7:"7",8:"8 (least urgent)",9:"9 (user-defined priority)"},75:{a:"Morning",b:"Both Morning and Evening",p:"Evening"},131:{L:"Landscape",P:"Portrait",S:"Square"}},a.getText=function(e){var t=this.get(e),i=this.map[e],a=this.stringValues[i];return a?a[t]:String(t)},a.getAll=function(){var e,t,i={};for(e in this)Object.prototype.hasOwnProperty.call(this,e)&&(t=this.tags[e])&&(i[t]=this.getText(t));return i},a.getName=function(e){return this.tags[e]},function(){var e,t=a.tags,i=a.map||{};for(e in t)Object.prototype.hasOwnProperty.call(t,e)&&(i[t[e]]=Number(e))}()});
+//# sourceMappingURL=load-image.all.min.js.map
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map
new file mode 100644
index 0000000000000..1d6d990b2c58c
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["load-image.js","load-image-scale.js","load-image-meta.js","load-image-fetch.js","load-image-orientation.js","load-image-exif.js","load-image-exif-map.js","load-image-iptc.js","load-image-iptc-map.js"],"names":["$","urlAPI","URL","webkitURL","createObjectURL","blob","revokeObjectURL","url","revokeHelper","options","slice","noRevoke","readFile","file","onload","onerror","method","FileReader","reader","call","this","result","onabort","error","readerMethod","isInstanceOf","type","obj","Object","prototype","toString","loadImage","callback","executor","resolve","reject","img","document","createElement","resolveWrapper","data","Error","image","fetchBlobCallback","err","console","log","crossOrigin","src","event","originalWidth","naturalWidth","width","originalHeight","naturalHeight","height","transform","requiresMetaData","fetchBlob","Promise","meta","global","define","amd","module","exports","window","factory","require","originalTransform","createCanvas","offscreen","OffscreenCanvas","canvas","scale","transformCoordinates","getTransformedOptions","newOptions","i","aspectRatio","hasOwnProperty","crop","maxWidth","maxHeight","drawImage","sourceX","sourceY","sourceWidth","sourceHeight","destWidth","destHeight","ctx","getContext","imageSmoothingEnabled","msImageSmoothingEnabled","imageSmoothingQuality","requiresCanvas","minWidth","minHeight","pixelRatio","downsamplingRatio","tmp","useCanvas","HTMLCanvasElement","scaleUp","Math","max","scaleDown","min","left","top","right","undefined","bottom","contain","cover","style","floor","parseFloat","orientationCropBug","setTransform","blobSlice","Blob","webkitSlice","mozSlice","bufferSlice","ArrayBuffer","begin","end","byteLength","arr1","Uint8Array","arr2","set","buffer","metaDataParsers","jpeg","65505","65517","parseMetaData","that","DataView","size","maxMetaDataSize","dataView","getUint16","markerBytes","markerLength","parsers","offset","maxOffset","headLength","disableMetaDataParsers","length","disableImageHead","imageHead","replaceJPEGHead","oldHead","newHead","apply","arguments","replaceHead","head","then","fetch","Request","Response","responseHandler","response","XMLHttpRequest","responseType","req","open","headers","keys","forEach","key","setRequestHeader","withCredentials","credentials","ontimeout","send","body","originalRequiresCanvas","originalRequiresMetaData","originalTransformCoordinates","originalGetTransformedOptions","requiresCanvasOrientation","withMetaData","orientation","requiresOrientationChange","autoOrientation","requiresRot180","getImageData","exif","get","opts","exifOrientation","tmpTop","tmpRight","translate","rotate","PI","ExifMap","tagCode","defineProperty","value","ifds","map","tags","ifd1","name","Orientation","Thumbnail","Exif","GPSInfo","Interoperability","34665","34853","40965","id","ExifTagTypes","1","getValue","dataOffset","getUint8","2","String","fromCharCode","ascii","3","littleEndian","4","getUint32","5","9","getInt32","10","shouldIncludeTag","includeTags","excludeTags","parseExifTags","tiffOffset","dirOffset","tagOffsets","tagsNumber","dirEndOffset","tagOffset","tagNumber","tagValue","tagSize","values","str","c","tagType","getExifValue","parseExifData","disableExif","thumbnailIFD","includeExifTags","excludeExifTags","37500","disableExifOffsets","exifOffsets","exifTiffOffset","exifLittleEndian","getExifThumbnail","push","exifWriters","274","orientationOffset","setUint16","writeExifData","ExifMapProto","256","257","258","259","262","277","284","530","531","282","283","296","273","278","279","513","514","301","318","319","529","532","306","270","271","272","305","315","33432","36864","40960","40961","40962","40963","42240","37121","37122","37510","40964","36867","36868","36880","36881","36882","37520","37521","37522","33434","33437","34850","34852","34855","34856","34864","34865","34866","34867","34868","34869","37377","37378","37379","37380","37381","37382","37383","37384","37385","37396","37386","41483","41484","41486","41487","41488","41492","41493","41495","41728","41729","41730","41985","41986","41987","41988","41989","41990","41991","41992","41993","41994","41995","41996","42016","42032","42033","42034","42035","42036","42037","0","6","7","8","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","stringValues","ExposureProgram","MeteringMode","255","LightSource","Flash","32","65","69","71","73","77","79","89","93","95","SensingMethod","SceneCaptureType","SceneType","CustomRendered","WhiteBalance","GainControl","Contrast","Saturation","Sharpness","SubjectDistanceRange","FileSource","ComponentsConfiguration","getText","getAll","prop","getName","ifd","subTags","Number","IptcMap","getTagValue","types","outstr","n","getStringValue","parseIptcTags","segmentOffset","segmentLength","newValue","segmentEnd","getInt16","iptc","Array","iptcOffsets","ObjectName","200","201","202","parseIptcData","disableIptc","headerLength","disableIptcOffsets","includeIptcTags","excludeIptcTags","IptcMapProto","35","37","38","40","42","45","47","50","55","60","62","63","70","75","80","85","90","92","100","101","103","105","110","115","116","118","120","121","122","125","130","131","135","150","151","152","153","154","184","185","186","187","188","221","225","228","230","231","232","a","b","p","L","P","S","stringValue"],"mappings":"CAaC,SAAWA,gBAGV,IAAIC,EAASD,EAAEE,KAAOF,EAAEG,UAQxB,SAASC,EAAgBC,GACvB,QAAOJ,GAASA,EAAOG,gBAAgBC,GASzC,SAASC,EAAgBC,GACvB,QAAON,GAASA,EAAOK,gBAAgBC,GASzC,SAASC,EAAaD,EAAKE,IACrBF,GAA2B,UAApBA,EAAIG,MAAM,EAAG,IAAoBD,GAAWA,EAAQE,UAC7DL,EAAgBC,GAapB,SAASK,EAASC,EAAMC,EAAQC,EAASC,GACvC,IAAKhB,EAAEiB,WAAY,OAAO,EAC1B,IAAIC,EAAS,IAAID,WACjBC,EAAOJ,OAAS,WACdA,EAAOK,KAAKD,EAAQE,KAAKC,SAEvBN,IACFG,EAAOI,QAAUJ,EAAOH,QAAU,WAChCA,EAAQI,KAAKD,EAAQE,KAAKG,SAG9B,IAAIC,EAAeN,EAAOF,GAAU,iBACpC,OAAIQ,GACFA,EAAaL,KAAKD,EAAQL,GACnBK,QAFT,EAaF,SAASO,EAAaC,EAAMC,GAE1B,OAAOC,OAAOC,UAAUC,SAASX,KAAKQ,KAAS,WAAaD,EAAO,IAerE,SAASK,EAAUlB,EAAMmB,EAAUvB,GAQjC,SAASwB,EAASC,EAASC,GACzB,IACI5B,EADA6B,EAAMC,SAASC,cAAc,OASjC,SAASC,EAAeH,EAAKI,GACvBN,IAAYC,EAILC,aAAeK,MACxBN,EAAOC,KAGTI,EAAOA,GAAQ,IACVE,MAAQN,EACbF,EAAQM,IARFN,GAASA,EAAQE,EAAKI,GAgB9B,SAASG,EAAkBtC,EAAMuC,GAC3BA,GAAO5C,EAAE6C,SAASA,QAAQC,IAAIF,GAC9BvC,GAAQoB,EAAa,OAAQpB,GAE/BE,EAAMH,EADNS,EAAOR,IAGPE,EAAMM,EACFJ,GAAWA,EAAQsC,cACrBX,EAAIW,YAActC,EAAQsC,cAG9BX,EAAIY,IAAMzC,EAkBZ,OAhBA6B,EAAIrB,QAAU,SAAUkC,GACtBzC,EAAaD,EAAKE,GACd0B,GAAQA,EAAOhB,KAAKiB,EAAKa,IAE/Bb,EAAItB,OAAS,WACXN,EAAaD,EAAKE,GAClB,IAAI+B,EAAO,CACTU,cAAed,EAAIe,cAAgBf,EAAIgB,MACvCC,eAAgBjB,EAAIkB,eAAiBlB,EAAImB,QAE3C,IACExB,EAAUyB,UAAUpB,EAAK3B,EAAS8B,EAAgB1B,EAAM2B,GACxD,MAAOjB,GACHY,GAAQA,EAAOZ,KAGH,iBAATV,GACLkB,EAAU0B,iBAAiBhD,GAC7BsB,EAAU2B,UAAU7C,EAAM8B,EAAmBlC,GAE7CkC,IAEKP,GACEX,EAAa,OAAQZ,IAASY,EAAa,OAAQZ,IAC5DN,EAAMH,EAAgBS,KAEpBuB,EAAIY,IAAMzC,EACH6B,GAEFxB,EACLC,EACA,SAAUN,GACR6B,EAAIY,IAAMzC,GAEZ4B,QAXG,EAeT,OAAInC,EAAE2D,SAA+B,mBAAb3B,GACtBvB,EAAUuB,EACH,IAAI2B,QAAQ1B,IAEdA,EAASD,EAAUA,GAK5BD,EAAU0B,iBAAmB,SAAUhD,GACrC,OAAOA,GAAWA,EAAQmD,MAM5B7B,EAAU2B,UAAY,SAAUnD,EAAKyB,GACnCA,KAGFD,EAAUyB,UAAY,SAAUpB,EAAK3B,EAASuB,EAAUnB,EAAM2B,GAC5DR,EAASI,EAAKI,IAGhBT,EAAU8B,OAAS7D,EACnB+B,EAAUnB,SAAWA,EACrBmB,EAAUN,aAAeA,EACzBM,EAAU3B,gBAAkBA,EAC5B2B,EAAUzB,gBAAkBA,EAEN,mBAAXwD,QAAyBA,OAAOC,IACzCD,OAAO,WACL,OAAO/B,IAEkB,iBAAXiC,QAAuBA,OAAOC,QAC9CD,OAAOC,QAAUlC,EAEjB/B,EAAE+B,UAAYA,EArNjB,CAuNqB,oBAAXmC,QAA0BA,QAAW9C,MCvN/C,SAAW+C,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,gBAAiBK,GACE,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,iBAGhBD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBAGX,IAAIsC,EAAoBtC,EAAUyB,UAElCzB,EAAUuC,aAAe,SAAUlB,EAAOG,EAAQgB,GAChD,GAAIA,GAAaxC,EAAU8B,OAAOW,gBAChC,OAAO,IAAIA,gBAAgBpB,EAAOG,GAEpC,IAAIkB,EAASpC,SAASC,cAAc,UAGpC,OAFAmC,EAAOrB,MAAQA,EACfqB,EAAOlB,OAASA,EACTkB,GAGT1C,EAAUyB,UAAY,SAAUpB,EAAK3B,EAASuB,EAAUnB,EAAM2B,GAC5D6B,EAAkBlD,KAChBY,EACAA,EAAU2C,MAAMtC,EAAK3B,EAAS+B,GAC9B/B,EACAuB,EACAnB,EACA2B,IAOJT,EAAU4C,qBAAuB,aAKjC5C,EAAU6C,sBAAwB,SAAUxC,EAAK3B,GAC/C,IACIoE,EACAC,EACA1B,EACAG,EAJAwB,EAActE,EAAQsE,YAK1B,IAAKA,EACH,OAAOtE,EAGT,IAAKqE,KADLD,EAAa,GACHpE,EACJmB,OAAOC,UAAUmD,eAAe7D,KAAKV,EAASqE,KAChDD,EAAWC,GAAKrE,EAAQqE,IAa5B,OAVAD,EAAWI,MAAO,EAGGF,GAFrB3B,EAAQhB,EAAIe,cAAgBf,EAAIgB,QAChCG,EAASnB,EAAIkB,eAAiBlB,EAAImB,SAEhCsB,EAAWK,SAAW3B,EAASwB,EAC/BF,EAAWM,UAAY5B,IAEvBsB,EAAWK,SAAW9B,EACtByB,EAAWM,UAAY/B,EAAQ2B,GAE1BF,GAIT9C,EAAUqD,UAAY,SACpBhD,EACAqC,EACAY,EACAC,EACAC,EACAC,EACAC,EACAC,EACAjF,GAEA,IAAIkF,EAAMlB,EAAOmB,WAAW,MAkB5B,OAjBsC,IAAlCnF,EAAQoF,uBACVF,EAAIG,yBAA0B,EAC9BH,EAAIE,uBAAwB,GACnBpF,EAAQsF,wBACjBJ,EAAII,sBAAwBtF,EAAQsF,uBAEtCJ,EAAIP,UACFhD,EACAiD,EACAC,EACAC,EACAC,EACA,EACA,EACAC,EACAC,GAEKC,GAIT5D,EAAUiE,eAAiB,SAAUvF,GACnC,OAAOA,EAAQgE,QAAUhE,EAAQwE,QAAUxE,EAAQsE,aAKrDhD,EAAU2C,MAAQ,SAAUtC,EAAK3B,EAAS+B,GAExC/B,EAAUA,GAAW,GAErB+B,EAAOA,GAAQ,GACf,IAQI0C,EACAC,EACAc,EACAC,EACAX,EACAC,EACAH,EACAC,EACAa,EACAC,EACAC,EACA5B,EAnBA6B,EACFlE,EAAIwD,YACH7D,EAAUiE,eAAevF,MACtBsB,EAAU8B,OAAO0C,kBACnBnD,EAAQhB,EAAIe,cAAgBf,EAAIgB,MAChCG,EAASnB,EAAIkB,eAAiBlB,EAAImB,OAClCkC,EAAYrC,EACZsC,EAAanC,EAgBjB,SAASiD,IACP,IAAI9B,EAAQ+B,KAAKC,KACdT,GAAYR,GAAaA,GACzBS,GAAaR,GAAcA,GAElB,EAARhB,IACFe,GAAaf,EACbgB,GAAchB,GAMlB,SAASiC,IACP,IAAIjC,EAAQ+B,KAAKG,KACd1B,GAAYO,GAAaA,GACzBN,GAAaO,GAAcA,GAE1BhB,EAAQ,IACVe,GAAaf,EACbgB,GAAchB,GA2DlB,GAxDI4B,IAGFjB,GADA5E,EAAUsB,EAAU6C,sBAAsBxC,EAAK3B,EAAS+B,IACtCqE,MAAQ,EAC1BvB,EAAU7E,EAAQqG,KAAO,EACrBrG,EAAQ8E,aACVA,EAAc9E,EAAQ8E,YAClB9E,EAAQsG,QAAUC,WAAavG,EAAQoG,OAASG,YAClD3B,EAAUjC,EAAQmC,EAAc9E,EAAQsG,QAG1CxB,EAAcnC,EAAQiC,GAAW5E,EAAQsG,OAAS,GAEhDtG,EAAQ+E,cACVA,EAAe/E,EAAQ+E,aACnB/E,EAAQwG,SAAWD,WAAavG,EAAQqG,MAAQE,YAClD1B,EAAU/B,EAASiC,EAAe/E,EAAQwG,SAG5CzB,EAAejC,EAAS+B,GAAW7E,EAAQwG,QAAU,GAEvDxB,EAAYF,EACZG,EAAaF,GAEfN,EAAWzE,EAAQyE,SACnBC,EAAY1E,EAAQ0E,UACpBc,EAAWxF,EAAQwF,SACnBC,EAAYzF,EAAQyF,UAChBI,GAAapB,GAAYC,GAAa1E,EAAQwE,MAGhDoB,EAAMd,EAAcC,GAFpBC,EAAYP,IACZQ,EAAaP,IAEH,GACRK,EAAgBL,EAAYI,EAAeL,EACvCzE,EAAQqG,MAAQE,WAAavG,EAAQwG,SAAWD,YAClD1B,GAAW/B,EAASiC,GAAgB,IAEvB,EAANa,IACTd,EAAeL,EAAWM,EAAgBL,EACtC1E,EAAQoG,OAASG,WAAavG,EAAQsG,QAAUC,YAClD3B,GAAWjC,EAAQmC,GAAe,MAIlC9E,EAAQyG,SAAWzG,EAAQ0G,SAC7BlB,EAAWf,EAAWA,GAAYe,EAClCC,EAAYf,EAAYA,GAAae,GAEnCzF,EAAQ0G,OACVR,IACAH,MAEAA,IACAG,MAGAL,EAAW,CAsCb,GAnCe,GAFfH,EAAa1F,EAAQ0F,eAKjB/D,EAAIgF,MAAMhE,OACVqD,KAAKY,MAAMC,WAAWlF,EAAIgF,MAAMhE,MAAO,OACrCqD,KAAKY,MAAMjE,EAAQ+C,MAGvBV,GAAaU,EACbT,GAAcS,GAKdpE,EAAUwF,qBACTnF,EAAIwD,aACJP,GAAWC,GAAWC,IAAgBnC,GAASoC,IAAiBjC,KAGjE8C,EAAMjE,EAENA,EAAML,EAAUuC,aAAalB,EAAOG,GAAQ,GAC5CxB,EAAUqD,UACRiB,EACAjE,EACA,EACA,EACAgB,EACAG,EACAH,EACAG,EACA9C,IAKkB,GAFtB2F,EAAoB3F,EAAQ2F,oBAG1BA,EAAoB,GACpBX,EAAYF,GACZG,EAAaF,EAEb,KAAyCC,EAAlCF,EAAca,GACnB3B,EAAS1C,EAAUuC,aACjBiB,EAAca,EACdZ,EAAeY,GACf,GAEFrE,EAAUqD,UACRhD,EACAqC,EACAY,EACAC,EACAC,EACAC,EACAf,EAAOrB,MACPqB,EAAOlB,OACP9C,GAGF6E,EADAD,EAAU,EAEVE,EAAcd,EAAOrB,MACrBoC,EAAef,EAAOlB,OAEtBnB,EAAMqC,EAqBV,OAlBAA,EAAS1C,EAAUuC,aAAamB,EAAWC,GAC3C3D,EAAU4C,qBAAqBF,EAAQhE,EAAS+B,GAC/B,EAAb2D,IACF1B,EAAO2C,MAAMhE,MAAQqB,EAAOrB,MAAQ+C,EAAa,MAEnDpE,EACGqD,UACChD,EACAqC,EACAY,EACAC,EACAC,EACAC,EACAC,EACAC,EACAjF,GAED+G,aAAa,EAAG,EAAG,EAAG,EAAG,EAAG,GACxB/C,EAIT,OAFArC,EAAIgB,MAAQqC,EACZrD,EAAImB,OAASmC,EACNtD,KCnTV,SAAW+B,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,gBAAiBK,GACE,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,iBAGhBD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBAGX,IAAI8B,EAAS9B,EAAU8B,OACnBQ,EAAoBtC,EAAUyB,UAE9BiE,EACF5D,EAAO6D,OACNA,KAAK7F,UAAUnB,OACdgH,KAAK7F,UAAU8F,aACfD,KAAK7F,UAAU+F,UAEfC,EACDhE,EAAOiE,aAAeA,YAAYjG,UAAUnB,OAC7C,SAAUqH,EAAOC,GAGfA,EAAMA,GAAO5G,KAAK6G,WAAaF,EAC/B,IAAIG,EAAO,IAAIC,WAAW/G,KAAM2G,EAAOC,GACnCI,EAAO,IAAID,WAAWH,GAE1B,OADAI,EAAKC,IAAIH,GACFE,EAAKE,QAGZC,EAAkB,CACpBC,KAAM,CACJC,MAAQ,GACRC,MAAQ,KAmBZ,SAASC,EAAc9H,EAAMmB,EAAUvB,EAAS+B,GAC9C,IAAIoG,EAAOxH,KAQX,SAASa,EAASC,EAASC,GACzB,KAEI0B,EAAOgF,UACPpB,GACA5G,GACa,IAAbA,EAAKiI,MACS,eAAdjI,EAAKa,MAIP,OAAOQ,EAAQM,GAGjB,IAAIuG,EAAkBtI,EAAQsI,iBAAmB,OAE9ChH,EAAUnB,SACT6G,EAAUtG,KAAKN,EAAM,EAAGkI,GACxB,SAAUT,GAKR,IAAIU,EAAW,IAAIH,SAASP,GAE5B,GAA8B,QAA1BU,EAASC,UAAU,GACrB,OAAO9G,EACL,IAAIM,MAAM,4CAUd,IAPA,IAGIyG,EACAC,EACAC,EACAtE,EANAuE,EAAS,EACTC,EAAYN,EAASf,WAAa,EAClCsB,EAAaF,EAKVA,EAASC,IAMI,QALlBJ,EAAcF,EAASC,UAAUI,KAKLH,GAAe,OACzB,QAAhBA,IAPuB,CAcvB,GAAIG,GADJF,EAAeH,EAASC,UAAUI,EAAS,GAAK,GACpBL,EAASf,WAAY,CAE/CpF,QAAQC,IAAI,gDACZ,MAGF,IADAsG,EAAUb,EAAgBC,KAAKU,MACfzI,EAAQ+I,uBACtB,IAAK1E,EAAI,EAAGA,EAAIsE,EAAQK,OAAQ3E,GAAK,EACnCsE,EAAQtE,GAAG3D,KACTyH,EACAI,EACAK,EACAF,EACA3G,EACA/B,GAKN8I,EADAF,GAAUF,GAUT1I,EAAQiJ,kBAAiC,EAAbH,IAC/B/G,EAAKmH,UAAY9B,EAAY1G,KAAKmH,EAAQ,EAAGiB,IAE/CrH,EAAQM,IAEVL,EACA,sBAIFD,EAAQM,GAIZ,OADA/B,EAAUA,GAAW,GACjBoD,EAAOF,SAA+B,mBAAb3B,GAE3BQ,EADA/B,EAAUuB,GAAY,GAEf,IAAI2B,QAAQ1B,KAErBO,EAAOA,GAAQ,GACRP,EAASD,EAAUA,IAW5B,SAAS4H,EAAgBvJ,EAAMwJ,EAASC,GACtC,OAAKzJ,GAASwJ,GAAYC,EACnB,IAAIpC,KAAK,CAACoC,EAASrC,EAAUtG,KAAKd,EAAMwJ,EAAQ5B,aAAc,CACnEvG,KAAM,eAFkC,KA+B5CK,EAAUyB,UAAY,SAAUpB,EAAK3B,EAASuB,EAAUnB,EAAM2B,GACxDT,EAAU0B,iBAAiBhD,GAE7BkI,EACE9H,EACA,SAAUQ,GACJA,IAAWmB,IAETqB,EAAOhB,SAASA,QAAQC,IAAIzB,GAChCA,EAASmB,GAEX6B,EAAkBlD,KAChBY,EACAK,EACA3B,EACAuB,EACAnB,EACAQ,IAGJZ,EAlBF+B,EAAOA,GAAQ,IAsBf6B,EAAkB0F,MAAMhI,EAAWiI,YAIvCjI,EAAU0F,UAAYA,EACtB1F,EAAU8F,YAAcA,EACxB9F,EAAUkI,YA9CV,SAAqB5J,EAAM6J,EAAMlI,GAC/B,IAAIvB,EAAU,CAAEsI,gBAAiB,IAAKS,wBAAwB,GAC9D,IAAKxH,GAAY6B,EAAOF,QACtB,OAAOgF,EAActI,EAAMI,GAAS0J,KAAK,SAAU3H,GACjD,OAAOoH,EAAgBvJ,EAAMmC,EAAKmH,UAAWO,KAGjDvB,EACEtI,EACA,SAAUmC,GACRR,EAAS4H,EAAgBvJ,EAAMmC,EAAKmH,UAAWO,KAEjDzJ,IAmCJsB,EAAU4G,cAAgBA,EAC1B5G,EAAUwG,gBAAkBA,ICpP7B,SAAWpE,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,gBAAiBK,GACE,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,iBAGhBD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBAGX,IAAI8B,EAAS9B,EAAU8B,OAGrBA,EAAOuG,OACPvG,EAAOwG,SACPxG,EAAOyG,UACPzG,EAAOyG,SAASzI,UAAUxB,KAE1B0B,EAAU2B,UAAY,SAAUnD,EAAKyB,EAAUvB,GAO7C,SAAS8J,EAAgBC,GACvB,OAAOA,EAASnK,OAElB,GAAIwD,EAAOF,SAA+B,mBAAb3B,EAC3B,OAAOoI,MAAM,IAAIC,QAAQ9J,EAAKyB,IAAWmI,KAAKI,GAEhDH,MAAM,IAAIC,QAAQ9J,EAAKE,IACpB0J,KAAKI,GACLJ,KAAKnI,GAKN,SAAE,SAAUY,GACVZ,EAAS,KAAMY,MAIrBiB,EAAO4G,gBAE+B,MAAtC,IAAIA,gBAAiBC,eAErB3I,EAAU2B,UAAY,SAAUnD,EAAKyB,EAAUvB,GAO7C,SAASwB,EAASC,EAASC,GACzB1B,EAAUA,GAAW,GACrB,IAAIkK,EAAM,IAAIF,eACdE,EAAIC,KAAKnK,EAAQO,QAAU,MAAOT,GAC9BE,EAAQoK,SACVjJ,OAAOkJ,KAAKrK,EAAQoK,SAASE,QAAQ,SAAUC,GAC7CL,EAAIM,iBAAiBD,EAAKvK,EAAQoK,QAAQG,MAG9CL,EAAIO,gBAA0C,YAAxBzK,EAAQ0K,YAC9BR,EAAID,aAAe,OACnBC,EAAI7J,OAAS,WACXoB,EAAQyI,EAAIH,WAEdG,EAAI5J,QAAU4J,EAAIrJ,QAAUqJ,EAAIS,UAAY,SAAUxI,GAChDV,IAAYC,EAEdA,EAAO,KAAMS,GAEbT,EAAOS,IAGX+H,EAAIU,KAAK5K,EAAQ6K,MAEnB,OAAIzH,EAAOF,SAA+B,mBAAb3B,GAC3BvB,EAAUuB,EACH,IAAI2B,QAAQ1B,IAEdA,EAASD,EAAUA,OCzD/B,SAAWmC,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,eAAgB,qBAAsB,qBAAsBK,GACzC,iBAAXH,QAAuBA,OAAOC,QAC9CE,EACEC,QAAQ,gBACRA,QAAQ,sBACRA,QAAQ,sBAIVD,EAAQD,OAAOnC,WAblB,CAeE,SAAUA,gBAGX,IAMY/B,EAiBNoC,EAvBFiC,EAAoBtC,EAAUyB,UAC9B+H,EAAyBxJ,EAAUiE,eACnCwF,EAA2BzJ,EAAU0B,iBACrCgI,EAA+B1J,EAAU4C,qBACzC+G,EAAgC3J,EAAU6C,sBAgD9C,SAAS+G,EAA0BlL,EAASmL,GAC1C,IAAIC,EAAcpL,GAAWA,EAAQoL,YACrC,OAEmB,IAAhBA,IAAyB9J,EAAU8J,aAEnB,IAAhBA,GAAqB9J,EAAU8J,eAE7BD,GAAgB7J,EAAU8J,cACb,EAAdA,GACAA,EAAc,EAWpB,SAASC,EAA0BD,EAAaE,GAC9C,OACEF,IAAgBE,IACE,IAAhBF,GAAuC,EAAlBE,GAAuBA,EAAkB,GAC/C,EAAdF,GAAmBA,EAAc,GAsBxC,SAASG,EAAeH,EAAaE,GACnC,GAAsB,EAAlBA,GAAuBA,EAAkB,EAC3C,OAAQF,GACN,KAAK,EACL,KAAK,EACH,OAAyB,EAAlBE,EACT,KAAK,EACL,KAAK,EACH,OAAOA,EAAkB,GAAM,EACjC,KAAK,EACL,KAAK,EACH,OACsB,IAApBA,GACoB,IAApBA,GACoB,IAApBA,GACoB,IAApBA,IA5GE/L,EAqCT+B,GAnCM8B,OAAOxB,YAeVD,EAAMC,SAASC,cAAc,QAC7BxB,OAAS,WAGX,IAEM6E,EAHN3F,EAAE6L,YAA4B,IAAdzJ,EAAIgB,OAA8B,IAAfhB,EAAImB,OACnCvD,EAAE6L,eAEAlG,EADS3F,EAAEsE,aAAa,EAAG,GAAG,GACjBsB,WAAW,OACxBR,UAAUhD,EAAK,EAAG,EAAG,EAAG,EAAG,EAAG,EAAG,EAAG,GAQxCpC,EAAEuH,mBACiD,oBAAjD5B,EAAIsG,aAAa,EAAG,EAAG,EAAG,GAAGzJ,KAAKV,aAGxCM,EAAIY,IA3BF,mfA2GJjB,EAAUiE,eAAiB,SAAUvF,GACnC,OACEkL,EAA0BlL,IAC1B8K,EAAuBpK,KAAKY,EAAWtB,IAK3CsB,EAAU0B,iBAAmB,SAAUhD,GACrC,OACEkL,EAA0BlL,GAAS,IACnC+K,EAAyBrK,KAAKY,EAAWtB,IAI7CsB,EAAUyB,UAAY,SAAUpB,EAAK3B,EAASuB,EAAUnB,EAAM2B,GAC5D6B,EAAkBlD,KAChBY,EACAK,EACA3B,EACA,SAAU2B,EAAKI,GACb,IACMuJ,EAIE7I,EACAG,GANJb,GAGoB,GAFlBuJ,EACFhK,EAAU8J,aAAerJ,EAAK0J,MAAQ1J,EAAK0J,KAAKC,IAAI,iBAC3BJ,EAAkB,IAEvC7I,EAAgBV,EAAKU,cACrBG,EAAiBb,EAAKa,eAC1Bb,EAAKU,cAAgBG,EACrBb,EAAKa,eAAiBH,GAG1BlB,EAASI,EAAKI,IAEhB3B,EACA2B,IAMJT,EAAU6C,sBAAwB,SAAUxC,EAAKgK,EAAM5J,GACrD,IAAI/B,EAAUiL,EAA8BvK,KAAKY,EAAWK,EAAKgK,GAC7DC,EAAkB7J,EAAK0J,MAAQ1J,EAAK0J,KAAKC,IAAI,eAC7CN,EAAcpL,EAAQoL,YACtBE,EAAkBhK,EAAU8J,aAAeQ,EAE/C,IADoB,IAAhBR,IAAsBA,EAAcQ,IACnCP,EAA0BD,EAAaE,GAC1C,OAAOtL,EAET,IA2EQ6L,EACAC,EA5EJzF,EAAMrG,EAAQqG,IACdC,EAAQtG,EAAQsG,MAChBE,EAASxG,EAAQwG,OACjBJ,EAAOpG,EAAQoG,KACfhC,EAAa,GACjB,IAAK,IAAIC,KAAKrE,EACRmB,OAAOC,UAAUmD,eAAe7D,KAAKV,EAASqE,KAChDD,EAAWC,GAAKrE,EAAQqE,IAgB5B,IAXiB,GAFjBD,EAAWgH,YAAcA,MAEiB,EAAlBE,IACrBF,EAAc,GAAuB,EAAlBE,KAGpBlH,EAAWK,SAAWzE,EAAQ0E,UAC9BN,EAAWM,UAAY1E,EAAQyE,SAC/BL,EAAWoB,SAAWxF,EAAQyF,UAC9BrB,EAAWqB,UAAYzF,EAAQwF,SAC/BpB,EAAWU,YAAc9E,EAAQ+E,aACjCX,EAAWW,aAAe/E,EAAQ8E,aAEd,EAAlBwG,EAAqB,CAGvB,OAAQA,GACN,KAAK,EAEHhF,EAAQtG,EAAQoG,KAChBA,EAAOpG,EAAQsG,MACf,MACF,KAAK,EAEHD,EAAMrG,EAAQwG,OACdF,EAAQtG,EAAQoG,KAChBI,EAASxG,EAAQqG,IACjBD,EAAOpG,EAAQsG,MACf,MACF,KAAK,EAEHD,EAAMrG,EAAQwG,OACdA,EAASxG,EAAQqG,IACjB,MACF,KAAK,EAEHA,EAAMrG,EAAQoG,KACdE,EAAQtG,EAAQwG,OAChBA,EAASxG,EAAQsG,MACjBF,EAAOpG,EAAQqG,IACf,MACF,KAAK,EAEHA,EAAMrG,EAAQoG,KACdE,EAAQtG,EAAQqG,IAChBG,EAASxG,EAAQsG,MACjBF,EAAOpG,EAAQwG,OACf,MACF,KAAK,EAEHH,EAAMrG,EAAQsG,MACdA,EAAQtG,EAAQqG,IAChBG,EAASxG,EAAQoG,KACjBA,EAAOpG,EAAQwG,OACf,MACF,KAAK,EAEHH,EAAMrG,EAAQsG,MACdA,EAAQtG,EAAQwG,OAChBA,EAASxG,EAAQoG,KACjBA,EAAOpG,EAAQqG,IAIfkF,EAAeH,EAAaE,KAC1BO,EAASxF,EACTyF,EAAWxF,EACfD,EAAMG,EACNF,EAAQF,EACRI,EAASqF,EACTzF,EAAO0F,GAQX,OALA1H,EAAWiC,IAAMA,EACjBjC,EAAWkC,MAAQA,EACnBlC,EAAWoC,OAASA,EACpBpC,EAAWgC,KAAOA,EAEVgF,GACN,KAAK,EAEHhH,EAAWkC,MAAQF,EACnBhC,EAAWgC,KAAOE,EAClB,MACF,KAAK,EAEHlC,EAAWiC,IAAMG,EACjBpC,EAAWkC,MAAQF,EACnBhC,EAAWoC,OAASH,EACpBjC,EAAWgC,KAAOE,EAClB,MACF,KAAK,EAEHlC,EAAWiC,IAAMG,EACjBpC,EAAWoC,OAASH,EACpB,MACF,KAAK,EAEHjC,EAAWiC,IAAMD,EACjBhC,EAAWkC,MAAQE,EACnBpC,EAAWoC,OAASF,EACpBlC,EAAWgC,KAAOC,EAClB,MACF,KAAK,EAEHjC,EAAWiC,IAAMC,EACjBlC,EAAWkC,MAAQE,EACnBpC,EAAWoC,OAASJ,EACpBhC,EAAWgC,KAAOC,EAClB,MACF,KAAK,EAEHjC,EAAWiC,IAAMC,EACjBlC,EAAWkC,MAAQD,EACnBjC,EAAWoC,OAASJ,EACpBhC,EAAWgC,KAAOI,EAClB,MACF,KAAK,EAEHpC,EAAWiC,IAAMD,EACjBhC,EAAWkC,MAAQD,EACnBjC,EAAWoC,OAASF,EACpBlC,EAAWgC,KAAOI,EAGtB,OAAOpC,GAIT9C,EAAU4C,qBAAuB,SAAUF,EAAQhE,EAAS+B,GAC1DiJ,EAA6BtK,KAAKY,EAAW0C,EAAQhE,EAAS+B,GAC9D,IAAIqJ,EAAcpL,EAAQoL,YACtBE,EACFhK,EAAU8J,aAAerJ,EAAK0J,MAAQ1J,EAAK0J,KAAKC,IAAI,eACtD,GAAKL,EAA0BD,EAAaE,GAA5C,CAGA,IAAIpG,EAAMlB,EAAOmB,WAAW,MACxBxC,EAAQqB,EAAOrB,MACfG,EAASkB,EAAOlB,OAChBgC,EAAcnC,EACdoC,EAAejC,EAenB,QAbiB,EAAdsI,KAAuC,EAAlBE,IACrBF,EAAc,GAAuB,EAAlBE,KAGpBtH,EAAOrB,MAAQG,EACfkB,EAAOlB,OAASH,GAEA,EAAdyI,IAEFtG,EAAchC,EACdiC,EAAepC,GAGT2I,GACN,KAAK,EAEHpG,EAAI6G,UAAUjH,EAAa,GAC3BI,EAAIjB,OAAO,EAAG,GACd,MACF,KAAK,EAEHiB,EAAI6G,UAAUjH,EAAaC,GAC3BG,EAAI8G,OAAOhG,KAAKiG,IAChB,MACF,KAAK,EAEH/G,EAAI6G,UAAU,EAAGhH,GACjBG,EAAIjB,MAAM,GAAI,GACd,MACF,KAAK,EAEHiB,EAAI8G,QAAQ,GAAMhG,KAAKiG,IACvB/G,EAAIjB,OAAO,EAAG,GACd,MACF,KAAK,EAEHiB,EAAI8G,QAAQ,GAAMhG,KAAKiG,IACvB/G,EAAI6G,WAAWjH,EAAa,GAC5B,MACF,KAAK,EAEHI,EAAI8G,QAAQ,GAAMhG,KAAKiG,IACvB/G,EAAI6G,WAAWjH,EAAaC,GAC5BG,EAAIjB,MAAM,GAAI,GACd,MACF,KAAK,EAEHiB,EAAI8G,OAAO,GAAMhG,KAAKiG,IACtB/G,EAAI6G,UAAU,GAAIhH,GAQtB,OAJIwG,EAAeH,EAAaE,KAC9BpG,EAAI6G,UAAUjH,EAAaC,GAC3BG,EAAI8G,OAAOhG,KAAKiG,KAEVb,GACN,KAAK,EAEHlG,EAAI6G,UAAUpJ,EAAO,GACrBuC,EAAIjB,OAAO,EAAG,GACd,MACF,KAAK,EAEHiB,EAAI6G,UAAUpJ,EAAOG,GACrBoC,EAAI8G,OAAOhG,KAAKiG,IAChB,MACF,KAAK,EAEH/G,EAAI6G,UAAU,EAAGjJ,GACjBoC,EAAIjB,MAAM,GAAI,GACd,MACF,KAAK,EAEHiB,EAAI8G,OAAO,GAAMhG,KAAKiG,IACtB/G,EAAIjB,MAAM,GAAI,GACd,MACF,KAAK,EAEHiB,EAAI8G,OAAO,GAAMhG,KAAKiG,IACtB/G,EAAI6G,UAAU,GAAIjJ,GAClB,MACF,KAAK,EAEHoC,EAAI8G,OAAO,GAAMhG,KAAKiG,IACtB/G,EAAI6G,UAAUpJ,GAAQG,GACtBoC,EAAIjB,OAAO,EAAG,GACd,MACF,KAAK,EAEHiB,EAAI8G,QAAQ,GAAMhG,KAAKiG,IACvB/G,EAAI6G,WAAWpJ,EAAO,QC7c7B,SAAWe,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,eAAgB,qBAAsBK,GACnB,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,gBAAiBA,QAAQ,sBAGzCD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBAUX,SAAS4K,EAAQC,GACXA,IACFhL,OAAOiL,eAAezL,KAAM,MAAO,CACjC0L,MAAO1L,KAAK2L,KAAKH,GAASI,MAE5BpL,OAAOiL,eAAezL,KAAM,OAAQ,CAClC0L,MAAQ1L,KAAK6L,MAAQ7L,KAAK6L,KAAKL,IAAa,MAclDD,EAAQ9K,UAAUkL,KAAO,CACvBG,KAAM,CAAEC,KAAM,YAAaH,IAV7BL,EAAQ9K,UAAUmL,IAAM,CACtBI,YAAa,IACbC,UAAW,OACX3F,KAAM,IACN4F,KAAM,MACNC,QAAS,MACTC,iBAAkB,QAKlBC,MAAQ,CAAEN,KAAM,OAAQH,IAAK,IAC7BU,MAAQ,CAAEP,KAAM,UAAWH,IAAK,IAChCW,MAAQ,CAAER,KAAM,mBAAoBH,IAAK,KAS3CL,EAAQ9K,UAAUsK,IAAM,SAAUyB,GAChC,OAAOxM,KAAKwM,IAAOxM,KAAKA,KAAK4L,IAAIY,KAyBnC,IAAIC,EAAe,CAEjBC,EAAG,CACDC,SAAU,SAAU/E,EAAUgF,GAC5B,OAAOhF,EAASiF,SAASD,IAE3BlF,KAAM,GAGRoF,EAAG,CACDH,SAAU,SAAU/E,EAAUgF,GAC5B,OAAOG,OAAOC,aAAapF,EAASiF,SAASD,KAE/ClF,KAAM,EACNuF,OAAO,GAGTC,EAAG,CACDP,SAAU,SAAU/E,EAAUgF,EAAYO,GACxC,OAAOvF,EAASC,UAAU+E,EAAYO,IAExCzF,KAAM,GAGR0F,EAAG,CACDT,SAAU,SAAU/E,EAAUgF,EAAYO,GACxC,OAAOvF,EAASyF,UAAUT,EAAYO,IAExCzF,KAAM,GAGR4F,EAAG,CACDX,SAAU,SAAU/E,EAAUgF,EAAYO,GACxC,OACEvF,EAASyF,UAAUT,EAAYO,GAC/BvF,EAASyF,UAAUT,EAAa,EAAGO,IAGvCzF,KAAM,GAGR6F,EAAG,CACDZ,SAAU,SAAU/E,EAAUgF,EAAYO,GACxC,OAAOvF,EAAS4F,SAASZ,EAAYO,IAEvCzF,KAAM,GAGR+F,GAAI,CACFd,SAAU,SAAU/E,EAAUgF,EAAYO,GACxC,OACEvF,EAAS4F,SAASZ,EAAYO,GAC9BvF,EAAS4F,SAASZ,EAAa,EAAGO,IAGtCzF,KAAM,IAkFV,SAASgG,EAAiBC,EAAaC,EAAapC,GAClD,QACImC,GAAeA,EAAYnC,OAC3BoC,IAAwC,IAAzBA,EAAYpC,IAiBjC,SAASqC,EACPjG,EACAkG,EACAC,EACAZ,EACAtB,EACAmC,EACAL,EACAC,GAEA,IAAIK,EAAYC,EAAcxK,EAAGyK,EAAWC,EAAWC,EACvD,GAAIN,EAAY,EAAInG,EAASf,WAC3BpF,QAAQC,IAAI,oDADd,CAMA,MADAwM,EAAeH,EAAY,EAAI,IAD/BE,EAAarG,EAASC,UAAUkG,EAAWZ,KAExB,EAAIvF,EAASf,YAAhC,CAIA,IAAKnD,EAAI,EAAGA,EAAIuK,EAAYvK,GAAK,EAC/ByK,EAAYJ,EAAY,EAAI,GAAKrK,EAE5BgK,EAAiBC,EAAaC,EADnCQ,EAAYxG,EAASC,UAAUsG,EAAWhB,MAE1CkB,EA9GJ,SACEzG,EACAkG,EACA7F,EACA3H,EACA+H,EACA8E,GAEA,IACImB,EACA1B,EACA2B,EACA7K,EACA8K,EACAC,EANAC,EAAUjC,EAAanM,GAO3B,GAAKoO,EAAL,CAWA,MAJA9B,EACY,GAJZ0B,EAAUI,EAAQhH,KAAOW,GAKnByF,EAAalG,EAASyF,UAAUpF,EAAS,EAAGkF,GAC5ClF,EAAS,GACEqG,EAAU1G,EAASf,YAApC,CAIA,GAAe,IAAXwB,EACF,OAAOqG,EAAQ/B,SAAS/E,EAAUgF,EAAYO,GAGhD,IADAoB,EAAS,GACJ7K,EAAI,EAAGA,EAAI2E,EAAQ3E,GAAK,EAC3B6K,EAAO7K,GAAKgL,EAAQ/B,SAClB/E,EACAgF,EAAalJ,EAAIgL,EAAQhH,KACzByF,GAGJ,GAAIuB,EAAQzB,MAAO,CAGjB,IAFAuB,EAAM,GAED9K,EAAI,EAAGA,EAAI6K,EAAOlG,QAGX,QAFVoG,EAAIF,EAAO7K,IADkBA,GAAK,EAMlC8K,GAAOC,EAET,OAAOD,EAET,OAAOD,EA3BL9M,QAAQC,IAAI,gDAXZD,QAAQC,IAAI,wCA8FDiN,CACT/G,EACAkG,EACAK,EACAvG,EAASC,UAAUsG,EAAY,EAAGhB,GAClCvF,EAASyF,UAAUc,EAAY,EAAGhB,GAClCA,GAEFtB,EAAKuC,GAAaC,EACdL,IACFA,EAAWI,GAAaD,IAI5B,OAAOvG,EAASyF,UAAUa,EAAcf,GArBtC1L,QAAQC,IAAI,+CApHhB+K,EAAa,GAAKA,EAAa,GAmL/B9L,EAAUiO,cAAgB,SAAUhH,EAAUK,EAAQI,EAAQjH,EAAM/B,GAClE,IAAIA,EAAQwP,YAAZ,CAGA,IAQI1B,EACAY,EACAe,EAVAnB,EAActO,EAAQ0P,gBACtBnB,EAAcvO,EAAQ2P,iBAAmB,CAC3C3C,MAAQ,CAEN4C,OAAQ,IAGRnB,EAAa7F,EAAS,GAK1B,GAAuC,aAAnCL,EAASyF,UAAUpF,EAAS,GAIhC,GAAI6F,EAAa,EAAIlG,EAASf,WAC5BpF,QAAQC,IAAI,iDAId,GAAuC,IAAnCkG,EAASC,UAAUI,EAAS,GAAhC,CAKA,OAAQL,EAASC,UAAUiG,IACzB,KAAK,MACHX,GAAe,EACf,MACF,KAAK,MACHA,GAAe,EACf,MACF,QAEE,YADA1L,QAAQC,IAAI,qDAIyC,KAArDkG,EAASC,UAAUiG,EAAa,EAAGX,IAKvCY,EAAYnG,EAASyF,UAAUS,EAAa,EAAGX,GAE/C/L,EAAK0J,KAAO,IAAIS,EACXlM,EAAQ6P,qBACX9N,EAAK+N,YAAc,IAAI5D,EACvBnK,EAAKgO,eAAiBtB,EACtB1M,EAAKiO,iBAAmBlC,IAI1BY,EAAYF,EACVjG,EACAkG,EACAA,EAAaC,EACbZ,EACA/L,EAAK0J,KACL1J,EAAK+N,YACLxB,EACAC,KAEeF,EAAiBC,EAAaC,EAAa,UAC1DxM,EAAK0J,KAAKgB,KAAOiC,EACb3M,EAAK+N,cACP/N,EAAK+N,YAAYrD,KAAOgC,EAAaC,IAGzCvN,OAAOkJ,KAAKtI,EAAK0J,KAAKa,MAAMhC,QAAQ,SAAU6B,GArGhD,IACEpK,EACAoK,EACA5D,EACAkG,EACAX,EACAQ,EACAC,EAEIG,EAPJvC,EAsGIA,EArGJ5D,EAsGIA,EArGJkG,EAsGIA,EArGJX,EAsGIA,EArGJQ,EAsGIA,EArGJC,EAsGIA,GApGAG,GARJ3M,EAsGIA,GA9FiB0J,KAAKU,MAExBpK,EAAK0J,KAAKU,GAAW,IAAID,EAAQC,GAC7BpK,EAAK+N,cACP/N,EAAK+N,YAAY3D,GAAW,IAAID,EAAQC,IAE1CqC,EACEjG,EACAkG,EACAA,EAAaC,EACbZ,EACA/L,EAAK0J,KAAKU,GACVpK,EAAK+N,aAAe/N,EAAK+N,YAAY3D,GACrCmC,GAAeA,EAAYnC,GAC3BoC,GAAeA,EAAYpC,QAyF/BsD,EAAe1N,EAAK0J,KAAKgB,OAELgD,EAAa,OAC/BA,EAAa,KAnVjB,SAA0BlH,EAAUK,EAAQI,GAC1C,GAAKA,EAAL,CACA,KAAIJ,EAASI,EAAST,EAASf,YAI/B,OAAO,IAAIP,KACT,CAAC3F,EAAU8F,YAAY1G,KAAK6H,EAASV,OAAQe,EAAQA,EAASI,IAC9D,CACE/H,KAAM,eANRmB,QAAQC,IAAI,+CAgVW4N,CACrB1H,EACAkG,EAAagB,EAAa,KAC1BA,EAAa,QA/CfrN,QAAQC,IAAI,gDAjBZD,QAAQC,IAAI,uDAsEhBf,EAAUwG,gBAAgBC,KAAK,OAAQmI,KAAK5O,EAAUiO,eAEtDjO,EAAU6O,YAAc,CAEtBC,IAAQ,SAAUvI,EAAQ9F,EAAMsK,GAC9B,IAAIgE,EAAoBtO,EAAK+N,YAAY,KACzC,OAAKO,GACM,IAAIjI,SAASP,EAAQwI,EAAoB,EAAG,GAClDC,UAAU,EAAGjE,EAAOtK,EAAKiO,kBACvBnI,IAIXvG,EAAUiP,cAAgB,SAAU1I,EAAQ9F,EAAMoL,EAAId,GACpD/K,EAAU6O,YAAYpO,EAAK0J,KAAKc,IAAIY,IAAKtF,EAAQ9F,EAAMsK,IAGzD/K,EAAU4K,QAAUA,IC9arB,SAAWxI,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,eAAgB,qBAAsBK,GACnB,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,gBAAiBA,QAAQ,sBAGzCD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBAGX,IAAIkP,EAAelP,EAAU4K,QAAQ9K,UAErCoP,EAAahE,KAAO,CAIlBiE,IAAQ,aACRC,IAAQ,cACRC,IAAQ,gBACRC,IAAQ,cACRC,IAAQ,4BACRT,IAAQ,cACRU,IAAQ,kBACRC,IAAQ,sBACRC,IAAQ,mBACRC,IAAQ,mBACRC,IAAQ,cACRC,IAAQ,cACRC,IAAQ,iBACRC,IAAQ,eACRC,IAAQ,eACRC,IAAQ,kBACRC,IAAQ,wBACRC,IAAQ,8BACRC,IAAQ,mBACRC,IAAQ,aACRC,IAAQ,wBACRC,IAAQ,oBACRC,IAAQ,sBACRC,IAAQ,WACRC,IAAQ,mBACRC,IAAQ,OACRC,IAAQ,QACRC,IAAQ,WACRC,IAAQ,SACRC,MAAQ,YACRrF,MAAQ,CAENsF,MAAQ,cACRC,MAAQ,kBACRC,MAAQ,aACRC,MAAQ,kBACRC,MAAQ,kBACRC,MAAQ,QACRC,MAAQ,0BACRC,MAAQ,yBACRjD,MAAQ,YACRkD,MAAQ,cACRC,MAAQ,mBACRC,MAAQ,mBACRC,MAAQ,oBACRC,MAAQ,aACRC,MAAQ,qBACRC,MAAQ,sBACRC,MAAQ,aACRC,MAAQ,qBACRC,MAAQ,sBACRC,MAAQ,eACRC,MAAQ,UACRC,MAAQ,kBACRC,MAAQ,sBACRC,MAAQ,0BACRC,MAAQ,OACRC,MAAQ,kBACRC,MAAQ,4BACRC,MAAQ,2BACRC,MAAQ,WACRC,MAAQ,sBACRC,MAAQ,sBACRC,MAAQ,oBACRC,MAAQ,gBACRC,MAAQ,kBACRC,MAAQ,eACRC,MAAQ,mBACRC,MAAQ,kBACRC,MAAQ,eACRC,MAAQ,cACRC,MAAQ,QACRC,MAAQ,cACRC,MAAQ,cACRC,MAAQ,cACRC,MAAQ,2BACRC,MAAQ,wBACRC,MAAQ,wBACRC,MAAQ,2BACRC,MAAQ,kBACRC,MAAQ,gBACRC,MAAQ,gBACRC,MAAQ,aACRC,MAAQ,YACRC,MAAQ,aACRC,MAAQ,iBACRC,MAAQ,eACRC,MAAQ,eACRC,MAAQ,mBACRC,MAAQ,wBACRC,MAAQ,mBACRC,MAAQ,cACRC,MAAQ,WACRC,MAAQ,aACRC,MAAQ,YACRC,MAAQ,2BACRC,MAAQ,uBACRC,MAAQ,gBACRC,MAAQ,kBACRC,MAAQ,mBACRC,MAAQ,oBACRC,MAAQ,WACRC,MAAQ,YACRC,MAAQ,oBAEV3J,MAAQ,CAEN4J,EAAQ,eACRxJ,EAAQ,iBACRI,EAAQ,cACRI,EAAQ,kBACRE,EAAQ,eACRE,EAAQ,iBACR6I,EAAQ,cACRC,EAAQ,eACRC,EAAQ,gBACR9I,EAAQ,YACRE,GAAQ,iBACR6I,GAAQ,SACRC,GAAQ,cACRC,GAAQ,WACRC,GAAQ,cACRC,GAAQ,WACRC,GAAQ,qBACRC,GAAQ,kBACRC,GAAQ,cACRC,GAAQ,qBACRC,GAAQ,kBACRC,GAAQ,sBACRC,GAAQ,mBACRC,GAAQ,oBACRC,GAAQ,iBACRC,GAAQ,qBACRC,GAAQ,kBACRC,GAAQ,sBACRC,GAAQ,qBACRC,GAAQ,eACRC,GAAQ,kBACRC,GAAQ,wBAEVnL,MAAQ,CAENG,EAAQ,0BAKZmD,EAAahE,KAAKC,KAAO+D,EAAahE,KAEtCgE,EAAa8H,aAAe,CAC1BC,gBAAiB,CACf1B,EAAG,YACHxJ,EAAG,SACHI,EAAG,iBACHI,EAAG,oBACHE,EAAG,mBACHE,EAAG,mBACH6I,EAAG,iBACHC,EAAG,gBACHC,EAAG,kBAELwB,aAAc,CACZ3B,EAAG,UACHxJ,EAAG,UACHI,EAAG,wBACHI,EAAG,OACHE,EAAG,YACHE,EAAG,UACH6I,EAAG,UACH2B,IAAK,SAEPC,YAAa,CACX7B,EAAG,UACHxJ,EAAG,WACHI,EAAG,cACHI,EAAG,gCACHE,EAAG,QACHG,EAAG,eACHE,GAAI,iBACJ6I,GAAI,QACJC,GAAI,wCACJC,GAAI,yCACJC,GAAI,0CACJC,GAAI,sCACJE,GAAI,mBACJC,GAAI,mBACJC,GAAI,mBACJC,GAAI,MACJC,GAAI,MACJC,GAAI,MACJC,GAAI,MACJC,GAAI,sBACJW,IAAK,SAEPE,MAAO,CACL9B,EAAQ,qBACRxJ,EAAQ,cACRY,EAAQ,mCACR8I,EAAQ,+BACR7I,EAAQ,qCACRiJ,GAAQ,gEACRE,GAAQ,4DACRC,GAAQ,4CACRQ,GAAQ,gCACRC,GAAQ,yBACRI,GAAQ,oDACRE,GAAQ,gDACRO,GAAQ,oBACRC,GAAQ,sCACRC,GAAQ,iEACRC,GAAQ,6DACRC,GAAQ,6DACRC,GAAQ,wFACRC,GAAQ,oFACRC,GAAQ,iDACRC,GAAQ,4EACRC,GAAQ,yEAEVC,cAAe,CACbjM,EAAG,YACHI,EAAG,6BACHI,EAAG,6BACHE,EAAG,+BACHE,EAAG,+BACH8I,EAAG,mBACHC,EAAG,kCAELuC,iBAAkB,CAChB1C,EAAG,WACHxJ,EAAG,YACHI,EAAG,WACHI,EAAG,eAEL2L,UAAW,CACTnM,EAAG,yBAELoM,eAAgB,CACd5C,EAAG,iBACHxJ,EAAG,kBAELqM,aAAc,CACZ7C,EAAG,qBACHxJ,EAAG,wBAELsM,YAAa,CACX9C,EAAG,OACHxJ,EAAG,cACHI,EAAG,eACHI,EAAG,gBACHE,EAAG,kBAEL6L,SAAU,CACR/C,EAAG,SACHxJ,EAAG,OACHI,EAAG,QAELoM,WAAY,CACVhD,EAAG,SACHxJ,EAAG,iBACHI,EAAG,mBAELqM,UAAW,CACTjD,EAAG,SACHxJ,EAAG,OACHI,EAAG,QAELsM,qBAAsB,CACpBlD,EAAG,UACHxJ,EAAG,QACHI,EAAG,aACHI,EAAG,gBAELmM,WAAY,CACVnM,EAAG,OAELoM,wBAAyB,CACvBpD,EAAG,GACHxJ,EAAG,IACHI,EAAG,KACHI,EAAG,KACHE,EAAG,IACHE,EAAG,IACH6I,EAAG,KAELnK,YAAa,CACXU,EAAG,WACHI,EAAG,kBACHI,EAAG,kBACHE,EAAG,gBACHE,EAAG,gCACH6I,EAAG,gBACHC,EAAG,kCACHC,EAAG,mBAIPxG,EAAa0J,QAAU,SAAUxN,GAC/B,IAAIL,EAAQ1L,KAAK+K,IAAIgB,GACrB,OAAQA,GACN,IAAK,cACL,IAAK,QACL,IAAK,eACL,IAAK,kBACL,IAAK,gBACL,IAAK,mBACL,IAAK,YACL,IAAK,iBACL,IAAK,eACL,IAAK,cACL,IAAK,WACL,IAAK,aACL,IAAK,YACL,IAAK,uBACL,IAAK,aACL,IAAK,cACH,OAAO/L,KAAK2X,aAAa5L,GAAML,GACjC,IAAK,cACL,IAAK,kBACH,IAAKA,EAAO,OACZ,OAAOqB,OAAOC,aAAatB,EAAM,GAAIA,EAAM,GAAIA,EAAM,GAAIA,EAAM,IACjE,IAAK,0BACH,IAAKA,EAAO,OACZ,OACE1L,KAAK2X,aAAa5L,GAAML,EAAM,IAC9B1L,KAAK2X,aAAa5L,GAAML,EAAM,IAC9B1L,KAAK2X,aAAa5L,GAAML,EAAM,IAC9B1L,KAAK2X,aAAa5L,GAAML,EAAM,IAElC,IAAK,eACH,IAAKA,EAAO,OACZ,OAAOA,EAAM,GAAK,IAAMA,EAAM,GAAK,IAAMA,EAAM,GAAK,IAAMA,EAAM,GAEpE,OAAOqB,OAAOrB,IAGhBmE,EAAa2J,OAAS,WACpB,IACIC,EACAlZ,EACAwL,EAHAH,EAAM,GAIV,IAAK6N,KAAQzZ,KACPQ,OAAOC,UAAUmD,eAAe7D,KAAKC,KAAMyZ,MAC7ClZ,EAAMP,KAAKyZ,KACAlZ,EAAIiZ,OACb5N,EAAI5L,KAAK2L,KAAK8N,GAAM1N,MAAQxL,EAAIiZ,UAEhCzN,EAAO/L,KAAK6L,KAAK4N,MACP7N,EAAIG,GAAQ/L,KAAKuZ,QAAQxN,KAIzC,OAAOH,GAGTiE,EAAa6J,QAAU,SAAUlO,GAC/B,IAAIO,EAAO/L,KAAK6L,KAAKL,GACrB,MAAoB,iBAATO,EAA0B/L,KAAK2L,KAAKH,GAASO,KACjDA,GAIR,WACC,IACI0N,EACAE,EACAC,EAHA/N,EAAOgE,EAAahE,KAKxB,IAAK4N,KAAQ5N,EACX,GAAIrL,OAAOC,UAAUmD,eAAe7D,KAAK8L,EAAM4N,GAE7C,GADAE,EAAM9J,EAAalE,KAAK8N,GAGtB,IAAKA,KADLG,EAAU/N,EAAK4N,GAETjZ,OAAOC,UAAUmD,eAAe7D,KAAK6Z,EAASH,KAChDE,EAAI/N,IAAIgO,EAAQH,IAASI,OAAOJ,SAIpC5J,EAAajE,IAAIC,EAAK4N,IAASI,OAAOJ,GAjB7C,KC/XF,SAAW1W,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,eAAgB,qBAAsBK,GACnB,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,gBAAiBA,QAAQ,sBAGzCD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBASX,SAASmZ,KAkDT,SAASC,EAAYvO,EAASI,EAAKhE,EAAUK,EAAQI,GACnD,MAA2B,WAAvBuD,EAAIoO,MAAMxO,GACL,IAAIlF,KAAK,CAACsB,EAASV,OAAO5H,MAAM2I,EAAQA,EAASI,KAE/B,WAAvBuD,EAAIoO,MAAMxO,GACL5D,EAASC,UAAUI,GAxB9B,SAAwBL,EAAUK,EAAQI,GAGxC,IAFA,IAAI4R,EAAS,GACTrT,EAAMqB,EAASI,EACV6R,EAAIjS,EAAQiS,EAAItT,EAAKsT,GAAK,EACjCD,GAAUlN,OAAOC,aAAapF,EAASiF,SAASqN,IAElD,OAAOD,EAoBAE,CAAevS,EAAUK,EAAQI,GA6B1C,SAAS+R,EACPxS,EACAyS,EACAC,EACAlZ,EACAuM,EACAC,GAKA,IAHA,IAAIlC,EAAO4C,EAAS9C,EA3BIE,EAAO6O,EA4B3BC,EAAaH,EAAgBC,EAC7BrS,EAASoS,EACNpS,EAASuS,GAEkB,KAA9B5S,EAASiF,SAAS5E,IACgB,IAAlCL,EAASiF,SAAS5E,EAAS,KAE3BuD,EAAU5D,EAASiF,SAAS5E,EAAS,GAEjC0F,IAAeA,EAAYnC,IAC3BoC,GAAgBA,EAAYpC,KAE9B8C,EAAU1G,EAAS6S,SAASxS,EAAS,GACrCyD,EAAQqO,EAAYvO,EAASpK,EAAKsZ,KAAM9S,EAAUK,EAAS,EAAGqG,GAC9DlN,EAAKsZ,KAAKlP,IA1CQE,EA0CoBtK,EAAKsZ,KAAKlP,GA1CvB+O,EA0CiC7O,EAzC5DA,IAAU9F,UAAkB2U,EAC5B7O,aAAiBiP,OACnBjP,EAAM6D,KAAKgL,GACJ7O,GAEF,CAACA,EAAO6O,IAqCLnZ,EAAKwZ,cACPxZ,EAAKwZ,YAAYpP,GAAWvD,KAIlCA,GAAU,EAjHd6R,EAAQrZ,UAAUmL,IAAM,CACtBiP,WAAY,GAGdf,EAAQrZ,UAAUuZ,MAAQ,CACxB9D,EAAG,SACH4E,IAAK,SACLC,IAAK,SACLC,IAAK,UASPlB,EAAQrZ,UAAUsK,IAAM,SAAUyB,GAChC,OAAOxM,KAAKwM,IAAOxM,KAAKA,KAAK4L,IAAIY,KAmInC7L,EAAUsa,cAAgB,SAAUrT,EAAUK,EAAQI,EAAQjH,EAAM/B,GAClE,IAAIA,EAAQ6b,YAIZ,IADA,IAfiCjT,EAC7BI,EAfkBT,EAAUK,EA6B5BF,EAAeE,EAASI,EACrBJ,EAAS,EAAIF,GAAc,CAChC,GA/B8BE,EA+BDA,EA7BE,aAFXL,EA+BDA,GA7BVyF,UAAUpF,IACgB,OAAnCL,EAASC,UAAUI,EAAS,GA4BU,CACpC,IAAIkT,GAlByBlT,EAkBgBA,EAjB7CI,OAAAA,GAAAA,EAiBmCT,EAjBjBiF,SAAS5E,EAAS,IAC3B,GAAM,IAAGI,GAAU,GAEjB,IAAXA,IAEFA,EAAS,GAEJA,GAWCgS,EAAgBpS,EAAS,EAAIkT,EACjC,GAAoBpT,EAAhBsS,EAA8B,CAEhC5Y,QAAQC,IAAI,8CACZ,MAEF,IAAI4Y,EAAgB1S,EAASC,UAAUI,EAAS,EAAIkT,GACpD,GAA6BpT,EAAzBE,EAASqS,EAA8B,CAEzC7Y,QAAQC,IAAI,4CACZ,MAeF,OAZAN,EAAKsZ,KAAO,IAAIZ,EACXza,EAAQ+b,qBACXha,EAAKwZ,YAAc,IAAId,QAEzBM,EACExS,EACAyS,EACAC,EACAlZ,EACA/B,EAAQgc,gBACRhc,EAAQic,iBAAmB,CAAEN,KAAK,IAKtC/S,GAAU,IAKdtH,EAAUwG,gBAAgBC,KAAK,OAAQmI,KAAK5O,EAAUsa,eAEtDta,EAAUmZ,QAAUA,ICnNrB,SAAW/W,gBAEY,mBAAXL,QAAyBA,OAAOC,IAEzCD,OAAO,CAAC,eAAgB,qBAAsBK,GACnB,iBAAXH,QAAuBA,OAAOC,QAC9CE,EAAQC,QAAQ,gBAAiBA,QAAQ,sBAGzCD,EAAQD,OAAOnC,WATlB,CAWE,SAAUA,gBAGX,IAAI4a,EAAe5a,EAAUmZ,QAAQrZ,UAErC8a,EAAa1P,KAAO,CAClBqK,EAAG,2BACHhJ,EAAG,sBACHE,EAAG,2BACHE,EAAG,aACH8I,EAAG,aACHC,EAAG,kBACH5I,GAAI,UACJ8I,GAAI,mBACJG,GAAI,WACJK,GAAI,yBACJE,GAAI,oBACJG,GAAI,WACJC,GAAI,sBACJC,GAAI,sBACJG,GAAI,cACJ+D,GAAI,cACJC,GAAI,iBACJC,GAAI,iBACJC,GAAI,sBACJC,GAAI,gBACJC,GAAI,mBACJC,GAAI,gBACJC,GAAI,kBACJC,GAAI,cACJC,GAAI,cACJC,GAAI,sBACJC,GAAI,sBACJjE,GAAI,qBACJkE,GAAI,iBACJC,GAAI,cACJC,GAAI,SACJC,GAAI,cACJC,GAAI,OACJC,GAAI,cACJ/D,GAAI,QACJgE,IAAK,cACLC,IAAK,UACLC,IAAK,gCACLC,IAAK,WACLC,IAAK,SACLC,IAAK,SACLC,IAAK,kBACLC,IAAK,UACLC,IAAK,UACLC,IAAK,eACLC,IAAK,SACLC,IAAK,oBACLC,IAAK,YACLC,IAAK,mBACLC,IAAK,qBACLC,IAAK,YACLC,IAAK,oBACLC,IAAK,0BACLC,IAAK,gBACLC,IAAK,cACLC,IAAK,QACLC,IAAK,mBACLC,IAAK,kBACLC,IAAK,mBACLC,IAAK,UACLpD,IAAK,0BACLC,IAAK,2BACLC,IAAK,oBACLmD,IAAK,QACLC,IAAK,gBACLC,IAAK,kBACLC,IAAK,gBACLC,IAAK,kBACLC,IAAK,iBACL1G,IAAK,eAGPyD,EAAa5D,aAAe,CAC1BlK,GAAI,CACFyI,EAAG,eACHxJ,EAAG,kBACHI,EAAG,IACHI,EAAG,IACHE,EAAG,IACHE,EAAG,qBACH6I,EAAG,IACHC,EAAG,IACHC,EAAG,mBACH9I,EAAG,6BAEL8O,GAAI,CACFoC,EAAG,UACHC,EAAG,2BACHC,EAAG,WAELpB,IAAK,CACHqB,EAAG,YACHC,EAAG,WACHC,EAAG,WAIPvD,EAAahC,QAAU,SAAU/M,GAC/B,IAAId,EAAQ1L,KAAK+K,IAAIyB,GACjBhB,EAAUxL,KAAK4L,IAAIY,GACnBuS,EAAc/e,KAAK2X,aAAanM,GACpC,OAAIuT,EAAoBA,EAAYrT,GAC7BqB,OAAOrB,IAGhB6P,EAAa/B,OAAS,WACpB,IACIC,EACA1N,EAFAH,EAAM,GAGV,IAAK6N,KAAQzZ,KACPQ,OAAOC,UAAUmD,eAAe7D,KAAKC,KAAMyZ,KAC7C1N,EAAO/L,KAAK6L,KAAK4N,MACP7N,EAAIG,GAAQ/L,KAAKuZ,QAAQxN,IAGvC,OAAOH,GAGT2P,EAAa7B,QAAU,SAAUlO,GAC/B,OAAOxL,KAAK6L,KAAKL,IAIlB,WACC,IAEIiO,EAFA5N,EAAO0P,EAAa1P,KACpBD,EAAM2P,EAAa3P,KAAO,GAG9B,IAAK6N,KAAQ5N,EACPrL,OAAOC,UAAUmD,eAAe7D,KAAK8L,EAAM4N,KAC7C7N,EAAIC,EAAK4N,IAASI,OAAOJ,IAP9B"}
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.js
new file mode 100644
index 0000000000000..27387fbd13d76
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.js
@@ -0,0 +1,229 @@
+/*
+ * JavaScript Load Image
+ * https://github.com/blueimp/JavaScript-Load-Image
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define, module, Promise */
+
+;(function ($) {
+  'use strict'
+
+  var urlAPI = $.URL || $.webkitURL
+
+  /**
+   * Creates an object URL for a given File object.
+   *
+   * @param {Blob} blob Blob object
+   * @returns {string|boolean} Returns object URL if API exists, else false.
+   */
+  function createObjectURL(blob) {
+    return urlAPI ? urlAPI.createObjectURL(blob) : false
+  }
+
+  /**
+   * Revokes a given object URL.
+   *
+   * @param {string} url Blob object URL
+   * @returns {undefined|boolean} Returns undefined if API exists, else false.
+   */
+  function revokeObjectURL(url) {
+    return urlAPI ? urlAPI.revokeObjectURL(url) : false
+  }
+
+  /**
+   * Helper function to revoke an object URL
+   *
+   * @param {string} url Blob Object URL
+   * @param {object} [options] Options object
+   */
+  function revokeHelper(url, options) {
+    if (url && url.slice(0, 5) === 'blob:' && !(options && options.noRevoke)) {
+      revokeObjectURL(url)
+    }
+  }
+
+  /**
+   * Loads a given File object via FileReader interface.
+   *
+   * @param {Blob} file Blob object
+   * @param {Function} onload Load event callback
+   * @param {Function} [onerror] Error/Abort event callback
+   * @param {string} [method=readAsDataURL] FileReader method
+   * @returns {FileReader|boolean} Returns FileReader if API exists, else false.
+   */
+  function readFile(file, onload, onerror, method) {
+    if (!$.FileReader) return false
+    var reader = new FileReader()
+    reader.onload = function () {
+      onload.call(reader, this.result)
+    }
+    if (onerror) {
+      reader.onabort = reader.onerror = function () {
+        onerror.call(reader, this.error)
+      }
+    }
+    var readerMethod = reader[method || 'readAsDataURL']
+    if (readerMethod) {
+      readerMethod.call(reader, file)
+      return reader
+    }
+  }
+
+  /**
+   * Cross-frame instanceof check.
+   *
+   * @param {string} type Instance type
+   * @param {object} obj Object instance
+   * @returns {boolean} Returns true if the object is of the given instance.
+   */
+  function isInstanceOf(type, obj) {
+    // Cross-frame instanceof check
+    return Object.prototype.toString.call(obj) === '[object ' + type + ']'
+  }
+
+  /**
+   * @typedef { HTMLImageElement|HTMLCanvasElement } Result
+   */
+
+  /**
+   * Loads an image for a given File object.
+   *
+   * @param {Blob|string} file Blob object or image URL
+   * @param {Function|object} [callback] Image load event callback or options
+   * @param {object} [options] Options object
+   * @returns {HTMLImageElement|FileReader|Promise<Result>} Object
+   */
+  function loadImage(file, callback, options) {
+    /**
+     * Promise executor
+     *
+     * @param {Function} resolve Resolution function
+     * @param {Function} reject Rejection function
+     * @returns {HTMLImageElement|FileReader} Object
+     */
+    function executor(resolve, reject) {
+      var img = document.createElement('img')
+      var url
+      /**
+       * Callback for the fetchBlob call.
+       *
+       * @param {HTMLImageElement|HTMLCanvasElement} img Error object
+       * @param {object} data Data object
+       * @returns {undefined} Undefined
+       */
+      function resolveWrapper(img, data) {
+        if (resolve === reject) {
+          // Not using Promises
+          if (resolve) resolve(img, data)
+          return
+        } else if (img instanceof Error) {
+          reject(img)
+          return
+        }
+        data = data || {} // eslint-disable-line no-param-reassign
+        data.image = img
+        resolve(data)
+      }
+      /**
+       * Callback for the fetchBlob call.
+       *
+       * @param {Blob} blob Blob object
+       * @param {Error} err Error object
+       */
+      function fetchBlobCallback(blob, err) {
+        if (err && $.console) console.log(err) // eslint-disable-line no-console
+        if (blob && isInstanceOf('Blob', blob)) {
+          file = blob // eslint-disable-line no-param-reassign
+          url = createObjectURL(file)
+        } else {
+          url = file
+          if (options && options.crossOrigin) {
+            img.crossOrigin = options.crossOrigin
+          }
+        }
+        img.src = url
+      }
+      img.onerror = function (event) {
+        revokeHelper(url, options)
+        if (reject) reject.call(img, event)
+      }
+      img.onload = function () {
+        revokeHelper(url, options)
+        var data = {
+          originalWidth: img.naturalWidth || img.width,
+          originalHeight: img.naturalHeight || img.height
+        }
+        try {
+          loadImage.transform(img, options, resolveWrapper, file, data)
+        } catch (error) {
+          if (reject) reject(error)
+        }
+      }
+      if (typeof file === 'string') {
+        if (loadImage.requiresMetaData(options)) {
+          loadImage.fetchBlob(file, fetchBlobCallback, options)
+        } else {
+          fetchBlobCallback()
+        }
+        return img
+      } else if (isInstanceOf('Blob', file) || isInstanceOf('File', file)) {
+        url = createObjectURL(file)
+        if (url) {
+          img.src = url
+          return img
+        }
+        return readFile(
+          file,
+          function (url) {
+            img.src = url
+          },
+          reject
+        )
+      }
+    }
+    if ($.Promise && typeof callback !== 'function') {
+      options = callback // eslint-disable-line no-param-reassign
+      return new Promise(executor)
+    }
+    return executor(callback, callback)
+  }
+
+  // Determines if metadata should be loaded automatically.
+  // Requires the load image meta extension to load metadata.
+  loadImage.requiresMetaData = function (options) {
+    return options && options.meta
+  }
+
+  // If the callback given to this function returns a blob, it is used as image
+  // source instead of the original url and overrides the file argument used in
+  // the onload and onerror event callbacks:
+  loadImage.fetchBlob = function (url, callback) {
+    callback()
+  }
+
+  loadImage.transform = function (img, options, callback, file, data) {
+    callback(img, data)
+  }
+
+  loadImage.global = $
+  loadImage.readFile = readFile
+  loadImage.isInstanceOf = isInstanceOf
+  loadImage.createObjectURL = createObjectURL
+  loadImage.revokeObjectURL = revokeObjectURL
+
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return loadImage
+    })
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = loadImage
+  } else {
+    $.loadImage = loadImage
+  }
+})((typeof window !== 'undefined' && window) || this)
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/LICENSE.txt b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/LICENSE.txt
new file mode 100644
index 0000000000000..d6a9d74758be3
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/LICENSE.txt
@@ -0,0 +1,20 @@
+MIT License
+
+Copyright © 2011 Sebastian Tschan, https://blueimp.net
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/README.md b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/README.md
new file mode 100644
index 0000000000000..d8281b237ca1f
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/README.md
@@ -0,0 +1,436 @@
+# JavaScript Templates
+
+## Contents
+
+- [Demo](https://blueimp.github.io/JavaScript-Templates/)
+- [Description](#description)
+- [Usage](#usage)
+  - [Client-side](#client-side)
+  - [Server-side](#server-side)
+- [Requirements](#requirements)
+- [API](#api)
+  - [tmpl() function](#tmpl-function)
+  - [Templates cache](#templates-cache)
+  - [Output encoding](#output-encoding)
+  - [Local helper variables](#local-helper-variables)
+  - [Template function argument](#template-function-argument)
+  - [Template parsing](#template-parsing)
+- [Templates syntax](#templates-syntax)
+  - [Interpolation](#interpolation)
+  - [Evaluation](#evaluation)
+- [Compiled templates](#compiled-templates)
+- [Tests](#tests)
+- [License](#license)
+
+## Description
+
+1KB lightweight, fast & powerful JavaScript templating engine with zero
+dependencies.  
+Compatible with server-side environments like [Node.js](https://nodejs.org/),
+module loaders like [RequireJS](https://requirejs.org/) or
+[webpack](https://webpack.js.org/) and all web browsers.
+
+## Usage
+
+### Client-side
+
+Install the **blueimp-tmpl** package with [NPM](https://www.npmjs.org/):
+
+```sh
+npm install blueimp-tmpl
+```
+
+Include the (minified) JavaScript Templates script in your HTML markup:
+
+```html
+<script src="js/tmpl.min.js"></script>
+```
+
+Add a script section with type **"text/x-tmpl"**, a unique **id** property and
+your template definition as content:
+
+```html
+<script type="text/x-tmpl" id="tmpl-demo">
+  <h3>{%=o.title%}</h3>
+  <p>Released under the
+  <a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
+  <h4>Features</h4>
+  <ul>
+  {% for (var i=0; i<o.features.length; i++) { %}
+      <li>{%=o.features[i]%}</li>
+  {% } %}
+  </ul>
+</script>
+```
+
+**"o"** (the lowercase letter) is a reference to the data parameter of the
+template function (see the API section on how to modify this identifier).
+
+In your application code, create a JavaScript object to use as data for the
+template:
+
+```js
+var data = {
+  title: 'JavaScript Templates',
+  license: {
+    name: 'MIT license',
+    url: 'https://opensource.org/licenses/MIT'
+  },
+  features: ['lightweight & fast', 'powerful', 'zero dependencies']
+}
+```
+
+In a real application, this data could be the result of retrieving a
+[JSON](https://json.org/) resource.
+
+Render the result by calling the **tmpl()** method with the id of the template
+and the data object as arguments:
+
+```js
+document.getElementById('result').innerHTML = tmpl('tmpl-demo', data)
+```
+
+### Server-side
+
+The following is an example how to use the JavaScript Templates engine on the
+server-side with [Node.js](https://nodejs.org/).
+
+Install the **blueimp-tmpl** package with [NPM](https://www.npmjs.org/):
+
+```sh
+npm install blueimp-tmpl
+```
+
+Add a file **template.html** with the following content:
+
+```html
+<!DOCTYPE HTML>
+<title>{%=o.title%}</title>
+<h3><a href="{%=o.url%}">{%=o.title%}</a></h3>
+<h4>Features</h4>
+<ul>
+{% for (var i=0; i<o.features.length; i++) { %}
+    <li>{%=o.features[i]%}</li>
+{% } %}
+</ul>
+```
+
+Add a file **server.js** with the following content:
+
+```js
+require('http')
+  .createServer(function (req, res) {
+    var fs = require('fs'),
+      // The tmpl module exports the tmpl() function:
+      tmpl = require('./tmpl'),
+      // Use the following version if you installed the package with npm:
+      // tmpl = require("blueimp-tmpl"),
+      // Sample data:
+      data = {
+        title: 'JavaScript Templates',
+        url: 'https://github.com/blueimp/JavaScript-Templates',
+        features: ['lightweight & fast', 'powerful', 'zero dependencies']
+      }
+    // Override the template loading method:
+    tmpl.load = function (id) {
+      var filename = id + '.html'
+      console.log('Loading ' + filename)
+      return fs.readFileSync(filename, 'utf8')
+    }
+    res.writeHead(200, { 'Content-Type': 'text/x-tmpl' })
+    // Render the content:
+    res.end(tmpl('template', data))
+  })
+  .listen(8080, 'localhost')
+console.log('Server running at http://localhost:8080/')
+```
+
+Run the application with the following command:
+
+```sh
+node server.js
+```
+
+## Requirements
+
+The JavaScript Templates script has zero dependencies.
+
+## API
+
+### tmpl() function
+
+The **tmpl()** function is added to the global **window** object and can be
+called as global function:
+
+```js
+var result = tmpl('tmpl-demo', data)
+```
+
+The **tmpl()** function can be called with the id of a template, or with a
+template string:
+
+```js
+var result = tmpl('<h3>{%=o.title%}</h3>', data)
+```
+
+If called without second argument, **tmpl()** returns a reusable template
+function:
+
+```js
+var func = tmpl('<h3>{%=o.title%}</h3>')
+document.getElementById('result').innerHTML = func(data)
+```
+
+### Templates cache
+
+Templates loaded by id are cached in the map **tmpl.cache**:
+
+```js
+var func = tmpl('tmpl-demo'), // Loads and parses the template
+  cached = typeof tmpl.cache['tmpl-demo'] === 'function', // true
+  result = tmpl('tmpl-demo', data) // Uses cached template function
+
+tmpl.cache['tmpl-demo'] = null
+result = tmpl('tmpl-demo', data) // Loads and parses the template again
+```
+
+### Output encoding
+
+The method **tmpl.encode** is used to escape HTML special characters in the
+template output:
+
+```js
+var output = tmpl.encode('<>&"\'\x00') // Renders "&lt;&gt;&amp;&quot;&#39;"
+```
+
+**tmpl.encode** makes use of the regular expression **tmpl.encReg** and the
+encoding map **tmpl.encMap** to match and replace special characters, which can
+be modified to change the behavior of the output encoding.  
+Strings matched by the regular expression, but not found in the encoding map are
+removed from the output. This allows for example to automatically trim input
+values (removing whitespace from the start and end of the string):
+
+```js
+tmpl.encReg = /(^\s+)|(\s+$)|[<>&"'\x00]/g
+var output = tmpl.encode('    Banana!    ') // Renders "Banana" (without whitespace)
+```
+
+### Local helper variables
+
+The local variables available inside the templates are the following:
+
+- **o**: The data object given as parameter to the template function (see the
+  next section on how to modify the parameter name).
+- **tmpl**: A reference to the **tmpl** function object.
+- **\_s**: The string for the rendered result content.
+- **\_e**: A reference to the **tmpl.encode** method.
+- **print**: Helper function to add content to the rendered result string.
+- **include**: Helper function to include the return value of a different
+  template in the result.
+
+To introduce additional local helper variables, the string **tmpl.helper** can
+be extended. The following adds a convenience function for _console.log_ and a
+streaming function, that streams the template rendering result back to the
+callback argument (note the comma at the beginning of each variable
+declaration):
+
+```js
+tmpl.helper +=
+  ',log=function(){console.log.apply(console, arguments)}' +
+  ",st='',stream=function(cb){var l=st.length;st=_s;cb( _s.slice(l));}"
+```
+
+Those new helper functions could be used to stream the template contents to the
+console output:
+
+```html
+<script type="text/x-tmpl" id="tmpl-demo">
+  <h3>{%=o.title%}</h3>
+  {% stream(log); %}
+  <p>Released under the
+  <a href="{%=o.license.url%}">{%=o.license.name%}</a>.</p>
+  {% stream(log); %}
+  <h4>Features</h4>
+  <ul>
+  {% stream(log); %}
+  {% for (var i=0; i<o.features.length; i++) { %}
+      <li>{%=o.features[i]%}</li>
+      {% stream(log); %}
+  {% } %}
+  </ul>
+  {% stream(log); %}
+</script>
+```
+
+### Template function argument
+
+The generated template functions accept one argument, which is the data object
+given to the **tmpl(id, data)** function. This argument is available inside the
+template definitions as parameter **o** (the lowercase letter).
+
+The argument name can be modified by overriding **tmpl.arg**:
+
+```js
+tmpl.arg = 'p'
+
+// Renders "<h3>JavaScript Templates</h3>":
+var result = tmpl('<h3>{%=p.title%}</h3>', { title: 'JavaScript Templates' })
+```
+
+### Template parsing
+
+The template contents are matched and replaced using the regular expression
+**tmpl.regexp** and the replacement function **tmpl.func**. The replacement
+function operates based on the
+[parenthesized submatch strings](https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/String/replace#Specifying_a_function_as_a_parameter).
+
+To use different tags for the template syntax, override **tmpl.regexp** with a
+modified regular expression, by exchanging all occurrences of "{%" and "%}",
+e.g. with "[%" and "%]":
+
+```js
+tmpl.regexp = /([\s'\\])(?!(?:[^[]|\[(?!%))*%\])|(?:\[%(=|#)([\s\S]+?)%\])|(\[%)|(%\])/g
+```
+
+By default, the plugin preserves whitespace (newlines, carriage returns, tabs
+and spaces). To strip unnecessary whitespace, you can override the **tmpl.func**
+function, e.g. with the following code:
+
+```js
+var originalFunc = tmpl.func
+tmpl.func = function (s, p1, p2, p3, p4, p5, offset, str) {
+  if (p1 && /\s/.test(p1)) {
+    if (
+      !offset ||
+      /\s/.test(str.charAt(offset - 1)) ||
+      /^\s+$/g.test(str.slice(offset))
+    ) {
+      return ''
+    }
+    return ' '
+  }
+  return originalFunc.apply(tmpl, arguments)
+}
+```
+
+## Templates syntax
+
+### Interpolation
+
+Print variable with HTML special characters escaped:
+
+```html
+<h3>{%=o.title%}</h3>
+```
+
+Print variable without escaping:
+
+```html
+<h3>{%#o.user_id%}</h3>
+```
+
+Print output of function calls:
+
+```html
+<a href="{%=encodeURI(o.url)%}">Website</a>
+```
+
+Use dot notation to print nested properties:
+
+```html
+<strong>{%=o.author.name%}</strong>
+```
+
+### Evaluation
+
+Use **print(str)** to add escaped content to the output:
+
+```html
+<span>Year: {% var d=new Date(); print(d.getFullYear()); %}</span>
+```
+
+Use **print(str, true)** to add unescaped content to the output:
+
+```html
+<span>{% print("Fast &amp; powerful", true); %}</span>
+```
+
+Use **include(str, obj)** to include content from a different template:
+
+```html
+<div>
+  {% include('tmpl-link', {name: "Website", url: "https://example.org"}); %}
+</div>
+```
+
+**If else condition**:
+
+```html
+{% if (o.author.url) { %}
+<a href="{%=encodeURI(o.author.url)%}">{%=o.author.name%}</a>
+{% } else { %}
+<em>No author url.</em>
+{% } %}
+```
+
+**For loop**:
+
+```html
+<ul>
+{% for (var i=0; i<o.features.length; i++) { %}
+    <li>{%=o.features[i]%}</li>
+{% } %}
+</ul>
+```
+
+## Compiled templates
+
+The JavaScript Templates project comes with a compilation script, that allows
+you to compile your templates into JavaScript code and combine them with a
+minimal Templates runtime into one combined JavaScript file.
+
+The compilation script is built for [Node.js](https://nodejs.org/).  
+To use it, first install the JavaScript Templates project via
+[NPM](https://www.npmjs.org/):
+
+```sh
+npm install blueimp-tmpl
+```
+
+This will put the executable **tmpl.js** into the folder **node_modules/.bin**.
+It will also make it available on your PATH if you install the package globally
+(by adding the **-g** flag to the install command).
+
+The **tmpl.js** executable accepts the paths to one or multiple template files
+as command line arguments and prints the generated JavaScript code to the
+console output. The following command line shows you how to store the generated
+code in a new JavaScript file that can be included in your project:
+
+```sh
+tmpl.js index.html > tmpl.js
+```
+
+The files given as command line arguments to **tmpl.js** can either be pure
+template files or HTML documents with embedded template script sections. For the
+pure template files, the file names (without extension) serve as template ids.  
+The generated file can be included in your project as a replacement for the
+original **tmpl.js** runtime. It provides you with the same API and provides a
+**tmpl(id, data)** function that accepts the id of one of your templates as
+first and a data object as optional second parameter.
+
+## Tests
+
+The JavaScript Templates project comes with
+[Unit Tests](https://en.wikipedia.org/wiki/Unit_testing).  
+There are two different ways to run the tests:
+
+- Open test/index.html in your browser or
+- run `npm test` in the Terminal in the root path of the repository package.
+
+The first one tests the browser integration, the second one the
+[Node.js](https://nodejs.org/) integration.
+
+## License
+
+The JavaScript Templates script is released under the
+[MIT license](https://opensource.org/licenses/MIT).
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/compile.js b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/compile.js
new file mode 100755
index 0000000000000..122d034eaa8ea
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/compile.js
@@ -0,0 +1,91 @@
+#!/usr/bin/env node
+/*
+ * JavaScript Templates Compiler
+ * https://github.com/blueimp/JavaScript-Templates
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* eslint-disable strict */
+/* eslint-disable no-console */
+
+;(function () {
+  'use strict'
+  var path = require('path')
+  var tmpl = require(path.join(__dirname, 'tmpl.js'))
+  var fs = require('fs')
+  // Retrieve the content of the minimal runtime:
+  var runtime = fs.readFileSync(path.join(__dirname, 'runtime.js'), 'utf8')
+  // A regular expression to parse templates from script tags in a HTML page:
+  var regexp = /<script( id="([\w-]+)")? type="text\/x-tmpl"( id="([\w-]+)")?>([\s\S]+?)<\/script>/gi
+  // A regular expression to match the helper function names:
+  var helperRegexp = new RegExp(
+    tmpl.helper.match(/\w+(?=\s*=\s*function\s*\()/g).join('\\s*\\(|') +
+      '\\s*\\('
+  )
+  // A list to store the function bodies:
+  var list = []
+  var code
+  // Extend the Templating engine with a print method for the generated functions:
+  tmpl.print = function (str) {
+    // Only add helper functions if they are used inside of the template:
+    var helper = helperRegexp.test(str) ? tmpl.helper : ''
+    var body = str.replace(tmpl.regexp, tmpl.func)
+    if (helper || /_e\s*\(/.test(body)) {
+      helper = '_e=tmpl.encode' + helper + ','
+    }
+    return (
+      'function(' +
+      tmpl.arg +
+      ',tmpl){' +
+      ('var ' + helper + "_s='" + body + "';return _s;")
+        .split("_s+='';")
+        .join('') +
+      '}'
+    )
+  }
+  // Loop through the command line arguments:
+  process.argv.forEach(function (file, index) {
+    var listLength = list.length
+    var stats
+    var content
+    var result
+    var id
+    // Skip the first two arguments, which are "node" and the script:
+    if (index > 1) {
+      stats = fs.statSync(file)
+      if (!stats.isFile()) {
+        console.error(file + ' is not a file.')
+        return
+      }
+      content = fs.readFileSync(file, 'utf8')
+      // eslint-disable-next-line no-constant-condition
+      while (true) {
+        // Find templates in script tags:
+        result = regexp.exec(content)
+        if (!result) {
+          break
+        }
+        id = result[2] || result[4]
+        list.push("'" + id + "':" + tmpl.print(result[5]))
+      }
+      if (listLength === list.length) {
+        // No template script tags found, use the complete content:
+        id = path.basename(file, path.extname(file))
+        list.push("'" + id + "':" + tmpl.print(content))
+      }
+    }
+  })
+  if (!list.length) {
+    console.error('Missing input file.')
+    return
+  }
+  // Combine the generated functions as cache of the minimal runtime:
+  code = runtime.replace('{}', '{' + list.join(',') + '}')
+  // Print the resulting code to the console output:
+  console.log(code)
+})()
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/runtime.js b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/runtime.js
new file mode 100644
index 0000000000000..1a3a716c51bc0
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/runtime.js
@@ -0,0 +1,50 @@
+/*
+ * JavaScript Templates Runtime
+ * https://github.com/blueimp/JavaScript-Templates
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ */
+
+/* global define */
+
+/* eslint-disable strict */
+
+;(function ($) {
+  'use strict'
+  var tmpl = function (id, data) {
+    var f = tmpl.cache[id]
+    return data
+      ? f(data, tmpl)
+      : function (data) {
+          return f(data, tmpl)
+        }
+  }
+  tmpl.cache = {}
+  tmpl.encReg = /[<>&"'\x00]/g // eslint-disable-line no-control-regex
+  tmpl.encMap = {
+    '<': '&lt;',
+    '>': '&gt;',
+    '&': '&amp;',
+    '"': '&quot;',
+    "'": '&#39;'
+  }
+  tmpl.encode = function (s) {
+    // eslint-disable-next-line eqeqeq
+    return (s == null ? '' : '' + s).replace(tmpl.encReg, function (c) {
+      return tmpl.encMap[c] || ''
+    })
+  }
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return tmpl
+    })
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = tmpl
+  } else {
+    $.tmpl = tmpl
+  }
+})(this)
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.js b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.js
new file mode 100644
index 0000000000000..63eb927cb0d4d
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.js
@@ -0,0 +1,98 @@
+/*
+ * JavaScript Templates
+ * https://github.com/blueimp/JavaScript-Templates
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * https://opensource.org/licenses/MIT
+ *
+ * Inspired by John Resig's JavaScript Micro-Templating:
+ * http://ejohn.org/blog/javascript-micro-templating/
+ */
+
+/* global define */
+
+/* eslint-disable strict */
+
+;(function ($) {
+  'use strict'
+  var tmpl = function (str, data) {
+    var f = !/[^\w\-.:]/.test(str)
+      ? (tmpl.cache[str] = tmpl.cache[str] || tmpl(tmpl.load(str)))
+      : new Function( // eslint-disable-line no-new-func
+          tmpl.arg + ',tmpl',
+          'var _e=tmpl.encode' +
+            tmpl.helper +
+            ",_s='" +
+            str.replace(tmpl.regexp, tmpl.func) +
+            "';return _s;"
+        )
+    return data
+      ? f(data, tmpl)
+      : function (data) {
+          return f(data, tmpl)
+        }
+  }
+  tmpl.cache = {}
+  tmpl.load = function (id) {
+    return document.getElementById(id).innerHTML
+  }
+  tmpl.regexp = /([\s'\\])(?!(?:[^{]|\{(?!%))*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g
+  tmpl.func = function (s, p1, p2, p3, p4, p5) {
+    if (p1) {
+      // whitespace, quote and backspace in HTML context
+      return (
+        {
+          '\n': '\\n',
+          '\r': '\\r',
+          '\t': '\\t',
+          ' ': ' '
+        }[p1] || '\\' + p1
+      )
+    }
+    if (p2) {
+      // interpolation: {%=prop%}, or unescaped: {%#prop%}
+      if (p2 === '=') {
+        return "'+_e(" + p3 + ")+'"
+      }
+      return "'+(" + p3 + "==null?'':" + p3 + ")+'"
+    }
+    if (p4) {
+      // evaluation start tag: {%
+      return "';"
+    }
+    if (p5) {
+      // evaluation end tag: %}
+      return "_s+='"
+    }
+  }
+  tmpl.encReg = /[<>&"'\x00]/g // eslint-disable-line no-control-regex
+  tmpl.encMap = {
+    '<': '&lt;',
+    '>': '&gt;',
+    '&': '&amp;',
+    '"': '&quot;',
+    "'": '&#39;'
+  }
+  tmpl.encode = function (s) {
+    // eslint-disable-next-line eqeqeq
+    return (s == null ? '' : '' + s).replace(tmpl.encReg, function (c) {
+      return tmpl.encMap[c] || ''
+    })
+  }
+  tmpl.arg = 'o'
+  tmpl.helper =
+    ",print=function(s,e){_s+=e?(s==null?'':s):_e(s);}" +
+    ',include=function(s,d){_s+=tmpl(s,d);}'
+  if (typeof define === 'function' && define.amd) {
+    define(function () {
+      return tmpl
+    })
+  } else if (typeof module === 'object' && module.exports) {
+    module.exports = tmpl
+  } else {
+    $.tmpl = tmpl
+  }
+})(this)
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js
new file mode 100644
index 0000000000000..f8fec2a542ef5
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js
@@ -0,0 +1,2 @@
+!function(e){"use strict";var r=function(e,n){var t=/[^\w\-.:]/.test(e)?new Function(r.arg+",tmpl","var _e=tmpl.encode"+r.helper+",_s='"+e.replace(r.regexp,r.func)+"';return _s;"):r.cache[e]=r.cache[e]||r(r.load(e));return n?t(n,r):function(e){return t(e,r)}};r.cache={},r.load=function(e){return document.getElementById(e).innerHTML},r.regexp=/([\s'\\])(?!(?:[^{]|\{(?!%))*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,r.func=function(e,n,t,r,c,u){return n?{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[n]||"\\"+n:t?"="===t?"'+_e("+r+")+'":"'+("+r+"==null?'':"+r+")+'":c?"';":u?"_s+='":void 0},r.encReg=/[<>&"'\x00]/g,r.encMap={"<":"&lt;",">":"&gt;","&":"&amp;",'"':"&quot;","'":"&#39;"},r.encode=function(e){return(null==e?"":""+e).replace(r.encReg,function(e){return r.encMap[e]||""})},r.arg="o",r.helper=",print=function(s,e){_s+=e?(s==null?'':s):_e(s);},include=function(s,d){_s+=tmpl(s,d);}","function"==typeof define&&define.amd?define(function(){return r}):"object"==typeof module&&module.exports?module.exports=r:e.tmpl=r}(this);
+//# sourceMappingURL=tmpl.min.js.map
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map
new file mode 100644
index 0000000000000..1c55780228b23
--- /dev/null
+++ b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["tmpl.js"],"names":["$","tmpl","str","data","f","test","Function","arg","helper","replace","regexp","func","cache","load","id","document","getElementById","innerHTML","s","p1","p2","p3","p4","p5","\n","\r","\t"," ","encReg","encMap","<",">","&","\"","'","encode","c","define","amd","module","exports","this"],"mappings":"CAkBC,SAAWA,gBAEV,IAAIC,EAAO,SAAUC,EAAKC,GACxB,IAAIC,EAAK,YAAYC,KAAKH,GAEtB,IAAII,SACFL,EAAKM,IAAM,QACX,qBACEN,EAAKO,OACL,QACAN,EAAIO,QAAQR,EAAKS,OAAQT,EAAKU,MAC9B,gBAPHV,EAAKW,MAAMV,GAAOD,EAAKW,MAAMV,IAAQD,EAAKA,EAAKY,KAAKX,IASzD,OAAOC,EACHC,EAAED,EAAMF,GACR,SAAUE,GACR,OAAOC,EAAED,EAAMF,KAGvBA,EAAKW,MAAQ,GACbX,EAAKY,KAAO,SAAUC,GACpB,OAAOC,SAASC,eAAeF,GAAIG,WAErChB,EAAKS,OAAS,2EACdT,EAAKU,KAAO,SAAUO,EAAGC,EAAIC,EAAIC,EAAIC,EAAIC,GACvC,OAAIJ,EAGA,CACEK,KAAM,MACNC,KAAM,MACNC,KAAM,MACNC,IAAK,KACLR,IAAO,KAAOA,EAGhBC,EAES,MAAPA,EACK,QAAUC,EAAK,MAEjB,MAAQA,EAAK,aAAeA,EAAK,MAEtCC,EAEK,KAELC,EAEK,aAFT,GAKFtB,EAAK2B,OAAS,eACd3B,EAAK4B,OAAS,CACZC,IAAK,OACLC,IAAK,OACLC,IAAK,QACLC,IAAK,SACLC,IAAK,SAEPjC,EAAKkC,OAAS,SAAUjB,GAEtB,OAAa,MAALA,EAAY,GAAK,GAAKA,GAAGT,QAAQR,EAAK2B,OAAQ,SAAUQ,GAC9D,OAAOnC,EAAK4B,OAAOO,IAAM,MAG7BnC,EAAKM,IAAM,IACXN,EAAKO,OACH,0FAEoB,mBAAX6B,QAAyBA,OAAOC,IACzCD,OAAO,WACL,OAAOpC,IAEkB,iBAAXsC,QAAuBA,OAAOC,QAC9CD,OAAOC,QAAUvC,EAEjBD,EAAEC,KAAOA,EA7EZ,CA+EEwC"}
\ No newline at end of file

From 1acef34f46af395e2ab868d05c50ed7c5fe37009 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 10 Jun 2020 21:19:45 -0500
Subject: [PATCH 034/671] MC-34467: Updated jQuery File Upload plugin

- Updated file-uploader dependency
- Fixed static test failure
---
 .../view/adminhtml/web/js/new-video-dialog.js             | 7 ++++++-
 lib/web/jquery/fileUploader/jquery.fileupload-ui.js       | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
index 9cc731dde4b0c..066cfb88ad959 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -580,7 +580,12 @@ define([
          * @private
          */
         _onImageLoaded: function (result, file, oldFile, callback) {
-            var data = JSON.parse(result);
+            var data;
+            try {
+                data = JSON.parse(result);
+            } catch (e) {
+                data = result;
+            }
 
             if (this.element.find('#video_url').parent().find('.image-upload-error').length > 0) {
                 this.element.find('.image-upload-error').remove();
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
index caacf95c507bb..8d56075e2ee15 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
@@ -21,7 +21,8 @@
       'jquery/fileUploader/jquery.fileupload-image',
       'jquery/fileUploader/jquery.fileupload-audio',
       'jquery/fileUploader/jquery.fileupload-video',
-      'jquery/fileUploader/jquery.fileupload-validate'
+      'jquery/fileUploader/jquery.fileupload-validate',
+        'jquery/fileUploader/jquery.iframe-transport',
     ], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
@@ -31,7 +32,8 @@
       require('jquery/fileUploader/jquery.fileupload-image'),
       require('jquery/fileUploader/jquery.fileupload-audio'),
       require('jquery/fileUploader/jquery.fileupload-video'),
-      require('jquery/fileUploader/jquery.fileupload-validate')
+      require('jquery/fileUploader/jquery.fileupload-validate'),
+      require('jquery/fileUploader/jquery.iframe-transport')
     );
   } else {
     // Browser globals:
@@ -725,7 +727,7 @@
     _initSpecialOptions: function () {
       this._super();
       this._initFilesContainer();
-      this._initTemplates();
+      // this._initTemplates();
     },
 
     _create: function () {

From 810fcb5d3d2d7e15f9200925a1de179e6651561b Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 10 Jun 2020 23:22:28 -0500
Subject: [PATCH 035/671] MC-34467: Updated jQuery File Upload plugin

- Updated file-uploader dependency
- Fixed static test failure
---
 .../ProductVideo/view/adminhtml/web/js/new-video-dialog.js      | 1 +
 app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js       | 2 +-
 app/code/Magento/Theme/view/base/requirejs-config.js            | 2 +-
 app/code/Magento/User/view/adminhtml/web/app-config.js          | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
index 066cfb88ad959..562bff2e1d472 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -581,6 +581,7 @@ define([
          */
         _onImageLoaded: function (result, file, oldFile, callback) {
             var data;
+
             try {
                 data = JSON.parse(result);
             } catch (e) {
diff --git a/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js b/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js
index 216d68b29e1fd..bbcb8d0efaaf9 100644
--- a/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js
+++ b/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js
@@ -5,7 +5,7 @@
  */
 
 require([
-    'jquery/fileUploader/jquery.fileupload-ui',
+    'jquery/fileUploader/jquery.fileupload-image',
     'mage/adminhtml/browser',
     'Magento_Theme/js/form'
 ]);
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index cba1b3307407b..80a0eedacd0ea 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -31,7 +31,7 @@ var config = {
     'paths': {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-ui',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-image',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index f5c8cb9dd19c8..4eb16c587ef16 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -26,7 +26,7 @@ require.config({
         'jquery/ui': 'jquery/jquery-ui-1.9.2',
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-ui',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-image',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',

From 615f251b01f244d4b81ee30a53e62fa00a96ebec Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Wed, 10 Jun 2020 23:25:23 -0500
Subject: [PATCH 036/671] MC-34467: Updated jQuery File Upload plugin

- Reverted incorrect bootstrap dependency
---
 app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js b/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js
index bbcb8d0efaaf9..216d68b29e1fd 100644
--- a/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js
+++ b/app/code/Magento/Theme/view/adminhtml/web/js/bootstrap.js
@@ -5,7 +5,7 @@
  */
 
 require([
-    'jquery/fileUploader/jquery.fileupload-image',
+    'jquery/fileUploader/jquery.fileupload-ui',
     'mage/adminhtml/browser',
     'Magento_Theme/js/form'
 ]);

From 0c4bf0216d485e2eb32a6bd5e704b41b287c78da Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 11 Jun 2020 13:02:19 -0500
Subject: [PATCH 037/671] MC-34467: Updated jQuery File Upload plugin

- Updated customer fileuploader script
- Updated media-uploader to correctly use the new format
---
 .../view/adminhtml/web/js/media-uploader.js   | 12 +++----
 .../Theme/view/base/requirejs-config.js       |  2 +-
 .../User/view/adminhtml/web/app-config.js     |  2 +-
 .../fileUploader/jquery.fileupload-ui.js      |  6 ++--
 .../fileUploader/jquery.fileuploader.js       | 33 +++++++++++++++++++
 5 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 lib/web/jquery/fileUploader/jquery.fileuploader.js

diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
index 119e7a35747cb..4667d550c2e44 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
@@ -37,14 +37,14 @@ define([
                 progressTmpl = mageTemplate('[data-template="uploader"]'),
                 isResizeEnabled = this.options.isResizeEnabled,
                 resizeConfiguration = {
-                    action: 'resize',
+                    action: 'resizeImage',
                     maxWidth: this.options.maxWidth,
                     maxHeight: this.options.maxHeight
                 };
 
             if (!isResizeEnabled) {
                 resizeConfiguration = {
-                    action: 'resize'
+                    action: 'resizeImage',
                 };
             }
 
@@ -131,13 +131,13 @@ define([
             });
 
             this.element.find('input[type=file]').fileupload('option', {
-                process: [{
-                    action: 'load',
-                    fileTypes: /^image\/(gif|jpeg|png)$/
+                processQueue: [{
+                    action: 'loadImage',
+                    fileTypes: /^image\/(gif|jpeg|png)$/,
                 },
                 resizeConfiguration,
                 {
-                    action: 'save'
+                    action: 'saveImage',
                 }]
             });
         }
diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
index 80a0eedacd0ea..13fc1dc5882ba 100644
--- a/app/code/Magento/Theme/view/base/requirejs-config.js
+++ b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -31,7 +31,7 @@ var config = {
     'paths': {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-image',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',
diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
index 4eb16c587ef16..0567e95fcc6e9 100644
--- a/app/code/Magento/User/view/adminhtml/web/app-config.js
+++ b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -26,7 +26,7 @@ require.config({
         'jquery/ui': 'jquery/jquery-ui-1.9.2',
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
-        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-image',
+        'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',
diff --git a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
index 8d56075e2ee15..a4665f8392fe0 100644
--- a/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
+++ b/lib/web/jquery/fileUploader/jquery.fileupload-ui.js
@@ -21,8 +21,7 @@
       'jquery/fileUploader/jquery.fileupload-image',
       'jquery/fileUploader/jquery.fileupload-audio',
       'jquery/fileUploader/jquery.fileupload-video',
-      'jquery/fileUploader/jquery.fileupload-validate',
-        'jquery/fileUploader/jquery.iframe-transport',
+      'jquery/fileUploader/jquery.fileupload-validate'
     ], factory);
   } else if (typeof exports === 'object') {
     // Node/CommonJS:
@@ -32,8 +31,7 @@
       require('jquery/fileUploader/jquery.fileupload-image'),
       require('jquery/fileUploader/jquery.fileupload-audio'),
       require('jquery/fileUploader/jquery.fileupload-video'),
-      require('jquery/fileUploader/jquery.fileupload-validate'),
-      require('jquery/fileUploader/jquery.iframe-transport')
+      require('jquery/fileUploader/jquery.fileupload-validate')
     );
   } else {
     // Browser globals:
diff --git a/lib/web/jquery/fileUploader/jquery.fileuploader.js b/lib/web/jquery/fileUploader/jquery.fileuploader.js
new file mode 100644
index 0000000000000..4ec869ab4f470
--- /dev/null
+++ b/lib/web/jquery/fileUploader/jquery.fileuploader.js
@@ -0,0 +1,33 @@
+/**
+ * Custom Uploader
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* global define, require */
+
+(function (factory) {
+  'use strict';
+  if (typeof define === 'function' && define.amd) {
+    // Register as an anonymous AMD module:
+    define([
+      'jquery',
+      'jquery/fileUploader/jquery.fileupload-image',
+      'jquery/fileUploader/jquery.fileupload-audio',
+      'jquery/fileUploader/jquery.fileupload-video',
+      'jquery/fileUploader/jquery.iframe-transport',
+    ], factory);
+  } else if (typeof exports === 'object') {
+    // Node/CommonJS:
+    factory(
+      require('jquery'),
+      require('jquery/fileUploader/jquery.fileupload-image'),
+      require('jquery/fileUploader/jquery.fileupload-audio'),
+      require('jquery/fileUploader/jquery.fileupload-video'),
+      require('jquery/fileUploader/jquery.iframe-transport')
+    );
+  } else {
+    // Browser globals:
+    factory(window.jQuery);
+  }
+})();

From f3efb74485a7299566892ada3f4f0734f1228a36 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 11 Jun 2020 14:56:14 -0500
Subject: [PATCH 038/671] MC-34467: Updated jQuery File Upload plugin

- Fixed static test failures
---
 .../Magento/Backend/view/adminhtml/web/js/media-uploader.js     | 2 +-
 .../vendor/blueimp-load-image/js/load-image.all.min.js          | 2 --
 .../vendor/blueimp-load-image/js/load-image.all.min.js.map      | 1 -
 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js  | 2 --
 .../jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map  | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)
 delete mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js
 delete mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map
 delete mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js
 delete mode 100644 lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map

diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
index 4667d550c2e44..11cb80501d9c8 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
@@ -44,7 +44,7 @@ define([
 
             if (!isResizeEnabled) {
                 resizeConfiguration = {
-                    action: 'resizeImage',
+                    action: 'resizeImage'
                 };
             }
 
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js
deleted file mode 100644
index 8651c3489378a..0000000000000
--- a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(c){"use strict";var t=c.URL||c.webkitURL;function f(e){return!!t&&t.createObjectURL(e)}function i(e){return!!t&&t.revokeObjectURL(e)}function u(e,t){!e||"blob:"!==e.slice(0,5)||t&&t.noRevoke||i(e)}function d(e,t,i,a){if(!c.FileReader)return!1;var n=new FileReader;n.onload=function(){t.call(n,this.result)},i&&(n.onabort=n.onerror=function(){i.call(n,this.error)});var r=n[a||"readAsDataURL"];return r?(r.call(n,e),n):void 0}function g(e,t){return Object.prototype.toString.call(t)==="[object "+e+"]"}function m(s,e,l){function t(i,a){var n,r=document.createElement("img");function o(e,t){i!==a?e instanceof Error?a(e):((t=t||{}).image=e,i(t)):i&&i(e,t)}function e(e,t){t&&c.console&&console.log(t),e&&g("Blob",e)?n=f(s=e):(n=s,l&&l.crossOrigin&&(r.crossOrigin=l.crossOrigin)),r.src=n}return r.onerror=function(e){u(n,l),a&&a.call(r,e)},r.onload=function(){u(n,l);var e={originalWidth:r.naturalWidth||r.width,originalHeight:r.naturalHeight||r.height};try{m.transform(r,l,o,s,e)}catch(t){a&&a(t)}},"string"==typeof s?(m.requiresMetaData(l)?m.fetchBlob(s,e,l):e(),r):g("Blob",s)||g("File",s)?(n=f(s))?(r.src=n,r):d(s,function(e){r.src=e},a):void 0}return c.Promise&&"function"!=typeof e?(l=e,new Promise(t)):t(e,e)}m.requiresMetaData=function(e){return e&&e.meta},m.fetchBlob=function(e,t){t()},m.transform=function(e,t,i,a,n){i(e,n)},m.global=c,m.readFile=d,m.isInstanceOf=g,m.createObjectURL=f,m.revokeObjectURL=i,"function"==typeof define&&define.amd?define(function(){return m}):"object"==typeof module&&module.exports?module.exports=m:c.loadImage=m}("undefined"!=typeof window&&window||this),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):"object"==typeof module&&module.exports?e(require("./load-image")):e(window.loadImage)}(function(E){"use strict";var r=E.transform;E.createCanvas=function(e,t,i){if(i&&E.global.OffscreenCanvas)return new OffscreenCanvas(e,t);var a=document.createElement("canvas");return a.width=e,a.height=t,a},E.transform=function(e,t,i,a,n){r.call(E,E.scale(e,t,n),t,i,a,n)},E.transformCoordinates=function(){},E.getTransformedOptions=function(e,t){var i,a,n,r,o=t.aspectRatio;if(!o)return t;for(a in i={},t)Object.prototype.hasOwnProperty.call(t,a)&&(i[a]=t[a]);return i.crop=!0,o<(n=e.naturalWidth||e.width)/(r=e.naturalHeight||e.height)?(i.maxWidth=r*o,i.maxHeight=r):(i.maxWidth=n,i.maxHeight=n/o),i},E.drawImage=function(e,t,i,a,n,r,o,s,l){var c=t.getContext("2d");return!1===l.imageSmoothingEnabled?(c.msImageSmoothingEnabled=!1,c.imageSmoothingEnabled=!1):l.imageSmoothingQuality&&(c.imageSmoothingQuality=l.imageSmoothingQuality),c.drawImage(e,i,a,n,r,0,0,o,s),c},E.requiresCanvas=function(e){return e.canvas||e.crop||!!e.aspectRatio},E.scale=function(e,t,i){t=t||{},i=i||{};var a,n,r,o,s,l,c,f,u,d,g,m,h=e.getContext||E.requiresCanvas(t)&&!!E.global.HTMLCanvasElement,p=e.naturalWidth||e.width,A=e.naturalHeight||e.height,b=p,y=A;function S(){var e=Math.max((r||b)/b,(o||y)/y);1<e&&(b*=e,y*=e)}function v(){var e=Math.min((a||b)/b,(n||y)/y);e<1&&(b*=e,y*=e)}if(h&&(c=(t=E.getTransformedOptions(e,t,i)).left||0,f=t.top||0,t.sourceWidth?(s=t.sourceWidth,t.right!==undefined&&t.left===undefined&&(c=p-s-t.right)):s=p-c-(t.right||0),t.sourceHeight?(l=t.sourceHeight,t.bottom!==undefined&&t.top===undefined&&(f=A-l-t.bottom)):l=A-f-(t.bottom||0),b=s,y=l),a=t.maxWidth,n=t.maxHeight,r=t.minWidth,o=t.minHeight,h&&a&&n&&t.crop?(g=s/l-(b=a)/(y=n))<0?(l=n*s/a,t.top===undefined&&t.bottom===undefined&&(f=(A-l)/2)):0<g&&(s=a*l/n,t.left===undefined&&t.right===undefined&&(c=(p-s)/2)):((t.contain||t.cover)&&(r=a=a||r,o=n=n||o),t.cover?(v(),S()):(S(),v())),h){if(1<(u=t.pixelRatio)&&(!e.style.width||Math.floor(parseFloat(e.style.width,10))!==Math.floor(p/u))&&(b*=u,y*=u),E.orientationCropBug&&!e.getContext&&(c||f||s!==p||l!==A)&&(g=e,e=E.createCanvas(p,A,!0),E.drawImage(g,e,0,0,p,A,p,A,t)),0<(d=t.downsamplingRatio)&&d<1&&b<s&&y<l)for(;b<s*d;)m=E.createCanvas(s*d,l*d,!0),E.drawImage(e,m,c,f,s,l,m.width,m.height,t),f=c=0,s=m.width,l=m.height,e=m;return m=E.createCanvas(b,y),E.transformCoordinates(m,t,i),1<u&&(m.style.width=m.width/u+"px"),E.drawImage(e,m,c,f,s,l,b,y,t).setTransform(1,0,0,1,0,0),m}return e.width=b,e.height=y,e}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):"object"==typeof module&&module.exports?e(require("./load-image")):e(window.loadImage)}(function(o){"use strict";var s=o.global,l=o.transform,a=s.Blob&&(Blob.prototype.slice||Blob.prototype.webkitSlice||Blob.prototype.mozSlice),m=s.ArrayBuffer&&ArrayBuffer.prototype.slice||function(e,t){t=t||this.byteLength-e;var i=new Uint8Array(this,e,t),a=new Uint8Array(t);return a.set(i),a.buffer},h={jpeg:{65505:[],65517:[]}};function c(t,e,u,d){var g=this;function i(c,f){if(!(s.DataView&&a&&t&&12<=t.size&&"image/jpeg"===t.type))return c(d);var e=u.maxMetaDataSize||262144;o.readFile(a.call(t,0,e),function(e){var t=new DataView(e);if(65496!==t.getUint16(0))return f(new Error("Invalid JPEG file: Missing JPEG marker."));for(var i,a,n,r,o=2,s=t.byteLength-4,l=o;o<s&&(65504<=(i=t.getUint16(o))&&i<=65519||65534===i);){if(o+(a=t.getUint16(o+2)+2)>t.byteLength){console.log("Invalid JPEG metadata: Invalid segment size.");break}if((n=h.jpeg[i])&&!u.disableMetaDataParsers)for(r=0;r<n.length;r+=1)n[r].call(g,t,o,a,d,u);l=o+=a}!u.disableImageHead&&6<l&&(d.imageHead=m.call(e,0,l)),c(d)},f,"readAsArrayBuffer")||c(d)}return u=u||{},s.Promise&&"function"!=typeof e?(d=u=e||{},new Promise(i)):(d=d||{},i(e,e))}function n(e,t,i){return e&&t&&i?new Blob([i,a.call(e,t.byteLength)],{type:"image/jpeg"}):null}o.transform=function(t,i,a,n,r){o.requiresMetaData(i)?c(n,function(e){e!==r&&(s.console&&console.log(e),e=r),l.call(o,t,i,a,n,e)},i,r=r||{}):l.apply(o,arguments)},o.blobSlice=a,o.bufferSlice=m,o.replaceHead=function(t,i,a){var e={maxMetaDataSize:256,disableMetaDataParsers:!0};if(!a&&s.Promise)return c(t,e).then(function(e){return n(t,e.imageHead,i)});c(t,function(e){a(n(t,e.imageHead,i))},e)},o.parseMetaData=c,o.metaDataParsers=h}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):"object"==typeof module&&module.exports?e(require("./load-image")):e(window.loadImage)}(function(e){"use strict";var r=e.global;r.fetch&&r.Request&&r.Response&&r.Response.prototype.blob?e.fetchBlob=function(e,t,i){function a(e){return e.blob()}if(r.Promise&&"function"!=typeof t)return fetch(new Request(e,t)).then(a);fetch(new Request(e,i)).then(a).then(t)["catch"](function(e){t(null,e)})}:r.XMLHttpRequest&&""===(new XMLHttpRequest).responseType&&(e.fetchBlob=function(e,t,n){function i(t,i){n=n||{};var a=new XMLHttpRequest;a.open(n.method||"GET",e),n.headers&&Object.keys(n.headers).forEach(function(e){a.setRequestHeader(e,n.headers[e])}),a.withCredentials="include"===n.credentials,a.responseType="blob",a.onload=function(){t(a.response)},a.onerror=a.onabort=a.ontimeout=function(e){t===i?i(null,e):i(e)},a.send(n.body)}return r.Promise&&"function"!=typeof t?(n=t,new Promise(i)):i(t,t)})}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-scale","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-scale"),require("./load-image-meta")):e(window.loadImage)}(function(h){"use strict";var t,i,n=h.transform,a=h.requiresCanvas,r=h.requiresMetaData,f=h.transformCoordinates,p=h.getTransformedOptions;function o(e,t){var i=e&&e.orientation;return!0===i&&!h.orientation||1===i&&h.orientation||(!t||h.orientation)&&1<i&&i<9}function A(e,t){return e!==t&&(1===e&&1<t&&t<9||1<e&&e<9)}function b(e,t){if(1<t&&t<9)switch(e){case 2:case 4:return 4<t;case 5:case 7:return t%2==0;case 6:case 8:return 2===t||4===t||5===t||7===t}}(t=h).global.document&&((i=document.createElement("img")).onload=function(){var e;t.orientation=2===i.width&&3===i.height,t.orientation&&((e=t.createCanvas(1,1,!0).getContext("2d")).drawImage(i,1,1,1,1,0,0,1,1),t.orientationCropBug="255,255,255,255"!==e.getImageData(0,0,1,1).data.toString())},i.src="data:image/jpeg;base64,/9j/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAYAAAAAAAD/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAf/AABEIAAIAAwMBEQACEQEDEQH/xABRAAEAAAAAAAAAAAAAAAAAAAAKEAEBAQADAQEAAAAAAAAAAAAGBQQDCAkCBwEBAAAAAAAAAAAAAAAAAAAAABEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8AG8T9NfSMEVMhQvoP3fFiRZ+MTHDifa/95OFSZU5OzRzxkyejv8ciEfhSceSXGjS8eSdLnZc2HDm4M3BxcXwH/9k="),h.requiresCanvas=function(e){return o(e)||a.call(h,e)},h.requiresMetaData=function(e){return o(e,!0)||r.call(h,e)},h.transform=function(e,t,r,i,a){n.call(h,e,t,function(e,t){var i,a,n;!t||4<(i=h.orientation&&t.exif&&t.exif.get("Orientation"))&&i<9&&(a=t.originalWidth,n=t.originalHeight,t.originalWidth=n,t.originalHeight=a),r(e,t)},i,a)},h.getTransformedOptions=function(e,t,i){var a=p.call(h,e,t),n=i.exif&&i.exif.get("Orientation"),r=a.orientation,o=h.orientation&&n;if(!0===r&&(r=n),!A(r,o))return a;var s,l,c=a.top,f=a.right,u=a.bottom,d=a.left,g={};for(var m in a)Object.prototype.hasOwnProperty.call(a,m)&&(g[m]=a[m]);if((4<(g.orientation=r)&&!(4<o)||r<5&&4<o)&&(g.maxWidth=a.maxHeight,g.maxHeight=a.maxWidth,g.minWidth=a.minHeight,g.minHeight=a.minWidth,g.sourceWidth=a.sourceHeight,g.sourceHeight=a.sourceWidth),1<o){switch(o){case 2:f=a.left,d=a.right;break;case 3:c=a.bottom,f=a.left,u=a.top,d=a.right;break;case 4:c=a.bottom,u=a.top;break;case 5:c=a.left,f=a.bottom,u=a.right,d=a.top;break;case 6:c=a.left,f=a.top,u=a.right,d=a.bottom;break;case 7:c=a.right,f=a.top,u=a.left,d=a.bottom;break;case 8:c=a.right,f=a.bottom,u=a.left,d=a.top}b(r,o)&&(s=c,l=f,c=u,f=d,u=s,d=l)}switch(g.top=c,g.right=f,g.bottom=u,g.left=d,r){case 2:g.right=d,g.left=f;break;case 3:g.top=u,g.right=d,g.bottom=c,g.left=f;break;case 4:g.top=u,g.bottom=c;break;case 5:g.top=d,g.right=u,g.bottom=f,g.left=c;break;case 6:g.top=f,g.right=u,g.bottom=d,g.left=c;break;case 7:g.top=f,g.right=c,g.bottom=d,g.left=u;break;case 8:g.top=d,g.right=c,g.bottom=f,g.left=u}return g},h.transformCoordinates=function(e,t,i){f.call(h,e,t,i);var a=t.orientation,n=h.orientation&&i.exif&&i.exif.get("Orientation");if(A(a,n)){var r=e.getContext("2d"),o=e.width,s=e.height,l=o,c=s;switch((4<a&&!(4<n)||a<5&&4<n)&&(e.width=s,e.height=o),4<a&&(l=s,c=o),n){case 2:r.translate(l,0),r.scale(-1,1);break;case 3:r.translate(l,c),r.rotate(Math.PI);break;case 4:r.translate(0,c),r.scale(1,-1);break;case 5:r.rotate(-.5*Math.PI),r.scale(-1,1);break;case 6:r.rotate(-.5*Math.PI),r.translate(-l,0);break;case 7:r.rotate(-.5*Math.PI),r.translate(-l,c),r.scale(1,-1);break;case 8:r.rotate(.5*Math.PI),r.translate(0,-c)}switch(b(a,n)&&(r.translate(l,c),r.rotate(Math.PI)),a){case 2:r.translate(o,0),r.scale(-1,1);break;case 3:r.translate(o,s),r.rotate(Math.PI);break;case 4:r.translate(0,s),r.scale(1,-1);break;case 5:r.rotate(.5*Math.PI),r.scale(1,-1);break;case 6:r.rotate(.5*Math.PI),r.translate(0,-s);break;case 7:r.rotate(.5*Math.PI),r.translate(o,-s),r.scale(-1,1);break;case 8:r.rotate(-.5*Math.PI),r.translate(-o,0)}}}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(r){"use strict";function h(e){e&&(Object.defineProperty(this,"map",{value:this.ifds[e].map}),Object.defineProperty(this,"tags",{value:this.tags&&this.tags[e]||{}}))}h.prototype.ifds={ifd1:{name:"Thumbnail",map:h.prototype.map={Orientation:274,Thumbnail:"ifd1",Blob:513,Exif:34665,GPSInfo:34853,Interoperability:40965}},34665:{name:"Exif",map:{}},34853:{name:"GPSInfo",map:{}},40965:{name:"Interoperability",map:{}}},h.prototype.get=function(e){return this[e]||this[this.map[e]]};var m={1:{getValue:function(e,t){return e.getUint8(t)},size:1},2:{getValue:function(e,t){return String.fromCharCode(e.getUint8(t))},size:1,ascii:!0},3:{getValue:function(e,t,i){return e.getUint16(t,i)},size:2},4:{getValue:function(e,t,i){return e.getUint32(t,i)},size:4},5:{getValue:function(e,t,i){return e.getUint32(t,i)/e.getUint32(t+4,i)},size:8},9:{getValue:function(e,t,i){return e.getInt32(t,i)},size:4},10:{getValue:function(e,t,i){return e.getInt32(t,i)/e.getInt32(t+4,i)},size:8}};function p(e,t,i){return(!e||e[i])&&(!t||!0!==t[i])}function A(e,t,i,a,n,r,o,s){var l,c,f,u,d,g;if(i+6>e.byteLength)console.log("Invalid Exif data: Invalid directory offset.");else{if(!((c=i+2+12*(l=e.getUint16(i,a)))+4>e.byteLength)){for(f=0;f<l;f+=1)u=i+2+12*f,p(o,s,d=e.getUint16(u,a))&&(g=function(e,t,i,a,n,r){var o,s,l,c,f,u,d=m[a];if(d){if(!((s=4<(o=d.size*n)?t+e.getUint32(i+8,r):i+8)+o>e.byteLength)){if(1===n)return d.getValue(e,s,r);for(l=[],c=0;c<n;c+=1)l[c]=d.getValue(e,s+c*d.size,r);if(d.ascii){for(f="",c=0;c<l.length&&"\0"!==(u=l[c]);c+=1)f+=u;return f}return l}console.log("Invalid Exif data: Invalid data offset.")}else console.log("Invalid Exif data: Invalid tag type.")}(e,t,u,e.getUint16(u+2,a),e.getUint32(u+4,a),a),n[d]=g,r&&(r[d]=u));return e.getUint32(c,a)}console.log("Invalid Exif data: Invalid directory size.")}}m[7]=m[1],r.parseExifData=function(c,e,t,f,i){if(!i.disableExif){var u,a,n,d=i.includeExifTags,g=i.excludeExifTags||{34665:{37500:!0}},m=e+10;if(1165519206===c.getUint32(e+4))if(m+8>c.byteLength)console.log("Invalid Exif data: Invalid segment size.");else if(0===c.getUint16(e+8)){switch(c.getUint16(m)){case 18761:u=!0;break;case 19789:u=!1;break;default:return void console.log("Invalid Exif data: Invalid byte alignment marker.")}42===c.getUint16(m+2,u)?(a=c.getUint32(m+4,u),f.exif=new h,i.disableExifOffsets||(f.exifOffsets=new h,f.exifTiffOffset=m,f.exifLittleEndian=u),(a=A(c,m,m+a,u,f.exif,f.exifOffsets,d,g))&&p(d,g,"ifd1")&&(f.exif.ifd1=a,f.exifOffsets&&(f.exifOffsets.ifd1=m+a)),Object.keys(f.exif.ifds).forEach(function(e){var t,i,a,n,r,o,s,l;i=e,a=c,n=m,r=u,o=d,s=g,(l=(t=f).exif[i])&&(t.exif[i]=new h(i),t.exifOffsets&&(t.exifOffsets[i]=new h(i)),A(a,n,n+l,r,t.exif[i],t.exifOffsets&&t.exifOffsets[i],o&&o[i],s&&s[i]))}),(n=f.exif.ifd1)&&n[513]&&(n[513]=function(e,t,i){if(i){if(!(t+i>e.byteLength))return new Blob([r.bufferSlice.call(e.buffer,t,t+i)],{type:"image/jpeg"});console.log("Invalid Exif data: Invalid thumbnail data.")}}(c,m+n[513],n[514]))):console.log("Invalid Exif data: Missing TIFF marker.")}else console.log("Invalid Exif data: Missing byte alignment offset.")}},r.metaDataParsers.jpeg[65505].push(r.parseExifData),r.exifWriters={274:function(e,t,i){var a=t.exifOffsets[274];return a&&new DataView(e,a+8,2).setUint16(0,i,t.exifLittleEndian),e}},r.writeExifData=function(e,t,i,a){r.exifWriters[t.exif.map[i]](e,t,a)},r.ExifMap=h}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-exif"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-exif")):e(window.loadImage)}(function(e){"use strict";var n=e.ExifMap.prototype;n.tags={256:"ImageWidth",257:"ImageHeight",258:"BitsPerSample",259:"Compression",262:"PhotometricInterpretation",274:"Orientation",277:"SamplesPerPixel",284:"PlanarConfiguration",530:"YCbCrSubSampling",531:"YCbCrPositioning",282:"XResolution",283:"YResolution",296:"ResolutionUnit",273:"StripOffsets",278:"RowsPerStrip",279:"StripByteCounts",513:"JPEGInterchangeFormat",514:"JPEGInterchangeFormatLength",301:"TransferFunction",318:"WhitePoint",319:"PrimaryChromaticities",529:"YCbCrCoefficients",532:"ReferenceBlackWhite",306:"DateTime",270:"ImageDescription",271:"Make",272:"Model",305:"Software",315:"Artist",33432:"Copyright",34665:{36864:"ExifVersion",40960:"FlashpixVersion",40961:"ColorSpace",40962:"PixelXDimension",40963:"PixelYDimension",42240:"Gamma",37121:"ComponentsConfiguration",37122:"CompressedBitsPerPixel",37500:"MakerNote",37510:"UserComment",40964:"RelatedSoundFile",36867:"DateTimeOriginal",36868:"DateTimeDigitized",36880:"OffsetTime",36881:"OffsetTimeOriginal",36882:"OffsetTimeDigitized",37520:"SubSecTime",37521:"SubSecTimeOriginal",37522:"SubSecTimeDigitized",33434:"ExposureTime",33437:"FNumber",34850:"ExposureProgram",34852:"SpectralSensitivity",34855:"PhotographicSensitivity",34856:"OECF",34864:"SensitivityType",34865:"StandardOutputSensitivity",34866:"RecommendedExposureIndex",34867:"ISOSpeed",34868:"ISOSpeedLatitudeyyy",34869:"ISOSpeedLatitudezzz",37377:"ShutterSpeedValue",37378:"ApertureValue",37379:"BrightnessValue",37380:"ExposureBias",37381:"MaxApertureValue",37382:"SubjectDistance",37383:"MeteringMode",37384:"LightSource",37385:"Flash",37396:"SubjectArea",37386:"FocalLength",41483:"FlashEnergy",41484:"SpatialFrequencyResponse",41486:"FocalPlaneXResolution",41487:"FocalPlaneYResolution",41488:"FocalPlaneResolutionUnit",41492:"SubjectLocation",41493:"ExposureIndex",41495:"SensingMethod",41728:"FileSource",41729:"SceneType",41730:"CFAPattern",41985:"CustomRendered",41986:"ExposureMode",41987:"WhiteBalance",41988:"DigitalZoomRatio",41989:"FocalLengthIn35mmFilm",41990:"SceneCaptureType",41991:"GainControl",41992:"Contrast",41993:"Saturation",41994:"Sharpness",41995:"DeviceSettingDescription",41996:"SubjectDistanceRange",42016:"ImageUniqueID",42032:"CameraOwnerName",42033:"BodySerialNumber",42034:"LensSpecification",42035:"LensMake",42036:"LensModel",42037:"LensSerialNumber"},34853:{0:"GPSVersionID",1:"GPSLatitudeRef",2:"GPSLatitude",3:"GPSLongitudeRef",4:"GPSLongitude",5:"GPSAltitudeRef",6:"GPSAltitude",7:"GPSTimeStamp",8:"GPSSatellites",9:"GPSStatus",10:"GPSMeasureMode",11:"GPSDOP",12:"GPSSpeedRef",13:"GPSSpeed",14:"GPSTrackRef",15:"GPSTrack",16:"GPSImgDirectionRef",17:"GPSImgDirection",18:"GPSMapDatum",19:"GPSDestLatitudeRef",20:"GPSDestLatitude",21:"GPSDestLongitudeRef",22:"GPSDestLongitude",23:"GPSDestBearingRef",24:"GPSDestBearing",25:"GPSDestDistanceRef",26:"GPSDestDistance",27:"GPSProcessingMethod",28:"GPSAreaInformation",29:"GPSDateStamp",30:"GPSDifferential",31:"GPSHPositioningError"},40965:{1:"InteroperabilityIndex"}},n.tags.ifd1=n.tags,n.stringValues={ExposureProgram:{0:"Undefined",1:"Manual",2:"Normal program",3:"Aperture priority",4:"Shutter priority",5:"Creative program",6:"Action program",7:"Portrait mode",8:"Landscape mode"},MeteringMode:{0:"Unknown",1:"Average",2:"CenterWeightedAverage",3:"Spot",4:"MultiSpot",5:"Pattern",6:"Partial",255:"Other"},LightSource:{0:"Unknown",1:"Daylight",2:"Fluorescent",3:"Tungsten (incandescent light)",4:"Flash",9:"Fine weather",10:"Cloudy weather",11:"Shade",12:"Daylight fluorescent (D 5700 - 7100K)",13:"Day white fluorescent (N 4600 - 5400K)",14:"Cool white fluorescent (W 3900 - 4500K)",15:"White fluorescent (WW 3200 - 3700K)",17:"Standard light A",18:"Standard light B",19:"Standard light C",20:"D55",21:"D65",22:"D75",23:"D50",24:"ISO studio tungsten",255:"Other"},Flash:{0:"Flash did not fire",1:"Flash fired",5:"Strobe return light not detected",7:"Strobe return light detected",9:"Flash fired, compulsory flash mode",13:"Flash fired, compulsory flash mode, return light not detected",15:"Flash fired, compulsory flash mode, return light detected",16:"Flash did not fire, compulsory flash mode",24:"Flash did not fire, auto mode",25:"Flash fired, auto mode",29:"Flash fired, auto mode, return light not detected",31:"Flash fired, auto mode, return light detected",32:"No flash function",65:"Flash fired, red-eye reduction mode",69:"Flash fired, red-eye reduction mode, return light not detected",71:"Flash fired, red-eye reduction mode, return light detected",73:"Flash fired, compulsory flash mode, red-eye reduction mode",77:"Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",79:"Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",89:"Flash fired, auto mode, red-eye reduction mode",93:"Flash fired, auto mode, return light not detected, red-eye reduction mode",95:"Flash fired, auto mode, return light detected, red-eye reduction mode"},SensingMethod:{1:"Undefined",2:"One-chip color area sensor",3:"Two-chip color area sensor",4:"Three-chip color area sensor",5:"Color sequential area sensor",7:"Trilinear sensor",8:"Color sequential linear sensor"},SceneCaptureType:{0:"Standard",1:"Landscape",2:"Portrait",3:"Night scene"},SceneType:{1:"Directly photographed"},CustomRendered:{0:"Normal process",1:"Custom process"},WhiteBalance:{0:"Auto white balance",1:"Manual white balance"},GainControl:{0:"None",1:"Low gain up",2:"High gain up",3:"Low gain down",4:"High gain down"},Contrast:{0:"Normal",1:"Soft",2:"Hard"},Saturation:{0:"Normal",1:"Low saturation",2:"High saturation"},Sharpness:{0:"Normal",1:"Soft",2:"Hard"},SubjectDistanceRange:{0:"Unknown",1:"Macro",2:"Close view",3:"Distant view"},FileSource:{3:"DSC"},ComponentsConfiguration:{0:"",1:"Y",2:"Cb",3:"Cr",4:"R",5:"G",6:"B"},Orientation:{1:"Original",2:"Horizontal flip",3:"Rotate 180° CCW",4:"Vertical flip",5:"Vertical flip + Rotate 90° CW",6:"Rotate 90° CW",7:"Horizontal flip + Rotate 90° CW",8:"Rotate 90° CCW"}},n.getText=function(e){var t=this.get(e);switch(e){case"LightSource":case"Flash":case"MeteringMode":case"ExposureProgram":case"SensingMethod":case"SceneCaptureType":case"SceneType":case"CustomRendered":case"WhiteBalance":case"GainControl":case"Contrast":case"Saturation":case"Sharpness":case"SubjectDistanceRange":case"FileSource":case"Orientation":return this.stringValues[e][t];case"ExifVersion":case"FlashpixVersion":if(!t)return;return String.fromCharCode(t[0],t[1],t[2],t[3]);case"ComponentsConfiguration":if(!t)return;return this.stringValues[e][t[0]]+this.stringValues[e][t[1]]+this.stringValues[e][t[2]]+this.stringValues[e][t[3]];case"GPSVersionID":if(!t)return;return t[0]+"."+t[1]+"."+t[2]+"."+t[3]}return String(t)},n.getAll=function(){var e,t,i,a={};for(e in this)Object.prototype.hasOwnProperty.call(this,e)&&((t=this[e])&&t.getAll?a[this.ifds[e].name]=t.getAll():(i=this.tags[e])&&(a[i]=this.getText(i)));return a},n.getName=function(e){var t=this.tags[e];return"object"==typeof t?this.ifds[e].name:t},function(){var e,t,i,a=n.tags;for(e in a)if(Object.prototype.hasOwnProperty.call(a,e))if(t=n.ifds[e])for(e in i=a[e])Object.prototype.hasOwnProperty.call(i,e)&&(t.map[i[e]]=Number(e));else n.map[a[e]]=Number(e)}()}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(e){"use strict";function g(){}function m(e,t,i,a,n){return"binary"===t.types[e]?new Blob([i.buffer.slice(a,a+n)]):"Uint16"===t.types[e]?i.getUint16(a):function(e,t,i){for(var a="",n=t+i,r=t;r<n;r+=1)a+=String.fromCharCode(e.getUint8(r));return a}(i,a,n)}function h(e,t,i,a,n,r){for(var o,s,l,c,f,u=t+i,d=t;d<u;)28===e.getUint8(d)&&2===e.getUint8(d+1)&&(l=e.getUint8(d+2),n&&!n[l]||r&&r[l]||(s=e.getInt16(d+3),o=m(l,a.iptc,e,d+5,s),a.iptc[l]=(c=a.iptc[l],f=o,c===undefined?f:c instanceof Array?(c.push(f),c):[c,f]),a.iptcOffsets&&(a.iptcOffsets[l]=d))),d+=1}g.prototype.map={ObjectName:5},g.prototype.types={0:"Uint16",200:"Uint16",201:"Uint16",202:"binary"},g.prototype.get=function(e){return this[e]||this[this.map[e]]},e.parseIptcData=function(e,t,i,a,n){if(!n.disableIptc)for(var r,o,s,l,c=t+i;t+8<c;){if(l=t,943868237===(s=e).getUint32(l)&&1028===s.getUint16(l+4)){var f=(r=t,o=void 0,(o=e.getUint8(r+7))%2!=0&&(o+=1),0===o&&(o=4),o),u=t+8+f;if(c<u){console.log("Invalid IPTC data: Invalid segment offset.");break}var d=e.getUint16(t+6+f);if(c<t+d){console.log("Invalid IPTC data: Invalid segment size.");break}return a.iptc=new g,n.disableIptcOffsets||(a.iptcOffsets=new g),void h(e,u,d,a,n.includeIptcTags,n.excludeIptcTags||{202:!0})}t+=1}},e.metaDataParsers.jpeg[65517].push(e.parseIptcData),e.IptcMap=g}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-iptc"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-iptc")):e(window.loadImage)}(function(e){"use strict";var a=e.IptcMap.prototype;a.tags={0:"ApplicationRecordVersion",3:"ObjectTypeReference",4:"ObjectAttributeReference",5:"ObjectName",7:"EditStatus",8:"EditorialUpdate",10:"Urgency",12:"SubjectReference",15:"Category",20:"SupplementalCategories",22:"FixtureIdentifier",25:"Keywords",26:"ContentLocationCode",27:"ContentLocationName",30:"ReleaseDate",35:"ReleaseTime",37:"ExpirationDate",38:"ExpirationTime",40:"SpecialInstructions",42:"ActionAdvised",45:"ReferenceService",47:"ReferenceDate",50:"ReferenceNumber",55:"DateCreated",60:"TimeCreated",62:"DigitalCreationDate",63:"DigitalCreationTime",65:"OriginatingProgram",70:"ProgramVersion",75:"ObjectCycle",80:"Byline",85:"BylineTitle",90:"City",92:"Sublocation",95:"State",100:"CountryCode",101:"Country",103:"OriginalTransmissionReference",105:"Headline",110:"Credit",115:"Source",116:"CopyrightNotice",118:"Contact",120:"Caption",121:"LocalCaption",122:"Writer",125:"RasterizedCaption",130:"ImageType",131:"ImageOrientation",135:"LanguageIdentifier",150:"AudioType",151:"AudioSamplingRate",152:"AudioSamplingResolution",153:"AudioDuration",154:"AudioOutcue",184:"JobID",185:"MasterDocumentID",186:"ShortDocumentID",187:"UniqueDocumentID",188:"OwnerID",200:"ObjectPreviewFileFormat",201:"ObjectPreviewFileVersion",202:"ObjectPreviewData",221:"Prefs",225:"ClassifyState",228:"SimilarityIndex",230:"DocumentNotes",231:"DocumentHistory",232:"ExifCameraInfo",255:"CatalogSets"},a.stringValues={10:{0:"0 (reserved)",1:"1 (most urgent)",2:"2",3:"3",4:"4",5:"5 (normal urgency)",6:"6",7:"7",8:"8 (least urgent)",9:"9 (user-defined priority)"},75:{a:"Morning",b:"Both Morning and Evening",p:"Evening"},131:{L:"Landscape",P:"Portrait",S:"Square"}},a.getText=function(e){var t=this.get(e),i=this.map[e],a=this.stringValues[i];return a?a[t]:String(t)},a.getAll=function(){var e,t,i={};for(e in this)Object.prototype.hasOwnProperty.call(this,e)&&(t=this.tags[e])&&(i[t]=this.getText(t));return i},a.getName=function(e){return this.tags[e]},function(){var e,t=a.tags,i=a.map||{};for(e in t)Object.prototype.hasOwnProperty.call(t,e)&&(i[t[e]]=Number(e))}()});
-//# sourceMappingURL=load-image.all.min.js.map
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map b/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map
deleted file mode 100644
index 1d6d990b2c58c..0000000000000
--- a/lib/web/jquery/fileUploader/vendor/blueimp-load-image/js/load-image.all.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["load-image.js","load-image-scale.js","load-image-meta.js","load-image-fetch.js","load-image-orientation.js","load-image-exif.js","load-image-exif-map.js","load-image-iptc.js","load-image-iptc-map.js"],"names":["$","urlAPI","URL","webkitURL","createObjectURL","blob","revokeObjectURL","url","revokeHelper","options","slice","noRevoke","readFile","file","onload","onerror","method","FileReader","reader","call","this","result","onabort","error","readerMethod","isInstanceOf","type","obj","Object","prototype","toString","loadImage","callback","executor","resolve","reject","img","document","createElement","resolveWrapper","data","Error","image","fetchBlobCallback","err","console","log","crossOrigin","src","event","originalWidth","naturalWidth","width","originalHeight","naturalHeight","height","transform","requiresMetaData","fetchBlob","Promise","meta","global","define","amd","module","exports","window","factory","require","originalTransform","createCanvas","offscreen","OffscreenCanvas","canvas","scale","transformCoordinates","getTransformedOptions","newOptions","i","aspectRatio","hasOwnProperty","crop","maxWidth","maxHeight","drawImage","sourceX","sourceY","sourceWidth","sourceHeight","destWidth","destHeight","ctx","getContext","imageSmoothingEnabled","msImageSmoothingEnabled","imageSmoothingQuality","requiresCanvas","minWidth","minHeight","pixelRatio","downsamplingRatio","tmp","useCanvas","HTMLCanvasElement","scaleUp","Math","max","scaleDown","min","left","top","right","undefined","bottom","contain","cover","style","floor","parseFloat","orientationCropBug","setTransform","blobSlice","Blob","webkitSlice","mozSlice","bufferSlice","ArrayBuffer","begin","end","byteLength","arr1","Uint8Array","arr2","set","buffer","metaDataParsers","jpeg","65505","65517","parseMetaData","that","DataView","size","maxMetaDataSize","dataView","getUint16","markerBytes","markerLength","parsers","offset","maxOffset","headLength","disableMetaDataParsers","length","disableImageHead","imageHead","replaceJPEGHead","oldHead","newHead","apply","arguments","replaceHead","head","then","fetch","Request","Response","responseHandler","response","XMLHttpRequest","responseType","req","open","headers","keys","forEach","key","setRequestHeader","withCredentials","credentials","ontimeout","send","body","originalRequiresCanvas","originalRequiresMetaData","originalTransformCoordinates","originalGetTransformedOptions","requiresCanvasOrientation","withMetaData","orientation","requiresOrientationChange","autoOrientation","requiresRot180","getImageData","exif","get","opts","exifOrientation","tmpTop","tmpRight","translate","rotate","PI","ExifMap","tagCode","defineProperty","value","ifds","map","tags","ifd1","name","Orientation","Thumbnail","Exif","GPSInfo","Interoperability","34665","34853","40965","id","ExifTagTypes","1","getValue","dataOffset","getUint8","2","String","fromCharCode","ascii","3","littleEndian","4","getUint32","5","9","getInt32","10","shouldIncludeTag","includeTags","excludeTags","parseExifTags","tiffOffset","dirOffset","tagOffsets","tagsNumber","dirEndOffset","tagOffset","tagNumber","tagValue","tagSize","values","str","c","tagType","getExifValue","parseExifData","disableExif","thumbnailIFD","includeExifTags","excludeExifTags","37500","disableExifOffsets","exifOffsets","exifTiffOffset","exifLittleEndian","getExifThumbnail","push","exifWriters","274","orientationOffset","setUint16","writeExifData","ExifMapProto","256","257","258","259","262","277","284","530","531","282","283","296","273","278","279","513","514","301","318","319","529","532","306","270","271","272","305","315","33432","36864","40960","40961","40962","40963","42240","37121","37122","37510","40964","36867","36868","36880","36881","36882","37520","37521","37522","33434","33437","34850","34852","34855","34856","34864","34865","34866","34867","34868","34869","37377","37378","37379","37380","37381","37382","37383","37384","37385","37396","37386","41483","41484","41486","41487","41488","41492","41493","41495","41728","41729","41730","41985","41986","41987","41988","41989","41990","41991","41992","41993","41994","41995","41996","42016","42032","42033","42034","42035","42036","42037","0","6","7","8","11","12","13","14","15","16","17","18","19","20","21","22","23","24","25","26","27","28","29","30","31","stringValues","ExposureProgram","MeteringMode","255","LightSource","Flash","32","65","69","71","73","77","79","89","93","95","SensingMethod","SceneCaptureType","SceneType","CustomRendered","WhiteBalance","GainControl","Contrast","Saturation","Sharpness","SubjectDistanceRange","FileSource","ComponentsConfiguration","getText","getAll","prop","getName","ifd","subTags","Number","IptcMap","getTagValue","types","outstr","n","getStringValue","parseIptcTags","segmentOffset","segmentLength","newValue","segmentEnd","getInt16","iptc","Array","iptcOffsets","ObjectName","200","201","202","parseIptcData","disableIptc","headerLength","disableIptcOffsets","includeIptcTags","excludeIptcTags","IptcMapProto","35","37","38","40","42","45","47","50","55","60","62","63","70","75","80","85","90","92","100","101","103","105","110","115","116","118","120","121","122","125","130","131","135","150","151","152","153","154","184","185","186","187","188","221","225","228","230","231","232","a","b","p","L","P","S","stringValue"],"mappings":"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"}
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js
deleted file mode 100644
index f8fec2a542ef5..0000000000000
--- a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(e){"use strict";var r=function(e,n){var t=/[^\w\-.:]/.test(e)?new Function(r.arg+",tmpl","var _e=tmpl.encode"+r.helper+",_s='"+e.replace(r.regexp,r.func)+"';return _s;"):r.cache[e]=r.cache[e]||r(r.load(e));return n?t(n,r):function(e){return t(e,r)}};r.cache={},r.load=function(e){return document.getElementById(e).innerHTML},r.regexp=/([\s'\\])(?!(?:[^{]|\{(?!%))*%\})|(?:\{%(=|#)([\s\S]+?)%\})|(\{%)|(%\})/g,r.func=function(e,n,t,r,c,u){return n?{"\n":"\\n","\r":"\\r","\t":"\\t"," ":" "}[n]||"\\"+n:t?"="===t?"'+_e("+r+")+'":"'+("+r+"==null?'':"+r+")+'":c?"';":u?"_s+='":void 0},r.encReg=/[<>&"'\x00]/g,r.encMap={"<":"&lt;",">":"&gt;","&":"&amp;",'"':"&quot;","'":"&#39;"},r.encode=function(e){return(null==e?"":""+e).replace(r.encReg,function(e){return r.encMap[e]||""})},r.arg="o",r.helper=",print=function(s,e){_s+=e?(s==null?'':s):_e(s);},include=function(s,d){_s+=tmpl(s,d);}","function"==typeof define&&define.amd?define(function(){return r}):"object"==typeof module&&module.exports?module.exports=r:e.tmpl=r}(this);
-//# sourceMappingURL=tmpl.min.js.map
\ No newline at end of file
diff --git a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map b/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map
deleted file mode 100644
index 1c55780228b23..0000000000000
--- a/lib/web/jquery/fileUploader/vendor/blueimp-tmpl/js/tmpl.min.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["tmpl.js"],"names":["$","tmpl","str","data","f","test","Function","arg","helper","replace","regexp","func","cache","load","id","document","getElementById","innerHTML","s","p1","p2","p3","p4","p5","\n","\r","\t"," ","encReg","encMap","<",">","&","\"","'","encode","c","define","amd","module","exports","this"],"mappings":"CAkBC,SAAWA,gBAEV,IAAIC,EAAO,SAAUC,EAAKC,GACxB,IAAIC,EAAK,YAAYC,KAAKH,GAEtB,IAAII,SACFL,EAAKM,IAAM,QACX,qBACEN,EAAKO,OACL,QACAN,EAAIO,QAAQR,EAAKS,OAAQT,EAAKU,MAC9B,gBAPHV,EAAKW,MAAMV,GAAOD,EAAKW,MAAMV,IAAQD,EAAKA,EAAKY,KAAKX,IASzD,OAAOC,EACHC,EAAED,EAAMF,GACR,SAAUE,GACR,OAAOC,EAAED,EAAMF,KAGvBA,EAAKW,MAAQ,GACbX,EAAKY,KAAO,SAAUC,GACpB,OAAOC,SAASC,eAAeF,GAAIG,WAErChB,EAAKS,OAAS,2EACdT,EAAKU,KAAO,SAAUO,EAAGC,EAAIC,EAAIC,EAAIC,EAAIC,GACvC,OAAIJ,EAGA,CACEK,KAAM,MACNC,KAAM,MACNC,KAAM,MACNC,IAAK,KACLR,IAAO,KAAOA,EAGhBC,EAES,MAAPA,EACK,QAAUC,EAAK,MAEjB,MAAQA,EAAK,aAAeA,EAAK,MAEtCC,EAEK,KAELC,EAEK,aAFT,GAKFtB,EAAK2B,OAAS,eACd3B,EAAK4B,OAAS,CACZC,IAAK,OACLC,IAAK,OACLC,IAAK,QACLC,IAAK,SACLC,IAAK,SAEPjC,EAAKkC,OAAS,SAAUjB,GAEtB,OAAa,MAALA,EAAY,GAAK,GAAKA,GAAGT,QAAQR,EAAK2B,OAAQ,SAAUQ,GAC9D,OAAOnC,EAAK4B,OAAOO,IAAM,MAG7BnC,EAAKM,IAAM,IACXN,EAAKO,OACH,0FAEoB,mBAAX6B,QAAyBA,OAAOC,IACzCD,OAAO,WACL,OAAOpC,IAEkB,iBAAXsC,QAAuBA,OAAOC,QAC9CD,OAAOC,QAAUvC,EAEjBD,EAAEC,KAAOA,EA7EZ,CA+EEwC"}
\ No newline at end of file

From 1bfe3563de41541094fd62dfc0cba743d5e29c3f Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 11 Jun 2020 16:47:20 -0500
Subject: [PATCH 039/671] MC-34467: Updated jQuery File Upload plugin

- Fixed static test failures
---
 .../Magento/Backend/view/adminhtml/web/js/media-uploader.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
index 11cb80501d9c8..c22c1788cdd29 100644
--- a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
+++ b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
@@ -133,11 +133,11 @@ define([
             this.element.find('input[type=file]').fileupload('option', {
                 processQueue: [{
                     action: 'loadImage',
-                    fileTypes: /^image\/(gif|jpeg|png)$/,
+                    fileTypes: /^image\/(gif|jpeg|png)$/
                 },
                 resizeConfiguration,
                 {
-                    action: 'saveImage',
+                    action: 'saveImage'
                 }]
             });
         }

From 7e9ce4123551d95744aae702c3c119a7aba85336 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 12 Jun 2020 15:21:10 +0300
Subject: [PATCH 040/671] MC-34197: Admin user improvement

---
 app/code/Magento/Authorization/Model/Role.php      |  7 +++++++
 app/code/Magento/User/Model/User.php               | 14 +++++++++++---
 .../testsuite/Magento/User/Model/UserTest.php      |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
index fc32fbcaa2e98..c47e1d85bac16 100644
--- a/app/code/Magento/Authorization/Model/Role.php
+++ b/app/code/Magento/Authorization/Model/Role.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Authorization\Model;
 
+use Magento\User\Model\User;
+
 /**
  * Admin Role Model
  *
@@ -33,6 +35,11 @@ class Role extends \Magento\Framework\Model\AbstractModel
      */
     protected $_eventPrefix = 'authorization_roles';
 
+    /**
+     * @var string
+     */
+    protected $_cacheTag = User::CACHE_TAG;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index cd969bab27840..313f0cf0f2b90 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -65,6 +65,11 @@ class User extends AbstractModel implements StorageInterface, UserInterface
 
     const MESSAGE_ID_PASSWORD_EXPIRED = 'magento_user_password_expired';
 
+    /**
+     * Tag to use for user assigned role caching.
+     */
+    const CACHE_TAG = 'user_assigned_role';
+
     /**
      * Model event prefix
      *
@@ -150,9 +155,12 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     private $deploymentConfig;
 
     /**
-     * @var string
+     * @var array
      */
-    protected $_cacheTag = \Magento\Backend\Block\Menu::CACHE_TAGS;
+    protected $_cacheTag = [
+        \Magento\Backend\Block\Menu::CACHE_TAGS,
+        self::CACHE_TAG,
+    ];
 
     /**
      * @param \Magento\Framework\Model\Context $context
@@ -703,7 +711,7 @@ public function hasAssigned2Role($user)
             $this->_cacheManager->save(
                 $this->serializer->serialize($data),
                 'assigned_role_' . $userId,
-                [\Magento\Backend\Block\Menu::CACHE_TAGS]
+                [self::CACHE_TAG]
             );
         } else {
             $data = $this->serializer->unserialize($data);
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index feb50b60a8e4a..784dd6752da4c 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -332,7 +332,7 @@ public function testHasAssigned2Role()
         $this->assertArrayHasKey('role_id', $role[0]);
         $roles = $this->_model->getRoles();
         $this->_model->setRoleId(reset($roles))->deleteFromRole();
-        $this->cache->clean([\Magento\Backend\Block\Menu::CACHE_TAGS]);
+        $this->cache->clean([UserModel::CACHE_TAG]);
         $this->assertEmpty($this->_model->hasAssigned2Role($this->_model));
     }
 

From d28b1797c35729ee7f3c0c9f8e6cbf1e7c19981c Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Fri, 12 Jun 2020 16:13:09 +0300
Subject: [PATCH 041/671] MC-34197: Admin user improvement

---
 app/code/Magento/Authorization/Model/Role.php                   | 2 +-
 app/code/Magento/User/Model/User.php                            | 2 +-
 dev/tests/integration/testsuite/Magento/User/Model/UserTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
index c47e1d85bac16..df644ed024a05 100644
--- a/app/code/Magento/Authorization/Model/Role.php
+++ b/app/code/Magento/Authorization/Model/Role.php
@@ -38,7 +38,7 @@ class Role extends \Magento\Framework\Model\AbstractModel
     /**
      * @var string
      */
-    protected $_cacheTag = User::CACHE_TAG;
+    protected $_cacheTag = 'user_assigned_role';
 
     /**
      * @param \Magento\Framework\Model\Context $context
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 313f0cf0f2b90..829410a5c52be 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -68,7 +68,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
     /**
      * Tag to use for user assigned role caching.
      */
-    const CACHE_TAG = 'user_assigned_role';
+    private const CACHE_TAG = 'user_assigned_role';
 
     /**
      * Model event prefix
diff --git a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
index 784dd6752da4c..90b1706ed4e22 100644
--- a/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Model/UserTest.php
@@ -332,7 +332,7 @@ public function testHasAssigned2Role()
         $this->assertArrayHasKey('role_id', $role[0]);
         $roles = $this->_model->getRoles();
         $this->_model->setRoleId(reset($roles))->deleteFromRole();
-        $this->cache->clean([UserModel::CACHE_TAG]);
+        $this->cache->clean(['user_assigned_role']);
         $this->assertEmpty($this->_model->hasAssigned2Role($this->_model));
     }
 

From 18c2882b49a68026f6fbd7281f4ce34cb2ca753c Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@gmail.com>
Date: Mon, 15 Jun 2020 08:33:38 +0300
Subject: [PATCH 042/671] MC-34197: Admin user improvement

---
 app/code/Magento/Authorization/Model/Role.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
index df644ed024a05..96cf956afd1bc 100644
--- a/app/code/Magento/Authorization/Model/Role.php
+++ b/app/code/Magento/Authorization/Model/Role.php
@@ -5,8 +5,6 @@
  */
 namespace Magento\Authorization\Model;
 
-use Magento\User\Model\User;
-
 /**
  * Admin Role Model
  *

From 19220c2d03325f1e5273bda8b483e432f4a1efad Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Wed, 17 Jun 2020 16:54:36 +0300
Subject: [PATCH 043/671] MC-35207: Improve customer custom attribute value
 validation

---
 app/code/Magento/Store/etc/config.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Store/etc/config.xml b/app/code/Magento/Store/etc/config.xml
index 07e4c8b0b6529..d4dddbb6a7dfa 100644
--- a/app/code/Magento/Store/etc/config.xml
+++ b/app/code/Magento/Store/etc/config.xml
@@ -132,6 +132,8 @@
                     <shtml>shtml</shtml>
                     <phpt>phpt</phpt>
                     <pht>pht</pht>
+                    <svg>svg</svg>
+                    <xml>xml</xml>
                 </protected_extensions>
                 <public_files_valid_paths>
                     <protected>

From b7cc7f76979bf1ca9386b529f63a5082e0e4dec9 Mon Sep 17 00:00:00 2001
From: Oleksandr Gorkun <ogorkun@magento.com>
Date: Wed, 17 Jun 2020 11:44:21 -0500
Subject: [PATCH 044/671] MC-35233: Distance between buttons isn't present on
 the edit Shopping Cart page in the backend.

---
 .../Magento_AdvancedCheckout/web/css/source/_module.less    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_AdvancedCheckout/web/css/source/_module.less
index fbc429d3afa50..1a54ba92dc66a 100644
--- a/app/design/adminhtml/Magento/backend/Magento_AdvancedCheckout/web/css/source/_module.less
+++ b/app/design/adminhtml/Magento/backend/Magento_AdvancedCheckout/web/css/source/_module.less
@@ -28,10 +28,8 @@
 }
 
 .order-discounts {
-    .action-secondary {
-        + .action-secondary {
-            margin-right: @indent__s;
-        }
+    .action-secondary:not(:first-of-type) {
+        margin-right: @indent__s;
     }
 }
 

From 1f92e3dbf5dbafc1086002ed652a80b1f99db378 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 22 Jun 2020 10:59:01 +0300
Subject: [PATCH 045/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store.

---
 .../Controller/Adminhtml/Login/Login.php            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 7ccdcfe45e482..97efddaffb3a0 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -11,6 +11,7 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\Auth\Session;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
@@ -80,6 +81,11 @@ class Login extends Action implements HttpGetActionInterface
      */
     private $url;
 
+    /**
+     * @var Share
+     */
+    private $share;
+
     /**
      * @param Context $context
      * @param Session $authSession
@@ -90,6 +96,7 @@ class Login extends Action implements HttpGetActionInterface
      * @param SaveAuthenticationDataInterface $saveAuthenticationData ,
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      * @param Url $url
+     * @param Share $share
      */
     public function __construct(
         Context $context,
@@ -100,7 +107,8 @@ public function __construct(
         AuthenticationDataInterfaceFactory $authenticationDataFactory,
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
-        Url $url
+        Url $url,
+        Share $share
     ) {
         parent::__construct($context);
 
@@ -112,6 +120,7 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
+        $this->share = $share;
     }
 
     /**
@@ -149,6 +158,8 @@ public function execute(): ResultInterface
                 $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
                 return $resultRedirect->setPath('customer/index/edit', ['id' => $customerId]);
             }
+        } elseif ($this->share->isGlobalScope()) {
+            $storeId = (int)$this->storeManager->getDefaultStoreView()->getId();
         } else {
             $storeId = (int)$customer->getStoreId();
         }

From 80adcee1647860d788372b5c1714236fc338b244 Mon Sep 17 00:00:00 2001
From: Mark Berube <berube@adobe.com>
Date: Mon, 22 Jun 2020 15:09:39 -0500
Subject: [PATCH 046/671] MC-34174: adding sorting validation

---
 .../Listing/Columns/AttributeSetId.php        |   3 +-
 .../Ui/Component/Listing/Columns/Websites.php |   1 +
 .../Ui/Component/Listing/Columns/Column.php   |  13 +-
 .../Listing/Columns/AttributeSetIdTest.php    |  55 +++++++
 .../Component/Listing/Columns/ColumnTest.php  | 147 ++++++++++++++----
 .../Listing/Columns/WebsitesTest.php          |  85 ++++++++++
 6 files changed, 269 insertions(+), 35 deletions(-)
 create mode 100644 app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/AttributeSetIdTest.php
 create mode 100644 app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/WebsitesTest.php

diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php
index 5e9f7ba065be7..9dc5704673f01 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/AttributeSetId.php
@@ -8,7 +8,7 @@
 namespace Magento\Catalog\Ui\Component\Listing\Columns;
 
 /**
- * Attribute set listing column component
+ * AttributeSetId listing column component.
  */
 class AttributeSetId extends \Magento\Ui\Component\Listing\Columns\Column
 {
@@ -23,6 +23,7 @@ protected function applySorting()
             && !empty($sorting['field'])
             && !empty($sorting['direction'])
             && $sorting['field'] === $this->getName()
+            && in_array(strtoupper($sorting['direction']), ['ASC', 'DESC'], true)
         ) {
             $collection = $this->getContext()->getDataProvider()->getCollection();
             $collection->joinField(
diff --git a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
index c80b2663d1f69..eb3c63635b291 100644
--- a/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
+++ b/app/code/Magento/Catalog/Ui/Component/Listing/Columns/Websites.php
@@ -118,6 +118,7 @@ protected function applySorting()
             && !empty($sorting['field'])
             && !empty($sorting['direction'])
             && $sorting['field'] === $this->getName()
+            && in_array(strtoupper($sorting['direction']), ['ASC', 'DESC'], true)
         ) {
             /** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
             $collection = $this->getContext()->getDataProvider()->getCollection();
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Column.php b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
index e69658540c51f..a4abf7551c5ce 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Column.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
@@ -5,10 +5,10 @@
  */
 namespace Magento\Ui\Component\Listing\Columns;
 
-use Magento\Ui\Component\AbstractComponent;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\AbstractComponent;
 
 /**
  * @api
@@ -64,6 +64,7 @@ public function getComponentName()
      * Prepare component configuration
      *
      * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function prepare()
     {
@@ -97,18 +98,19 @@ public function prepare()
     }
 
     /**
-     * To prepare items of a column
+     * Prepares items of a column
      *
      * @param array $items
      * @return array
      */
-    public function prepareItems(array & $items)
+    public function prepareItems(array &$items)
     {
         return $items;
     }
 
     /**
-     * Add field to select
+     * Adds additional field to select object
+     *
      * @return void
      */
     protected function addFieldToSelect()
@@ -131,6 +133,7 @@ protected function applySorting()
             && !empty($sorting['field'])
             && !empty($sorting['direction'])
             && $sorting['field'] === $this->getName()
+            && in_array(strtoupper($sorting['direction']), ['ASC', 'DESC'], true)
         ) {
             $this->getContext()->getDataProvider()->addOrder(
                 $this->getName(),
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/AttributeSetIdTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/AttributeSetIdTest.php
new file mode 100644
index 0000000000000..50515105e82ae
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/AttributeSetIdTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Ui\Test\Unit\Component\Listing\Columns;
+
+use Magento\Catalog\Ui\Component\Listing\Columns\AttributeSetId;
+use Magento\Framework\DB\Select;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+
+/**
+ * Testing for the AttributeSetID UI column
+ */
+class AttributeSetIdTest extends ColumnTest
+{
+    /**
+     * @var string
+     */
+    protected $columnClass = AttributeSetId::class;
+
+    /**
+     * @inheritDoc
+     */
+    public function testPrepare()
+    {
+        $collectionMock = $this->getMockBuilder(AbstractCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $selectMock = $this->createMock(Select::class);
+
+        $selectMock->expects($this->once())
+            ->method('order')
+            ->with('attribute_set_name asc');
+
+        $this->dataProviderMock = $this->getMockBuilder(DataProviderInterface::class)
+            ->addMethods(['getCollection', 'getSelect'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->dataProviderMock->expects($this->once())
+            ->method('getCollection')
+            ->willReturn($collectionMock);
+
+        $collectionMock->expects($this->once())
+            ->method('getSelect')
+            ->willReturn($selectMock);
+
+        parent::testPrepare();
+    }
+}
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php
index 0bade901361a3..fb0f9f215163b 100644
--- a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/ColumnTest.php
@@ -14,9 +14,11 @@
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Testing for generic UI column classes & for custom ones such as Websites
+ */
 class ColumnTest extends TestCase
 {
     /**
@@ -29,6 +31,23 @@ class ColumnTest extends TestCase
      */
     protected $objectManager;
 
+    /**
+     * @var UiComponentFactory
+     */
+    protected $uiComponentFactoryMock;
+
+    protected $dataProviderMock;
+
+    /**
+     * @var string
+     */
+    protected $columnClass = Column::class;
+
+    /**
+     * @var string
+     */
+    protected $columnName = Column::NAME;
+
     /**
      * Set up
      */
@@ -45,6 +64,8 @@ protected function setUp(): void
             true,
             []
         );
+
+        $this->uiComponentFactoryMock = $this->createMock(UiComponentFactory::class);
     }
 
     /**
@@ -56,7 +77,7 @@ public function testGetComponentName()
     {
         $this->contextMock->expects($this->never())->method('getProcessor');
         $column = $this->objectManager->getObject(
-            Column::class,
+            $this->columnClass,
             [
                 'context' => $this->contextMock,
                 'data' => [
@@ -70,7 +91,7 @@ public function testGetComponentName()
             ]
         );
 
-        $this->assertEquals($column->getComponentName(), Column::NAME . '.testType');
+        $this->assertEquals($column->getComponentName(), $this->columnName . '.testType');
     }
 
     /**
@@ -82,7 +103,7 @@ public function testPrepareItems()
     {
         $testItems = ['item1','item2', 'item3'];
         $column = $this->objectManager->getObject(
-            Column::class,
+            $this->columnClass,
             ['context' => $this->contextMock]
         );
 
@@ -92,57 +113,70 @@ public function testPrepareItems()
     /**
      * Run test prepare method
      *
+     * @param null $dataProviderMock
      * @return void
      */
     public function testPrepare()
     {
-        $processor = $this->getMockBuilder(Processor::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->contextMock->expects($this->atLeastOnce())->method('getProcessor')->willReturn($processor);
         $data = [
             'name' => 'test_name',
             'js_config' => ['extends' => 'test_config_extends'],
             'config' => ['dataType' => 'test_type', 'sortable' => true]
         ];
 
-        /** @var UiComponentFactory|MockObject $uiComponentFactoryMock */
-        $uiComponentFactoryMock = $this->createMock(UiComponentFactory::class);
+        /** @var Column $column */
+        $column = $this->objectManager->getObject(
+            $this->columnClass,
+            [
+                'context' => $this->contextMock,
+                'uiComponentFactory' => $this->uiComponentFactoryMock,
+                'data' => $data
+            ]
+        );
 
-        /** @var UiComponentInterface|MockObject $wrappedComponentMock */
+        /** @var UiComponentInterface|PHPUnit\Framework\MockObject\MockObject $wrappedComponentMock */
         $wrappedComponentMock = $this->getMockForAbstractClass(
             UiComponentInterface::class,
             [],
             '',
             false
         );
-        /** @var DataProviderInterface|MockObject $dataProviderMock */
-        $dataProviderMock = $this->getMockForAbstractClass(
-            DataProviderInterface::class,
-            [],
-            '',
-            false
-        );
+
+        if ($this->dataProviderMock === null) {
+            $this->dataProviderMock = $this->getMockForAbstractClass(
+                DataProviderInterface::class,
+                [],
+                '',
+                false
+            );
+
+            $this->dataProviderMock->expects($this->once())
+                ->method('addOrder')
+                ->with('test_name', 'ASC');
+        }
+
+        $processor = $this->getMockBuilder(Processor::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
+        $this->contextMock->expects($this->atLeastOnce())
+            ->method('getProcessor')
+            ->willReturn($processor);
         $this->contextMock->expects($this->atLeastOnce())
             ->method('getNamespace')
             ->willReturn('test_namespace');
         $this->contextMock->expects($this->atLeastOnce())
             ->method('getDataProvider')
-            ->willReturn($dataProviderMock);
+            ->willReturn($this->dataProviderMock);
         $this->contextMock->expects($this->atLeastOnce())
             ->method('getRequestParam')
             ->with('sorting')
             ->willReturn(['field' => 'test_name', 'direction' => 'asc']);
         $this->contextMock->expects($this->atLeastOnce())
             ->method('addComponentDefinition')
-            ->with(Column::NAME . '.test_type', ['extends' => 'test_config_extends']);
+            ->with($this->columnName . '.test_type', ['extends' => 'test_config_extends']);
 
-        $dataProviderMock->expects($this->once())
-            ->method('addOrder')
-            ->with('test_name', 'ASC');
-
-        $uiComponentFactoryMock->expects($this->once())
+        $this->uiComponentFactoryMock->expects($this->once())
             ->method('create')
             ->with('test_name', 'test_type', array_merge(['context' => $this->contextMock], $data))
             ->willReturn($wrappedComponentMock);
@@ -153,16 +187,71 @@ public function testPrepare()
         $wrappedComponentMock->expects($this->once())
             ->method('prepare');
 
-        /** @var Column $column */
+        $column->prepare();
+    }
+
+    /**
+     * Run a test on sorting function
+     *
+     * @param array $config
+     * @param string $direction
+     * @param int $numOfProviderCalls
+     * @throws \ReflectionException
+     *
+     * @dataProvider sortingDataProvider
+     */
+    public function testSorting(array $config, string $direction, int $numOfProviderCalls)
+    {
+        $data = [
+            'name' => 'test_name',
+            'config' => $config
+        ];
+
+        $this->dataProviderMock = $this->getMockForAbstractClass(
+            DataProviderInterface::class,
+            [],
+            '',
+            false
+        );
+
+        $this->dataProviderMock->expects($this->exactly($numOfProviderCalls))
+            ->method('addOrder')
+            ->with('test_name', $direction);
+
+        $this->contextMock->expects($this->atLeastOnce())
+            ->method('getRequestParam')
+            ->with('sorting')
+            ->willReturn(['field' => 'test_name', 'direction' => $direction]);
+
+        $this->contextMock->expects($this->exactly($numOfProviderCalls))
+            ->method('getDataProvider')
+            ->willReturn($this->dataProviderMock);
+
         $column = $this->objectManager->getObject(
-            Column::class,
+            $this->columnClass,
             [
                 'context' => $this->contextMock,
-                'uiComponentFactory' => $uiComponentFactoryMock,
+                'uiComponentFactory' => $this->uiComponentFactoryMock,
                 'data' => $data
             ]
         );
 
-        $column->prepare();
+        // get access to the method
+        $method = new \ReflectionMethod(
+            Column::class,
+            'applySorting'
+        );
+        $method->setAccessible(true);
+
+        $method->invokeArgs($column, []);
+    }
+
+    public function sortingDataProvider()
+    {
+        return [
+            [['dataType' => 'test_type', 'sortable' => true], 'ASC', 1],
+            [['dataType' => 'test_type', 'sortable' => false], 'ASC', 0],
+            [['dataType' => 'test_type', 'sortable' => true], 'foobar', 0]
+        ];
     }
 }
diff --git a/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/WebsitesTest.php b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/WebsitesTest.php
new file mode 100644
index 0000000000000..ba842f330b3b8
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Unit/Component/Listing/Columns/WebsitesTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types = 1);
+
+namespace Magento\Ui\Test\Unit\Component\Listing\Columns;
+
+use Magento\Catalog\Ui\Component\Listing\Columns\Websites;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\View\Element\UiComponent\DataProvider\DataProviderInterface;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
+
+/**
+ * Testing for the Websites UI column
+ */
+class WebsitesTest extends ColumnTest
+{
+    /**
+     * @var string
+     */
+    protected $columnClass = Websites::class;
+
+    /**
+     * @var string
+     */
+    protected $columnName = Websites::NAME;
+
+    /**
+     * @inheritDoc
+     */
+    public function testPrepare()
+    {
+        $collectionMock = $this->getMockBuilder(AbstractCollection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $selectMock = $this->createMock(Select::class);
+
+        $selectMock->expects($this->once())
+            ->method('order');
+
+        $selectMock->expects($this->once())
+            ->method('from')
+            ->willReturn($selectMock);
+
+        $selectMock->expects($this->atLeastOnce())
+            ->method('joinLeft')
+            ->willReturn($selectMock);
+
+        $selectMock->expects($this->once())
+            ->method('group');
+
+        $connectionMock = $this->createMock(AdapterInterface::class);
+
+        $connectionMock->expects($this->once())
+            ->method('select')
+            ->willReturn($selectMock);
+
+        $this->dataProviderMock = $this->getMockBuilder(DataProviderInterface::class)
+            ->addMethods(['getCollection', 'getSelect'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->dataProviderMock->expects($this->once())
+            ->method('getCollection')
+            ->willReturn($collectionMock);
+
+        $collectionMock->expects($this->once())
+            ->method('getConnection')
+            ->willReturn($connectionMock);
+
+        $collectionMock->expects($this->atLeastOnce())
+            ->method('getTable')
+            ->willReturn('test_table');
+
+        $collectionMock->expects($this->once())
+            ->method('getSelect')
+            ->willReturn($selectMock);
+
+        parent::testPrepare();
+    }
+}

From 3c1b606c230a0b709bb641369e423eb6fcdab081 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 23 Jun 2020 18:09:24 +0300
Subject: [PATCH 047/671] Added hashing for Login as Customer secret.

---
 .../GetAuthenticationDataBySecret.php             | 15 +++++++++++++--
 .../ResourceModel/SaveAuthenticationData.php      | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
index 078eb93405299..0b2577053acc6 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
@@ -8,8 +8,9 @@
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactory;
@@ -20,6 +21,11 @@
  */
 class GetAuthenticationDataBySecret implements GetAuthenticationDataBySecretInterface
 {
+    /**
+     * @var EncryptorInterface
+     */
+    private $encryptor;
+
     /**
      * @var ResourceConnection
      */
@@ -41,17 +47,20 @@ class GetAuthenticationDataBySecret implements GetAuthenticationDataBySecretInte
     private $authenticationDataFactory;
 
     /**
+     * @param EncryptorInterface $encryptor
      * @param ResourceConnection $resourceConnection
      * @param DateTime $dateTime
      * @param ConfigInterface $config
      * @param AuthenticationDataInterfaceFactory $authenticationDataFactory
      */
     public function __construct(
+        EncryptorInterface $encryptor,
         ResourceConnection $resourceConnection,
         DateTime $dateTime,
         ConfigInterface $config,
         AuthenticationDataInterfaceFactory $authenticationDataFactory
     ) {
+        $this->encryptor = $encryptor;
         $this->resourceConnection = $resourceConnection;
         $this->dateTime = $dateTime;
         $this->config = $config;
@@ -71,9 +80,11 @@ public function execute(string $secret): AuthenticationDataInterface
             $this->dateTime->gmtTimestamp() - $this->config->getAuthenticationDataExpirationTime()
         );
 
+        $hash = $this->encryptor->hash($secret);
+
         $select = $connection->select()
             ->from(['main_table' => $tableName])
-            ->where('main_table.secret = ?', $secret)
+            ->where('main_table.secret = ?', $hash)
             ->where('main_table.created_at > ?', $timePoint);
 
         $data = $connection->fetchRow($select);
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
index d120b0eae392e..8351441038641 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
@@ -8,8 +8,9 @@
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Math\Random;
+use Magento\Framework\Stdlib\DateTime\DateTime;
 use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
 use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
 
@@ -18,6 +19,11 @@
  */
 class SaveAuthenticationData implements SaveAuthenticationDataInterface
 {
+    /**
+     * @var EncryptorInterface
+     */
+    private $encryptor;
+
     /**
      * @var ResourceConnection
      */
@@ -34,15 +40,18 @@ class SaveAuthenticationData implements SaveAuthenticationDataInterface
     private $random;
 
     /**
+     * @param EncryptorInterface $encryptor
      * @param ResourceConnection $resourceConnection
      * @param DateTime $dateTime
      * @param Random $random
      */
     public function __construct(
+        EncryptorInterface $encryptor,
         ResourceConnection $resourceConnection,
         DateTime $dateTime,
         Random $random
     ) {
+        $this->encryptor = $encryptor;
         $this->resourceConnection = $resourceConnection;
         $this->dateTime = $dateTime;
         $this->random = $random;
@@ -57,16 +66,18 @@ public function execute(AuthenticationDataInterface $authenticationData): string
         $tableName = $this->resourceConnection->getTableName('login_as_customer');
 
         $secret = $this->random->getRandomString(64);
+        $hash = $this->encryptor->hash($secret);
 
         $connection->insert(
             $tableName,
             [
                 'customer_id' => $authenticationData->getCustomerId(),
                 'admin_id' => $authenticationData->getAdminId(),
-                'secret' => $secret,
+                'secret' => $hash,
                 'created_at' => $this->dateTime->gmtDate(),
             ]
         );
+
         return $secret;
     }
 }

From f51a7f656e438145b95e63dc1dd8176e2c3d6654 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Wed, 24 Jun 2020 14:49:34 -0500
Subject: [PATCH 048/671] MC-35076: Catalog Event Update.

---
 .../Block/Adminhtml/Import/Frame/Result.php   |   5 +-
 .../Controller/Adminhtml/ImportResult.php     |  14 ++-
 .../Adminhtml/Import/Frame/ResultTest.php     | 110 ++++++++++++++++++
 3 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php

diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
index acca62b4cb72e..0b9857edc53eb 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Frame/Result.php
@@ -102,7 +102,7 @@ public function addError($message)
                 $this->addError($row);
             }
         } else {
-            $this->_messages['error'][] = $message;
+            $this->_messages['error'][] = $this->escapeHtml($message);
         }
         return $this;
     }
@@ -140,7 +140,8 @@ public function addSuccess($message, $appendImportButton = false)
                 $this->addSuccess($row);
             }
         } else {
-            $this->_messages['success'][] = $message . ($appendImportButton ? $this->getImportButtonHtml() : '');
+            $escapedMessage = $this->escapeHtml($message);
+            $this->_messages['success'][] = $escapedMessage . ($appendImportButton ? $this->getImportButtonHtml() : '');
         }
         return $this;
     }
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php b/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
index 47210dd9805e5..6da90efa4592c 100644
--- a/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
+++ b/app/code/Magento/ImportExport/Controller/Adminhtml/ImportResult.php
@@ -56,6 +56,8 @@ public function __construct(
     }
 
     /**
+     * Add Error Messages for Import
+     *
      * @param \Magento\Framework\View\Element\AbstractBlock $resultBlock
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return $this
@@ -68,7 +70,7 @@ protected function addErrorMessages(
             $message = '';
             $counter = 0;
             foreach ($this->getErrorMessages($errorAggregator) as $error) {
-                $message .= ++$counter . '. ' . $error . '<br>';
+                $message .= (++$counter) . '. ' . $error . '<br>';
                 if ($counter >= self::LIMIT_ERRORS_MESSAGE) {
                     break;
                 }
@@ -88,7 +90,7 @@ protected function addErrorMessages(
                     . '<a href="'
                     . $this->createDownloadUrlImportHistoryFile($this->createErrorReport($errorAggregator))
                     . '">' . __('Download full report') . '</a><br>'
-                    . '<div class="import-error-list">' . $message . '</div></div>'
+                    . '<div class="import-error-list">' . $resultBlock->escapeHtml($message) . '</div></div>'
                 );
             } catch (\Exception $e) {
                 foreach ($this->getErrorMessages($errorAggregator) as $errorMessage) {
@@ -101,6 +103,8 @@ protected function addErrorMessages(
     }
 
     /**
+     * Get all Error Messages from Import Results
+     *
      * @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface $errorAggregator
      * @return array
      */
@@ -115,6 +119,8 @@ protected function getErrorMessages(ProcessingErrorAggregatorInterface $errorAgg
     }
 
     /**
+     * Get System Generated Exception
+     *
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError[]
      */
@@ -124,6 +130,8 @@ protected function getSystemExceptions(ProcessingErrorAggregatorInterface $error
     }
 
     /**
+     * Generate Error Report File
+     *
      * @param ProcessingErrorAggregatorInterface $errorAggregator
      * @return string
      */
@@ -141,6 +149,8 @@ protected function createErrorReport(ProcessingErrorAggregatorInterface $errorAg
     }
 
     /**
+     * Get Import History Url
+     *
      * @param string $fileName
      * @return string
      */
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php
new file mode 100644
index 0000000000000..218babc2b48f0
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ImportExport\Test\Unit\Block\Adminhtml\Import\Frame;
+
+use Magento\Framework\Escaper;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Magento\ImportExport\Block\Adminhtml\Import\Frame\Result;
+use Magento\Backend\Block\Template\Context;
+use Magento\Framework\Json\EncoderInterface;
+
+/**
+ * Unit test for Magento\ImportExport\Block\Adminhtml\Import\Frame\Result
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ResultTest extends TestCase
+{
+    /**
+     * @var Result
+     */
+    private $result;
+
+    /**
+     * @var EncoderInterface|MockObject
+     */
+    private $encoderMock;
+
+    /**
+     * @var Context|MockObject
+     */
+    private $contextMock;
+
+    /**
+     * @var Escaper|MockObject
+     */
+    private $escaperMock;
+
+    /**
+     * Initialize Class Dependencies
+     *
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->contextMock = $this->createMock(Context::class);
+        $this->encoderMock = $this->getMockBuilder(EncoderInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $this->escaperMock = $this->createPartialMock(Escaper::class, ['escapeHtml']);
+        $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+        $this->result = new Result(
+            $this->contextMock,
+            $this->encoderMock
+        );
+    }
+
+    /**
+     * Test error message
+     *
+     * @return void
+     */
+    public function testAddError(): void
+    {
+        $errors = ['first error', 'second error','third error'];
+        $this->escaperMock
+            ->expects($this->exactly(count($errors)))
+            ->method('escapeHtml')
+            ->willReturnOnConsecutiveCalls(...array_values($errors));
+
+        $this->result->addError($errors);
+        $this->assertEquals(count($errors), count($this->result->getMessages()['error']));
+    }
+
+    /**
+     * Test success message
+     *
+     * @return void
+     */
+    public function testAddSuccess(): void
+    {
+        $success = ['first message', 'second message','third message'];
+        $this->escaperMock
+            ->expects($this->exactly(count($success)))
+            ->method('escapeHtml')
+            ->willReturnOnConsecutiveCalls(...array_values($success));
+
+        $this->result->addSuccess($success);
+        $this->assertEquals(count($success), count($this->result->getMessages()['success']));
+    }
+
+    /**
+     * Test Add Notice message
+     *
+     * @return void
+     */
+    public function testAddNotice(): void
+    {
+        $notice = ['notice 1', 'notice 2','notice 3'];
+
+        $this->result->addNotice($notice);
+        $this->assertEquals(count($notice), count($this->result->getMessages()['notice']));
+    }
+}

From 0ec2c916c5c8cb6464b3ddd5f3b20b4e27e1f331 Mon Sep 17 00:00:00 2001
From: Johan Lindahl <johan.lindahl@ecomero.com>
Date: Mon, 29 Jun 2020 11:07:20 +0200
Subject: [PATCH 049/671] AppState emulateAreaCode was not respected by file
 collector

---
 lib/internal/Magento/Framework/View/File/Collector/Base.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/File/Collector/Base.php b/lib/internal/Magento/Framework/View/File/Collector/Base.php
index a5824b7321e84..f82ba6b0d7fab 100644
--- a/lib/internal/Magento/Framework/View/File/Collector/Base.php
+++ b/lib/internal/Magento/Framework/View/File/Collector/Base.php
@@ -65,7 +65,7 @@ public function getFiles(ThemeInterface $theme, $filePath)
         foreach ($sharedFiles as $file) {
             $result[] = $this->fileFactory->create($file->getFullPath(), $file->getComponentName(), null, true);
         }
-        $area = $theme->getData('area');
+        $area = $theme->getArea();
         $themeFiles = $this->componentDirSearch->collectFilesWithContext(
             ComponentRegistrar::MODULE,
             "view/{$area}/{$this->subDir}{$filePath}"

From 7660725eddb33e837a6286bfe131c0a96e209144 Mon Sep 17 00:00:00 2001
From: Guillaume Quintard <guillaume@varnish-software.com>
Date: Mon, 29 Jun 2020 19:01:56 -0700
Subject: [PATCH 050/671] [vcl] don't explicitly hash the host header

Hashing `req.http.host`/`client.ip` is already handled by the [built-in
vcl](https://github.com/varnishcache/varnish-cache/blob/6.0/bin/varnishd/builtin.vcl#L86)
so there's no need to repeat it explicitly.

It's also a bit confusing as `req.url` is not explicitly handled, even
though it's a more important hash input than the host.

note: all versions have been changed for the sake of consistency
but both the 4.x and 5.x series have been EOL'd a (long) while ago and users
should be encouraged to upgraded as soon as possible.
---
 app/code/Magento/PageCache/etc/varnish4.vcl | 7 -------
 app/code/Magento/PageCache/etc/varnish5.vcl | 7 -------
 app/code/Magento/PageCache/etc/varnish6.vcl | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index f5e25ce36e973..7ae857c54e67c 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -121,13 +121,6 @@ sub vcl_hash {
         hash_data(regsub(req.http.cookie, "^.*?X-Magento-Vary=([^;]+);*.*$", "\1"));
     }
 
-    # For multi site configurations to not cache each other's content
-    if (req.http.host) {
-        hash_data(req.http.host);
-    } else {
-        hash_data(server.ip);
-    }
-
     if (req.url ~ "/graphql") {
         call process_graphql_headers;
     }
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index 92bb3394486fc..7daa56c59fe63 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -122,13 +122,6 @@ sub vcl_hash {
         hash_data(regsub(req.http.cookie, "^.*?X-Magento-Vary=([^;]+);*.*$", "\1"));
     }
 
-    # For multi site configurations to not cache each other's content
-    if (req.http.host) {
-        hash_data(req.http.host);
-    } else {
-        hash_data(server.ip);
-    }
-
     # To make sure http users don't see ssl warning
     if (req.http./* {{ ssl_offloaded_header }} */) {
         hash_data(req.http./* {{ ssl_offloaded_header }} */);
diff --git a/app/code/Magento/PageCache/etc/varnish6.vcl b/app/code/Magento/PageCache/etc/varnish6.vcl
index eef5e99862538..d603a8fed3cea 100644
--- a/app/code/Magento/PageCache/etc/varnish6.vcl
+++ b/app/code/Magento/PageCache/etc/varnish6.vcl
@@ -122,13 +122,6 @@ sub vcl_hash {
         hash_data(regsub(req.http.cookie, "^.*?X-Magento-Vary=([^;]+);*.*$", "\1"));
     }
 
-    # For multi site configurations to not cache each other's content
-    if (req.http.host) {
-        hash_data(req.http.host);
-    } else {
-        hash_data(server.ip);
-    }
-
     # To make sure http users don't see ssl warning
     if (req.http./* {{ ssl_offloaded_header }} */) {
         hash_data(req.http./* {{ ssl_offloaded_header }} */);

From e72478890ecbd2296789551fd2f46927d69750fc Mon Sep 17 00:00:00 2001
From: Johan Lindahl <johan.lindahl@ecomero.com>
Date: Wed, 1 Jul 2020 17:29:56 +0200
Subject: [PATCH 051/671] Fixed broken unit test

---
 .../Framework/View/Test/Unit/File/Collector/BaseTest.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/BaseTest.php b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/BaseTest.php
index 0edafcb125dd3..ea0ef1cc69e87 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/BaseTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/File/Collector/BaseTest.php
@@ -85,8 +85,7 @@ public function testGetFiles()
             ->method('create')
             ->willReturn($this->createFileMock());
         $this->themeMock->expects($this->once())
-            ->method('getData')
-            ->with('area')
+            ->method('getArea')
             ->willReturn('frontend');
 
         $result = $this->fileCollector->getFiles($this->themeMock, '*.xml');

From 54a5d1bd9634f055927516bb950a97da4e223cb4 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 2 Jul 2020 14:11:04 +0300
Subject: [PATCH 052/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - updated.

---
 .../Controller/Adminhtml/Login/Login.php                     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 97efddaffb3a0..77eb63c59eaee 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -13,6 +13,7 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\Config\Share;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
@@ -108,7 +109,7 @@ public function __construct(
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
         Url $url,
-        Share $share
+        Share $share = null
     ) {
         parent::__construct($context);
 
@@ -120,7 +121,7 @@ public function __construct(
         $this->saveAuthenticationData = $saveAuthenticationData;
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
-        $this->share = $share;
+        $this->share = $share ?? ObjectManager::getInstance()->get(Share::class);
     }
 
     /**

From 27720600a0eca514bcce711e24db02be70f4e485 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 3 Jul 2020 08:58:19 +0300
Subject: [PATCH 053/671] Added hashing for Login as Customer secret - updated.

---
 .../GetAuthenticationDataBySecret.php         | 19 ++++++++++---------
 .../ResourceModel/SaveAuthenticationData.php  |  7 ++++---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
index 0b2577053acc6..0c417f78800a2 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
@@ -7,6 +7,7 @@
 
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Exception\LocalizedException;
@@ -21,11 +22,6 @@
  */
 class GetAuthenticationDataBySecret implements GetAuthenticationDataBySecretInterface
 {
-    /**
-     * @var EncryptorInterface
-     */
-    private $encryptor;
-
     /**
      * @var ResourceConnection
      */
@@ -47,24 +43,29 @@ class GetAuthenticationDataBySecret implements GetAuthenticationDataBySecretInte
     private $authenticationDataFactory;
 
     /**
-     * @param EncryptorInterface $encryptor
+     * @var EncryptorInterface
+     */
+    private $encryptor;
+
+    /**
      * @param ResourceConnection $resourceConnection
      * @param DateTime $dateTime
      * @param ConfigInterface $config
      * @param AuthenticationDataInterfaceFactory $authenticationDataFactory
+     * @param EncryptorInterface|null $encryptor
      */
     public function __construct(
-        EncryptorInterface $encryptor,
         ResourceConnection $resourceConnection,
         DateTime $dateTime,
         ConfigInterface $config,
-        AuthenticationDataInterfaceFactory $authenticationDataFactory
+        AuthenticationDataInterfaceFactory $authenticationDataFactory,
+        ?EncryptorInterface $encryptor = null
     ) {
-        $this->encryptor = $encryptor;
         $this->resourceConnection = $resourceConnection;
         $this->dateTime = $dateTime;
         $this->config = $config;
         $this->authenticationDataFactory = $authenticationDataFactory;
+        $this->encryptor = $encryptor ?? ObjectManager::getInstance()->get(EncryptorInterface::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
index 8351441038641..23d707d151487 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
@@ -7,6 +7,7 @@
 
 namespace Magento\LoginAsCustomer\Model\ResourceModel;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Encryption\EncryptorInterface;
 use Magento\Framework\Math\Random;
@@ -46,15 +47,15 @@ class SaveAuthenticationData implements SaveAuthenticationDataInterface
      * @param Random $random
      */
     public function __construct(
-        EncryptorInterface $encryptor,
         ResourceConnection $resourceConnection,
         DateTime $dateTime,
-        Random $random
+        Random $random,
+        ?EncryptorInterface $encryptor = null
     ) {
-        $this->encryptor = $encryptor;
         $this->resourceConnection = $resourceConnection;
         $this->dateTime = $dateTime;
         $this->random = $random;
+        $this->encryptor = $encryptor ?? ObjectManager::getInstance()->get(EncryptorInterface::class);
     }
 
     /**

From 8782b6c1ef0c72793dd731112fc0eb6c1bbc3735 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 7 Jul 2020 17:46:20 +0300
Subject: [PATCH 054/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - updated to use Store Groups.

---
 .../Block/Adminhtml/ConfirmationPopup.php     |   2 +-
 .../Component/ConfirmationPopup/Options.php   | 150 ++++++++++++++++++
 .../confirmation-popup/store-view-ptions.html |   8 +-
 3 files changed, 155 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
index e2d11b2c8cb80..aaec06e1f4a90 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
@@ -10,7 +10,7 @@
 use Magento\Backend\Block\Template;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
+use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup\Options as StoreOptions;
 
 /**
  * Login confirmation pop-up
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
new file mode 100644
index 0000000000000..424fbc3faa2fe
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup;
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Data\OptionSourceInterface;
+use Magento\Framework\Escaper;
+use Magento\Store\Model\System\Store as SystemStore;
+
+/**
+ * Store group options for Login As Customer confirmation pop-up.
+ */
+class Options implements OptionSourceInterface
+{
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepository;
+
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var Share
+     */
+    private $share;
+
+    /**
+     * @var SystemStore
+     */
+    private $systemStore;
+
+    /**
+     * @var array
+     */
+    private $options;
+
+    /**
+     * @param CustomerRepositoryInterface $customerRepository
+     * @param Escaper $escaper
+     * @param RequestInterface $request
+     * @param Share $share
+     * @param SystemStore $systemStore
+     */
+    public function __construct(
+        CustomerRepositoryInterface $customerRepository,
+        Escaper $escaper,
+        RequestInterface $request,
+        Share $share,
+        SystemStore $systemStore
+    ) {
+        $this->customerRepository = $customerRepository;
+        $this->escaper = $escaper;
+        $this->request = $request;
+        $this->share = $share;
+        $this->systemStore = $systemStore;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toOptionArray(): array
+    {
+        if ($this->options !== null) {
+            return $this->options;
+        }
+
+        $customerId = (int)$this->request->getParam('id');
+        $this->options = $this->generateCurrentOptions($customerId);
+
+        return $this->options;
+    }
+
+    /**
+     * Sanitize website/store option name.
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    private function sanitizeName(string $name): string
+    {
+        $matches = [];
+        preg_match('/\$[:]*{(.)*}/', $name, $matches);
+        if (count($matches) > 0) {
+            $name = $this->escaper->escapeHtml($this->escaper->escapeJs($name));
+        } else {
+            $name = $this->escaper->escapeHtml($name);
+        }
+
+        return $name;
+    }
+
+    /**
+     * Generate current options.
+     *
+     * @param int $customerId
+     * @return array
+     */
+    private function generateCurrentOptions(int $customerId): array
+    {
+        $options = [];
+        if ($customerId) {
+            $customer = $this->customerRepository->getById($customerId);
+            $customerWebsiteId = $customer->getWebsiteId();
+            $customerStoreId = $customer->getStoreId();
+            $isGlobalScope = $this->share->isGlobalScope();
+            $websiteCollection = $this->systemStore->getWebsiteCollection();
+            $groupCollection = $this->systemStore->getGroupCollection();
+            /** @var \Magento\Store\Model\Website $website */
+            foreach ($websiteCollection as $website) {
+                $groups = [];
+                /** @var \Magento\Store\Model\Group $group */
+                foreach ($groupCollection as $group) {
+                    if ($group->getWebsiteId() == $website->getId()) {
+                        $storeViewIds = $group->getStoreIds();
+                        if (!empty($storeViewIds)) {
+                            $name = $this->sanitizeName($group->getName());
+                            $groups[$name]['label'] = str_repeat(' ', 4) . $name;
+                            $groups[$name]['value'] = array_values($storeViewIds)[0];
+                            $groups[$name]['disabled'] = !$isGlobalScope && $customerWebsiteId !== $website->getId();
+                            $groups[$name]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
+                        }
+                    }
+                }
+                if (!empty($groups)) {
+                    $name = $this->sanitizeName($website->getName());
+                    $options[$name]['label'] = $name;
+                    $options[$name]['value'] = array_values($groups);
+                }
+            }
+        }
+
+        return $options;
+    }
+}
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
index ed1f991245e70..916a5583abe57 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
+++ b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
@@ -18,10 +18,10 @@
                     <% _.each(data.storeViewOptions, function(website) { %>
                     <optgroup label="<%= website.label %>"></optgroup>
                     <% _.each(website.value, function(group) { %>
-                    <optgroup label="<%= group.label %>"></optgroup>
-                    <% _.each(group.value, function(storeview) { %>
-                    <option value="<%= storeview.value %>"><%= storeview.label %></option>
-                    <% }); %>
+                    <option
+                    <% if(group.disabled){ %>disabled <% } %>
+                    <% if(group.selected){ %>selected <% } %>
+                    value="<%= group.value %>"><%= group.label %></option>
                     <% }); %>
                     <% }); %>
                 </select>

From 095606e0c884c66c28cc501af1189348a7fff6fb Mon Sep 17 00:00:00 2001
From: Dmytro Voskoboinikov <voskoboi@adobe.com>
Date: Tue, 7 Jul 2020 14:28:50 -0500
Subject: [PATCH 055/671] MC-34174: adding sorting validation

---
 .../testsuite/Magento/Customer/Api/CustomerRepositoryTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
index 4d0ca88ae237f..75e7fea036486 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -296,7 +296,7 @@ public function testDeleteCustomerNonAuthorized(): void
             $this->assertEquals(HTTPExceptionCodes::HTTP_UNAUTHORIZED, $e->getCode());
         }
         /** @var Customer $data */
-        $data = $this->_getCustomerData($customerData[Customer::ID]);
+        $data = $this->getCustomerData($customerData[Customer::ID]);
         $this->assertNotNull($data->getId());
     }
 

From ad85143801deb724aed15c484d735fe83c8ec274 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Wed, 8 Jul 2020 12:40:15 +0300
Subject: [PATCH 056/671] MC-35207: Improve customer custom attribute value
 validation

---
 .../testsuite/Magento/Customer/Api/CustomerRepositoryTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
index 4d0ca88ae237f..75e7fea036486 100644
--- a/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Customer/Api/CustomerRepositoryTest.php
@@ -296,7 +296,7 @@ public function testDeleteCustomerNonAuthorized(): void
             $this->assertEquals(HTTPExceptionCodes::HTTP_UNAUTHORIZED, $e->getCode());
         }
         /** @var Customer $data */
-        $data = $this->_getCustomerData($customerData[Customer::ID]);
+        $data = $this->getCustomerData($customerData[Customer::ID]);
         $this->assertNotNull($data->getId());
     }
 

From 62171192a3bb5256c1e5f4e0917415cd4c7f9b33 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 9 Jul 2020 13:15:13 +0300
Subject: [PATCH 057/671] MC-35758: Fix static test
 Magento.Test.Integrity.ComposerTest.testValidComposerJson after merging
 2.4-develop into 2.4.1-develop

---
 composer.lock | 195 +-------------------------------------------------
 1 file changed, 2 insertions(+), 193 deletions(-)

diff --git a/composer.lock b/composer.lock
index e5614cfd0ac99..b587f2a362e0c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f3674961f96b48fdd025a6c94610c8eb",
+    "content-hash": "92dbe431360d97af80030834b46dd77d",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -206,16 +206,6 @@
                 "ssl",
                 "tls"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-08T08:27:21+00:00"
         },
         {
@@ -462,12 +452,6 @@
                 "Xdebug",
                 "performance"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                }
-            ],
             "time": "2020-03-01T12:26:26+00:00"
         },
         {
@@ -3924,20 +3908,6 @@
                 "x.509",
                 "x509"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/terrafrost",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpseclib",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-04T23:17:33+00:00"
         },
         {
@@ -4474,20 +4444,6 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
@@ -4666,20 +4622,6 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-30T20:35:19+00:00"
         },
         {
@@ -4729,20 +4671,6 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
@@ -5939,12 +5867,6 @@
                 "functional testing",
                 "unit testing"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-05-24T13:58:47+00:00"
         },
         {
@@ -6517,20 +6439,6 @@
                 "redis",
                 "xcache"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-27T16:24:54+00:00"
         },
         {
@@ -6654,20 +6562,6 @@
                 "constructor",
                 "instantiate"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-29T17:27:14+00:00"
         },
         {
@@ -6730,20 +6624,6 @@
                 "parser",
                 "php"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-25T17:44:05+00:00"
         },
         {
@@ -9855,20 +9735,6 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-27T08:34:37+00:00"
         },
         {
@@ -9930,20 +9796,6 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-24T12:18:07+00:00"
         },
         {
@@ -10007,20 +9859,6 @@
                 "mime",
                 "mime-type"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-25T12:33:44+00:00"
         },
         {
@@ -10196,20 +10034,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-12T16:47:27+00:00"
         },
         {
@@ -10323,20 +10147,6 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
@@ -10727,6 +10537,5 @@
         "ext-zip": "*",
         "lib-libxml": "*"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

From de13944bfce410f7c65ab77900839e4997a3d5a9 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 9 Jul 2020 11:52:05 +0300
Subject: [PATCH 058/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - login to correct Store View.

---
 .../Controller/Adminhtml/Login/Login.php      | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 77eb63c59eaee..e3ef361d11743 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -26,6 +26,7 @@
 use Magento\LoginAsCustomerApi\Api\DeleteAuthenticationDataForUserInterface;
 use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\StoreSwitcher\ManageStoreCookie;
 
 /**
  * Login as customer action
@@ -87,6 +88,11 @@ class Login extends Action implements HttpGetActionInterface
      */
     private $share;
 
+    /**
+     * @var ManageStoreCookie
+     */
+    private $manageStoreCookie;
+
     /**
      * @param Context $context
      * @param Session $authSession
@@ -98,6 +104,8 @@ class Login extends Action implements HttpGetActionInterface
      * @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
      * @param Url $url
      * @param Share $share
+     * @param ManageStoreCookie $manageStoreCookie
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Context $context,
@@ -109,7 +117,8 @@ public function __construct(
         SaveAuthenticationDataInterface $saveAuthenticationData,
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
         Url $url,
-        Share $share = null
+        ?Share $share = null,
+        ?ManageStoreCookie $manageStoreCookie = null
     ) {
         parent::__construct($context);
 
@@ -122,6 +131,7 @@ public function __construct(
         $this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
         $this->url = $url;
         $this->share = $share ?? ObjectManager::getInstance()->get(Share::class);
+        $this->manageStoreCookie = $manageStoreCookie ?? ObjectManager::getInstance()->get(ManageStoreCookie::class);
     }
 
     /**
@@ -195,10 +205,17 @@ public function execute(): ResultInterface
      */
     private function getLoginProceedRedirectUrl(string $secret, int $storeId): string
     {
-        $store = $this->storeManager->getStore($storeId);
+        $targetStore = $this->storeManager->getStore($storeId);
 
-        return $this->url
-            ->setScope($store)
+        $redirectUrl = $this->url
+            ->setScope($targetStore)
             ->getUrl('loginascustomer/login/index', ['secret' => $secret, '_nosid' => true]);
+
+        if (!$targetStore->isUseStoreInUrl()) {
+            $fromStore = $this->storeManager->getStore();
+            $redirectUrl = $this->manageStoreCookie->switch($fromStore, $targetStore, $redirectUrl);
+        }
+
+        return $redirectUrl;
     }
 }

From de823ab06ab0fd65d9d831ae60442beba88d81dd Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 14 Jul 2020 10:54:00 +0300
Subject: [PATCH 059/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - remove disabled Store Groups.

---
 .../Component/ConfirmationPopup/Options.php   | 56 ++++++++++++-------
 .../confirmation-popup/store-view-ptions.html |  1 -
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 424fbc3faa2fe..8b0928c25678c 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -8,11 +8,14 @@
 namespace Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Config\Share;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\Escaper;
+use Magento\Store\Model\Group;
 use Magento\Store\Model\System\Store as SystemStore;
+use Magento\Store\Model\Website;
 
 /**
  * Store group options for Login As Customer confirmation pop-up.
@@ -116,27 +119,10 @@ private function generateCurrentOptions(int $customerId): array
         $options = [];
         if ($customerId) {
             $customer = $this->customerRepository->getById($customerId);
-            $customerWebsiteId = $customer->getWebsiteId();
-            $customerStoreId = $customer->getStoreId();
-            $isGlobalScope = $this->share->isGlobalScope();
             $websiteCollection = $this->systemStore->getWebsiteCollection();
-            $groupCollection = $this->systemStore->getGroupCollection();
-            /** @var \Magento\Store\Model\Website $website */
+            /** @var Website $website */
             foreach ($websiteCollection as $website) {
-                $groups = [];
-                /** @var \Magento\Store\Model\Group $group */
-                foreach ($groupCollection as $group) {
-                    if ($group->getWebsiteId() == $website->getId()) {
-                        $storeViewIds = $group->getStoreIds();
-                        if (!empty($storeViewIds)) {
-                            $name = $this->sanitizeName($group->getName());
-                            $groups[$name]['label'] = str_repeat(' ', 4) . $name;
-                            $groups[$name]['value'] = array_values($storeViewIds)[0];
-                            $groups[$name]['disabled'] = !$isGlobalScope && $customerWebsiteId !== $website->getId();
-                            $groups[$name]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
-                        }
-                    }
-                }
+                $groups = $this->fillStoreGroupOptions($website, $customer);
                 if (!empty($groups)) {
                     $name = $this->sanitizeName($website->getName());
                     $options[$name]['label'] = $name;
@@ -147,4 +133,36 @@ private function generateCurrentOptions(int $customerId): array
 
         return $options;
     }
+
+    /**
+     * Fill Store Group options array.
+     *
+     * @param Website $website
+     * @param CustomerInterface $customer
+     * @return array
+     */
+    private function fillStoreGroupOptions(Website $website, CustomerInterface $customer): array
+    {
+        $groups = [];
+        $groupCollection = $this->systemStore->getGroupCollection();
+        $isGlobalScope = $this->share->isGlobalScope();
+        $customerWebsiteId = $customer->getWebsiteId();
+        $customerStoreId = $customer->getStoreId();
+        /** @var Group $group */
+        foreach ($groupCollection as $group) {
+            if ($group->getWebsiteId() == $website->getId()) {
+                $storeViewIds = $group->getStoreIds();
+                if (!empty($storeViewIds)
+                    && ($customerWebsiteId === $website->getId() || $isGlobalScope)
+                ) {
+                    $name = $this->sanitizeName($group->getName());
+                    $groups[$name]['label'] = str_repeat(' ', 4) . $name;
+                    $groups[$name]['value'] = array_values($storeViewIds)[0];
+                    $groups[$name]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
+                }
+            }
+        }
+
+        return $groups;
+    }
 }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
index 916a5583abe57..b7074798b80f5 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
+++ b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
@@ -19,7 +19,6 @@
                     <optgroup label="<%= website.label %>"></optgroup>
                     <% _.each(website.value, function(group) { %>
                     <option
-                    <% if(group.disabled){ %>disabled <% } %>
                     <% if(group.selected){ %>selected <% } %>
                     value="<%= group.value %>"><%= group.label %></option>
                     <% }); %>

From 3f6d8c42a08cdf82f852d2c4e50903ad276488ee Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Wed, 15 Jul 2020 14:32:40 -0500
Subject: [PATCH 060/671] MC-34385: Filter fields allowing HTML

---
 .../Attribute/Backend/DefaultBackend.php      |  94 +++++++++++
 .../Model/ResourceModel/Eav/Attribute.php     |  15 ++
 .../Attribute/Backend/DefaultBackendTest.php  | 111 ++++++++++++
 app/etc/di.xml                                |  17 ++
 .../HTML/ConfigurableWYSIWYGValidatorTest.php | 113 +++++++++++++
 .../HTML/ConfigurableWYSIWYGValidator.php     | 158 ++++++++++++++++++
 .../HTML/WYSIWYGValidatorInterface.php        |  25 +++
 7 files changed, 533 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/DefaultBackendTest.php
 create mode 100644 lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
 create mode 100644 lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
 create mode 100644 lib/internal/Magento/Framework/Validator/HTML/WYSIWYGValidatorInterface.php

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php b/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php
new file mode 100644
index 0000000000000..e3b38bf7a578a
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Attribute\Backend;
+
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Backend\DefaultBackend as ParentBackend;
+use Magento\Eav\Model\Entity\Attribute\Exception;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+
+/**
+ * Default backend model for catalog attributes.
+ */
+class DefaultBackend extends ParentBackend
+{
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $wysiwygValidator;
+
+    /**
+     * @param WYSIWYGValidatorInterface $wysiwygValidator
+     */
+    public function __construct(WYSIWYGValidatorInterface $wysiwygValidator)
+    {
+        $this->wysiwygValidator = $wysiwygValidator;
+    }
+
+    /**
+     * Validate user HTML value.
+     *
+     * @param DataObject $object
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateHtml(DataObject $object): void
+    {
+        $attribute = $this->getAttribute();
+        $code = $attribute->getAttributeCode();
+        if ($attribute instanceof Attribute && $attribute->getIsHtmlAllowedOnFront()) {
+            if ($object->getData($code)
+                && (!($object instanceof AbstractModel) || $object->getData($code) !== $object->getOrigData($code))
+            ) {
+                try {
+                    $this->wysiwygValidator->validate($object->getData($code));
+                } catch (ValidationException $exception) {
+                    $attributeException = new Exception(
+                        __(
+                            'Using restricted HTML elements for "%1". %2',
+                            $attribute->getName(),
+                            $exception->getMessage()
+                        ),
+                        $exception
+                    );
+                    $attributeException->setAttributeCode($code)->setPart('backend');
+                    throw $attributeException;
+                }
+            }
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function beforeSave($object)
+    {
+        parent::beforeSave($object);
+        $this->validateHtml($object);
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate($object)
+    {
+        $isValid = parent::validate($object);
+        if ($isValid) {
+            $this->validateHtml($object);
+        }
+
+        return $isValid;
+    }
+}
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
index e1c90017327cd..b803695a94702 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
@@ -6,7 +6,9 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Eav;
 
+use Magento\Catalog\Model\Attribute\Backend\DefaultBackend;
 use Magento\Catalog\Model\Attribute\LockValidatorInterface;
+use Magento\Eav\Model\Entity;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
 
@@ -901,4 +903,17 @@ public function setIsFilterableInGrid($isFilterableInGrid)
         $this->setData(self::IS_FILTERABLE_IN_GRID, $isFilterableInGrid);
         return $this;
     }
+
+    /**
+     * @inheritDoc
+     */
+    protected function _getDefaultBackendModel()
+    {
+        $backend = parent::_getDefaultBackendModel();
+        if ($backend === Entity::DEFAULT_BACKEND_MODEL) {
+            $backend = DefaultBackend::class;
+        }
+
+        return $backend;
+    }
 }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/DefaultBackendTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/DefaultBackendTest.php
new file mode 100644
index 0000000000000..36ec38841b7cc
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/DefaultBackendTest.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Attribute\Backend;
+
+use Magento\Catalog\Model\AbstractModel;
+use Magento\Catalog\Model\Attribute\Backend\DefaultBackend;
+use Magento\Framework\DataObject;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+use PHPUnit\Framework\TestCase;
+use Magento\Eav\Model\Entity\Attribute as BasicAttribute;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Entity\Attribute\Exception as AttributeException;
+
+class DefaultBackendTest extends TestCase
+{
+    /**
+     * Different cases for attribute validation.
+     *
+     * @return array
+     */
+    public function getAttributeConfigurations(): array
+    {
+        return [
+            'basic-attribute' => [true, false, true, 'basic', 'value', false, true, false],
+            'non-html-attribute' => [false, false, false, 'non-html', 'value', false, false, false],
+            'empty-html-attribute' => [false, false, true, 'html', null, false, true, false],
+            'invalid-html-attribute' => [false, false, false, 'html', 'value', false, true, true],
+            'valid-html-attribute' => [false, true, false, 'html', 'value', false, true, false],
+            'changed-invalid-html-attribute' => [false, false, true, 'html', 'value', true, true, true],
+            'changed-valid-html-attribute' => [false, true, true, 'html', 'value', true, true, false]
+        ];
+    }
+
+    /**
+     * Test attribute validation.
+     *
+     * @param bool $isBasic
+     * @param bool $isValidated
+     * @param bool $isCatalogEntity
+     * @param string $code
+     * @param mixed $value
+     * @param bool $isChanged
+     * @param bool $isHtmlAttribute
+     * @param bool $exceptionThrown
+     * @dataProvider getAttributeConfigurations
+     */
+    public function testValidate(
+        bool $isBasic,
+        bool $isValidated,
+        bool $isCatalogEntity,
+        string $code,
+        $value,
+        bool $isChanged,
+        bool $isHtmlAttribute,
+        bool $exceptionThrown
+    ): void {
+        if ($isBasic) {
+            $attributeMock = $this->createMock(BasicAttribute::class);
+        } else {
+            $attributeMock = $this->createMock(Attribute::class);
+            $attributeMock->expects($this->any())
+                ->method('getIsHtmlAllowedOnFront')
+                ->willReturn($isHtmlAttribute);
+        }
+        $attributeMock->expects($this->any())->method('getAttributeCode')->willReturn($code);
+
+        $validatorMock = $this->getMockForAbstractClass(WYSIWYGValidatorInterface::class);
+        if (!$isValidated) {
+            $validatorMock->expects($this->any())
+                ->method('validate')
+                ->willThrowException(new ValidationException(__('HTML is invalid')));
+        } else {
+            $validatorMock->expects($this->any())->method('validate');
+        }
+
+        if ($isCatalogEntity) {
+            $objectMock = $this->createMock(AbstractModel::class);
+            $objectMock->expects($this->any())
+                ->method('getOrigData')
+                ->willReturn($isChanged ? $value .'-OLD' : $value);
+        } else {
+            $objectMock = $this->createMock(DataObject::class);
+        }
+        $objectMock->expects($this->any())->method('getData')->with($code)->willReturn($value);
+
+        $model = new DefaultBackend($validatorMock);
+        $model->setAttribute($attributeMock);
+
+        $actuallyThrownForSave = false;
+        try {
+            $model->beforeSave($objectMock);
+        } catch (AttributeException $exception) {
+            $actuallyThrownForSave = true;
+        }
+        $actuallyThrownForValidate = false;
+        try {
+            $model->validate($objectMock);
+        } catch (AttributeException $exception) {
+            $actuallyThrownForValidate = true;
+        }
+        $this->assertEquals($actuallyThrownForSave, $actuallyThrownForValidate);
+        $this->assertEquals($actuallyThrownForSave, $exceptionThrown);
+    }
+}
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 31cc5caf3ba67..9b85e09ac9611 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1832,4 +1832,21 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="DefaultWYSIWYGValidator" type="Magento\Framework\Validator\HTML\ConfigurableWYSIWYGValidator">
+        <arguments>
+            <argument name="allowedTags" xsi:type="array">
+                <item name="div" xsi:type="string">div</item>
+                <item name="a" xsi:type="string">a</item>
+            </argument>
+            <argument name="allowedAttributes" xsi:type="array">
+                <item name="class" xsi:type="string">class</item>
+            </argument>
+            <argument name="attributesAllowedByTags" xsi:type="array">
+                <item name="a" xsi:type="array">
+                    <item name="href" xsi:type="string">href</item>
+                </item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <preference for="Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface" type="DefaultWYSIWYGValidator" />
 </config>
diff --git a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
new file mode 100644
index 0000000000000..aef019b20f519
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Test\Unit\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\ConfigurableWYSIWYGValidator;
+use PHPUnit\Framework\TestCase;
+
+class ConfigurableWYSIWYGValidatorTest extends TestCase
+{
+    /**
+     * Configurations to test.
+     *
+     * @return array
+     */
+    public function getConfigurations(): array
+    {
+        return [
+            'no-html' => [['div'], [], [], 'just text', true],
+            'allowed-tag' => [['div'], [], [], 'just text and <div>a div</div>', true],
+            'restricted-tag' => [['div', 'p'], [], [], 'text and <p>a p</p>, <div>a div</div>,  <tr>a tr</tr>', false],
+            'restricted-tag-wtih-attr' => [['div'], [], [], 'just text and <p class="fake-class">a p</p>', false],
+            'allowed-tag-with-attr' => [['div'], [], [], 'just text and <div class="fake-class">a div</div>', false],
+            'multiple-tags' => [['div', 'p'], [], [], 'just text and <div>a div</div> and <p>a p</p>', true],
+            'tags-with-attrs' => [
+                ['div', 'p'],
+                ['class', 'style'],
+                [],
+                'text and <div class="fake-class">a div</div> and <p style="color: blue">a p</p>',
+                true
+            ],
+            'tags-with-restricted-attrs' => [
+                ['div', 'p'],
+                ['class', 'align'],
+                [],
+                'text and <div class="fake-class">a div</div> and <p style="color: blue">a p</p>',
+                false
+            ],
+            'tags-with-specific-attrs' => [
+                ['div', 'a', 'p'],
+                ['class'],
+                ['a' => ['href'], 'div' => ['style']],
+                '<div class="fake-class" style="color: blue">a div</div>, <a href="/some-path" class="a">an a</a>'
+                .', <p class="p-class">a p</p>',
+                true
+            ],
+            'tags-with-specific-restricted-attrs' => [
+                ['div', 'a'],
+                ['class'],
+                ['a' => ['href']],
+                'text and <div class="fake-class" href="what">a div</div> and <a href="/some-path" class="a">an a</a>',
+                false
+            ],
+            'invalid-tag-with-full-config' => [
+                ['div', 'a', 'p'],
+                ['class', 'src'],
+                ['a' => ['href'], 'div' => ['style']],
+                '<div class="fake-class" style="color: blue">a div</div>, <a href="/some-path" class="a">an a</a>'
+                .', <p class="p-class">a p</p>, <img src="test.jpg" />',
+                false
+            ],
+            'invalid-html' => [
+                ['div', 'a', 'p'],
+                ['class', 'src'],
+                ['a' => ['href'], 'div' => ['style']],
+                'some </,none-> </html>',
+                true
+            ],
+            'invalid-html-with-violations' => [
+                ['div', 'a', 'p'],
+                ['class', 'src'],
+                ['a' => ['href'], 'div' => ['style']],
+                'some </,none-> </html> <tr>some trs</tr>',
+                false
+            ]
+        ];
+    }
+
+    /**
+     * Test different configurations and content.
+     *
+     * @param array $allowedTags
+     * @param array $allowedAttr
+     * @param array $allowedTagAttrs
+     * @param string $html
+     * @param bool $isValid
+     * @return void
+     * @dataProvider getConfigurations
+     */
+    public function testConfigurations(
+        array $allowedTags,
+        array $allowedAttr,
+        array $allowedTagAttrs,
+        string $html,
+        bool $isValid
+    ): void {
+        $validator = new ConfigurableWYSIWYGValidator($allowedTags, $allowedAttr, $allowedTagAttrs);
+        $valid = true;
+        try {
+            $validator->validate($html);
+        } catch (ValidationException $exception) {
+            $valid = false;
+        }
+
+        self::assertEquals($isValid, $valid);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
new file mode 100644
index 0000000000000..0b1993c044f6f
--- /dev/null
+++ b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+
+/**
+ * Validates user HTML based on configuration.
+ */
+class ConfigurableWYSIWYGValidator implements WYSIWYGValidatorInterface
+{
+    /**
+     * @var string[]
+     */
+    private $allowedTags;
+
+    /**
+     * @var string[]
+     */
+    private $allowedAttributes;
+
+    /**
+     * @var string[]
+     */
+    private $attributesAllowedByTags;
+
+    /**
+     * @param array $allowedTags
+     * @param array $allowedAttributes
+     * @param array $attributesAllowedByTags
+     */
+    public function __construct(array $allowedTags, array $allowedAttributes = [], array $attributesAllowedByTags = [])
+    {
+        if (empty(array_filter($allowedTags))) {
+            throw new \InvalidArgumentException('List of allowed HTML tags cannot be empty');
+        }
+        $this->allowedTags = array_unique($allowedTags);
+        $this->allowedAttributes = array_unique($allowedAttributes);
+        $this->attributesAllowedByTags = array_filter(
+            $attributesAllowedByTags,
+            function (string $tag) use ($allowedTags): bool {
+                return in_array($tag, $allowedTags, true);
+            },
+            ARRAY_FILTER_USE_KEY
+        );
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $content): void
+    {
+        $dom = $this->loadHtml($content);
+        $xpath = new \DOMXPath($dom);
+
+        //Validating tags
+        $found = $xpath->query(
+            $query='//*['
+            . implode(
+                ' and ',
+                array_map(
+                    function (string $tag): string {
+                        return "name() != '$tag'";
+                    },
+                    array_merge($this->allowedTags, ['body', 'html'])
+                )
+            )
+            .']'
+        );
+        if (count($found)) {
+            throw new ValidationException(
+                __('Allowed HTML tags are: %1', implode(', ', $this->allowedTags))
+            );
+        }
+
+        //Validating attributes
+        if ($this->attributesAllowedByTags) {
+            foreach ($this->allowedTags as $tag) {
+                $allowed = $this->allowedAttributes;
+                if (!empty($this->attributesAllowedByTags[$tag])) {
+                    $allowed = array_unique(array_merge($allowed, $this->attributesAllowedByTags[$tag]));
+                }
+                $allowedQuery = '';
+                if ($allowed) {
+                    $allowedQuery = '['
+                        . implode(
+                            ' and ',
+                            array_map(
+                                function (string $attribute): string {
+                                    return "name() != '$attribute'";
+                                },
+                                $allowed
+                            )
+                        )
+                        .']';
+                }
+                $found = $xpath->query("//$tag/@*$allowedQuery");
+                if (count($found)) {
+                    throw new ValidationException(
+                        __('Allowed HTML attributes for tag "%1" are: %2', $tag, implode(',', $allowed))
+                    );
+                }
+            }
+        } else {
+            $allowed = '';
+            if ($this->allowedAttributes) {
+                $allowed = '['
+                    . implode(
+                        ' and ',
+                        array_map(
+                            function (string $attribute): string {
+                                return "name() != '$attribute'";
+                            },
+                            $this->allowedAttributes
+                        )
+                    )
+                    .']';
+            }
+            $found = $xpath->query("//@*$allowed");
+            if (count($found)) {
+                throw new ValidationException(
+                    __('Allowed HTML attributes are: %1', implode(',', $this->allowedAttributes))
+                );
+            }
+        }
+    }
+
+    /**
+     * Load DOM.
+     *
+     * @param string $content
+     * @return \DOMDocument
+     * @throws ValidationException
+     */
+    private function loadHtml(string $content): \DOMDocument
+    {
+        $dom = new \DOMDocument('1.0', 'UTF-8');
+        $loaded = true;
+        set_error_handler(
+            function () use (&$loaded) {
+                $loaded = false;
+            }
+        );
+        $loaded = $dom->loadHTML("<html><body>$content</body></html>");
+        restore_error_handler();
+        if (!$loaded) {
+            throw new ValidationException(__('Invalid HTML content provided'));
+        }
+
+        return $dom;
+    }
+}
diff --git a/lib/internal/Magento/Framework/Validator/HTML/WYSIWYGValidatorInterface.php b/lib/internal/Magento/Framework/Validator/HTML/WYSIWYGValidatorInterface.php
new file mode 100644
index 0000000000000..8045bc6a86c0b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Validator/HTML/WYSIWYGValidatorInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+
+/**
+ * Validates user HTML.
+ */
+interface WYSIWYGValidatorInterface
+{
+    /**
+     * Validate user HTML content.
+     *
+     * @param string $content
+     * @throws ValidationException
+     */
+    public function validate(string $content): void;
+}

From 6b5bb102b597ae37f88f1addd5b15faabf918fa2 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Wed, 15 Jul 2020 16:23:21 -0500
Subject: [PATCH 061/671] MC-34385: Filter fields allowing HTML

---
 .../Cms/Command/WysiwygRestrictCommand.php    | 70 +++++++++++++++
 .../Magento/Cms/Model/Wysiwyg/Validator.php   | 87 +++++++++++++++++++
 .../Test/Unit/Model/Wysiwyg/ValidatorTest.php | 78 +++++++++++++++++
 app/code/Magento/Cms/etc/config.xml           |  1 +
 app/code/Magento/Cms/etc/di.xml               |  6 ++
 .../Command/WysiwygRestrictCommandTest.php    | 78 +++++++++++++++++
 6 files changed, 320 insertions(+)
 create mode 100644 app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
 create mode 100644 app/code/Magento/Cms/Model/Wysiwyg/Validator.php
 create mode 100644 app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Cms/Command/WysiwygRestrictCommandTest.php

diff --git a/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php b/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
new file mode 100644
index 0000000000000..bafe98ad377f5
--- /dev/null
+++ b/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Command;
+
+use Magento\Cms\Model\Wysiwyg\Validator;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Framework\App\Config\ConfigResource\ConfigInterface as ConfigWriter;
+use Magento\Framework\App\Cache\TypeListInterface as Cache;
+
+/**
+ * Command to toggle WYSIWYG content validation on/off.
+ */
+class WysiwygRestrictCommand extends Command
+{
+    /**
+     * @var ConfigWriter
+     */
+    private $configWriter;
+
+    /**
+     * @var Cache
+     */
+    private $cache;
+
+    /**
+     * @param ConfigWriter $configWriter
+     * @param Cache $cache
+     */
+    public function __construct(ConfigWriter $configWriter, Cache $cache)
+    {
+        parent::__construct();
+
+        $this->configWriter = $configWriter;
+        $this->cache = $cache;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function configure()
+    {
+        $this->setName('cms:wysiwyg:restrict');
+        $this->setDescription('Set whether to enforce user HTML content validation or show a warning instead');
+        $this->setDefinition([new InputArgument('restrict', InputArgument::REQUIRED, 'y\n')]);
+
+        parent::configure();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $restrictArg = mb_strtolower((string)$input->getArgument('restrict'));
+        $restrict = $restrictArg === 'y' ? '1' : '0';
+        $this->configWriter->saveConfig(Validator::CONFIG_PATH_THROW_EXCEPTION, $restrict);
+        $this->cache->cleanType('config');
+
+        $output->writeln('HTML user content validation is now ' .($restrictArg === 'y' ? 'enforced' : 'suggested'));
+    }
+}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Validator.php b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
new file mode 100644
index 0000000000000..c3eb14082ee98
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\Wysiwyg;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Processes backend validator results.
+ */
+class Validator implements WYSIWYGValidatorInterface
+{
+    public const CONFIG_PATH_THROW_EXCEPTION = 'cms/wysiwyg/force_valid';
+
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $validator;
+
+    /**
+     * @var ManagerInterface
+     */
+    private $messages;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @param WYSIWYGValidatorInterface $validator
+     * @param ManagerInterface $messages
+     * @param ScopeConfigInterface $config
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        WYSIWYGValidatorInterface $validator,
+        ManagerInterface $messages,
+        ScopeConfigInterface $config,
+        LoggerInterface $logger
+    ) {
+        $this->validator = $validator;
+        $this->messages = $messages;
+        $this->config = $config;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $content): void
+    {
+        $throwException = $this->config->isSetFlag(self::CONFIG_PATH_THROW_EXCEPTION);
+        try {
+            $this->validator->validate($content);
+        } catch (ValidationException $exception) {
+            if ($throwException) {
+                throw $exception;
+            } else {
+                $this->messages->addWarningMessage(
+                    __('Temporarily allowed to save restricted HTML value. %1', $exception->getMessage())
+                );
+            }
+        } catch (\Throwable $exception) {
+            if ($throwException) {
+                throw $exception;
+            } else {
+                $this->messages->addWarningMessage(__('Invalid HTML provided')->render());
+                $this->logger->error($exception);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
new file mode 100644
index 0000000000000..b14ad81aa2c1a
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Test\Unit\Model\Wysiwyg;
+
+use Magento\Cms\Model\Wysiwyg\Validator;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class ValidatorTest extends TestCase
+{
+    /**
+     * Validation cases.
+     *
+     * @return array
+     */
+    public function getValidationCases(): array
+    {
+        return [
+            'invalid-exception' => [true, new ValidationException(__('Invalid html')), true, false],
+            'invalid-warning' => [false, new \RuntimeException('Invalid html'), false, true],
+            'valid' => [false, null, false, false]
+        ];
+    }
+
+    /**
+     * Test validation.
+     *
+     * @param bool $isFlagSet
+     * @param \Throwable|null $thrown
+     * @param bool $exceptionThrown
+     * @param bool $warned
+     * @dataProvider getValidationCases
+     */
+    public function testValidate(bool $isFlagSet, ?\Throwable $thrown, bool $exceptionThrown, bool $warned): void
+    {
+        $actuallyWarned = false;
+
+        $configMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+        $configMock->method('isSetFlag')
+            ->with(Validator::CONFIG_PATH_THROW_EXCEPTION)
+            ->willReturn($isFlagSet);
+
+        $backendMock = $this->getMockForAbstractClass(WYSIWYGValidatorInterface::class);
+        if ($thrown) {
+            $backendMock->method('validate')->willThrowException($thrown);
+        }
+
+        $messagesMock = $this->getMockForAbstractClass(ManagerInterface::class);
+        $messagesMock->method('addWarningMessage')
+            ->willReturnCallback(
+                function () use (&$actuallyWarned): void {
+                    $actuallyWarned = true;
+                }
+            );
+
+        $loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+
+        $validator = new Validator($backendMock, $messagesMock, $configMock, $loggerMock);
+        try {
+            $validator->validate('content');
+            $actuallyThrown = false;
+        } catch (\Throwable $exception) {
+            $actuallyThrown = true;
+        }
+        $this->assertEquals($exceptionThrown, $actuallyThrown);
+        $this->assertEquals($warned, $actuallyWarned);
+    }
+}
diff --git a/app/code/Magento/Cms/etc/config.xml b/app/code/Magento/Cms/etc/config.xml
index 7090bb7a1fd25..d7a9e172f59a6 100644
--- a/app/code/Magento/Cms/etc/config.xml
+++ b/app/code/Magento/Cms/etc/config.xml
@@ -24,6 +24,7 @@
             <wysiwyg>
                 <enabled>enabled</enabled>
                 <editor>mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter</editor>
+                <force_valid>0</force_valid>
             </wysiwyg>
         </cms>
         <system>
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 7fc8268eea5e0..67f88605a3e11 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -243,4 +243,10 @@
         </arguments>
     </type>
     <preference for="Magento\Cms\Model\Page\CustomLayoutRepositoryInterface" type="Magento\Cms\Model\Page\CustomLayout\CustomLayoutRepository" />
+    <type name="Magento\Cms\Model\Wysiwyg\Validator">
+        <arguments>
+            <argument name="validator" xsi:type="object">DefaultWYSIWYGValidator</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface" type="Magento\Cms\Model\Wysiwyg\Validator" />
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Command/WysiwygRestrictCommandTest.php b/dev/tests/integration/testsuite/Magento/Cms/Command/WysiwygRestrictCommandTest.php
new file mode 100644
index 0000000000000..cd9844dc98811
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Cms/Command/WysiwygRestrictCommandTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Command;
+
+use Magento\Cms\Model\Wysiwyg\Validator;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Tester\CommandTester;
+
+/**
+ * Test the command.
+ *
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation enabled
+ */
+class WysiwygRestrictCommandTest extends TestCase
+{
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var WysiwygRestrictCommandFactory
+     */
+    private $factory;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->config = $objectManager->get(ReinitableConfigInterface::class);
+        $this->factory = $objectManager->get(WysiwygRestrictCommandFactory::class);
+    }
+
+    /**
+     * "Execute" method cases.
+     *
+     * @return array
+     */
+    public function getExecuteCases(): array
+    {
+        return [
+            'yes' => ['y', true],
+            'no' => ['n', false],
+            'no-but-different' => ['what', false]
+        ];
+    }
+
+    /**
+     * Test the command.
+     *
+     * @param string $argument
+     * @param bool $expectedFlag
+     * @return void
+     * @dataProvider getExecuteCases
+     * @magentoConfigFixture default_store cms/wysiwyg/force_valid 0
+     */
+    public function testExecute(string $argument, bool $expectedFlag): void
+    {
+        /** @var WysiwygRestrictCommand $model */
+        $model = $this->factory->create();
+        $tester = new CommandTester($model);
+        $tester->execute(['restrict' => $argument]);
+
+        $this->config->reinit();
+        $this->assertEquals($expectedFlag, $this->config->isSetFlag(Validator::CONFIG_PATH_THROW_EXCEPTION));
+    }
+}

From 2047a293727a482a190bc26a008c5bb8b57efdfd Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 16 Jul 2020 10:51:26 +0300
Subject: [PATCH 062/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - add disabled Store Groups.

---
 .../Ui/Customer/Component/ConfirmationPopup/Options.php   | 8 ++++----
 .../template/confirmation-popup/store-view-ptions.html    | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 8b0928c25678c..c11337bbc5fe8 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -148,16 +148,16 @@ private function fillStoreGroupOptions(Website $website, CustomerInterface $cust
         $isGlobalScope = $this->share->isGlobalScope();
         $customerWebsiteId = $customer->getWebsiteId();
         $customerStoreId = $customer->getStoreId();
+        $websiteId = $website->getId();
         /** @var Group $group */
         foreach ($groupCollection as $group) {
-            if ($group->getWebsiteId() == $website->getId()) {
+            if ($group->getWebsiteId() == $websiteId) {
                 $storeViewIds = $group->getStoreIds();
-                if (!empty($storeViewIds)
-                    && ($customerWebsiteId === $website->getId() || $isGlobalScope)
-                ) {
+                if (!empty($storeViewIds)) {
                     $name = $this->sanitizeName($group->getName());
                     $groups[$name]['label'] = str_repeat(' ', 4) . $name;
                     $groups[$name]['value'] = array_values($storeViewIds)[0];
+                    $groups[$name]['disabled'] = !$isGlobalScope && $customerWebsiteId !== $websiteId;
                     $groups[$name]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
                 }
             }
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
index b7074798b80f5..916a5583abe57 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
+++ b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
@@ -19,6 +19,7 @@
                     <optgroup label="<%= website.label %>"></optgroup>
                     <% _.each(website.value, function(group) { %>
                     <option
+                    <% if(group.disabled){ %>disabled <% } %>
                     <% if(group.selected){ %>selected <% } %>
                     value="<%= group.value %>"><%= group.label %></option>
                     <% }); %>

From 2c1e0363e4d3064e4f766071f31587bb05a83b7d Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Thu, 16 Jul 2020 12:35:34 -0500
Subject: [PATCH 063/671] MC-34385: Filter fields allowing HTML

---
 .../Magento/Cms/Model/BlockRepository.php     | 49 +++++++++++++++-
 app/code/Magento/Cms/Model/PageRepository.php | 18 ++++--
 .../PageRepository/ValidationComposite.php    | 15 ++++-
 .../Validator/ContentValidator.php            | 57 +++++++++++++++++++
 app/code/Magento/Cms/etc/di.xml               | 13 +++++
 .../HTML/ConfigurableWYSIWYGValidator.php     |  3 +
 6 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php

diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index fa29cc9ff7631..317c3eeb6dcfb 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -12,10 +12,13 @@
 use Magento\Cms\Model\ResourceModel\Block\CollectionFactory as BlockCollectionFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -69,6 +72,11 @@ class BlockRepository implements BlockRepositoryInterface
      */
     private $collectionProcessor;
 
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $wysiwygValidator;
+
     /**
      * @param ResourceBlock $resource
      * @param BlockFactory $blockFactory
@@ -79,6 +87,7 @@ class BlockRepository implements BlockRepositoryInterface
      * @param DataObjectProcessor $dataObjectProcessor
      * @param StoreManagerInterface $storeManager
      * @param CollectionProcessorInterface $collectionProcessor
+     * @param WYSIWYGValidatorInterface|null $wysiwygValidator
      */
     public function __construct(
         ResourceBlock $resource,
@@ -89,7 +98,8 @@ public function __construct(
         DataObjectHelper $dataObjectHelper,
         DataObjectProcessor $dataObjectProcessor,
         StoreManagerInterface $storeManager,
-        CollectionProcessorInterface $collectionProcessor = null
+        CollectionProcessorInterface $collectionProcessor = null,
+        ?WYSIWYGValidatorInterface $wysiwygValidator = null
     ) {
         $this->resource = $resource;
         $this->blockFactory = $blockFactory;
@@ -100,13 +110,46 @@ public function __construct(
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->storeManager = $storeManager;
         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
+        $this->wysiwygValidator = $wysiwygValidator
+            ?? ObjectManager::getInstance()->get(WYSIWYGValidatorInterface::class);
+    }
+
+    /**
+     * Validate block's content.
+     *
+     * @param Data\BlockInterface|Block $block
+     * @throws CouldNotSaveException
+     * @return void
+     */
+    private function validateHtml(Data\BlockInterface $block): void
+    {
+        $oldContent = null;
+        if ($block->getId()) {
+            if ($block instanceof Block && $block->getOrigData()) {
+                $oldContent = $block->getOrigData(Data\BlockInterface::CONTENT);
+            } else {
+                $oldBlock = $this->getById($block->getId());
+                $oldContent = $oldBlock->getContent();
+            }
+        }
+        if ($block->getContent() && $block->getContent() !== $oldContent) {
+            //Validate HTML content.
+            try {
+                $this->wysiwygValidator->validate($block->getContent());
+            } catch (ValidationException $exception) {
+                throw new CouldNotSaveException(
+                    __('Content HTML has restricted elements. %1', $exception->getMessage()),
+                    $exception
+                );
+            }
+        }
     }
 
     /**
      * Save Block data
      *
      * @param \Magento\Cms\Api\Data\BlockInterface $block
-     * @return Block
+     * @return Block|Data\BlockInterface
      * @throws CouldNotSaveException
      */
     public function save(Data\BlockInterface $block)
@@ -115,6 +158,8 @@ public function save(Data\BlockInterface $block)
             $block->setStoreId($this->storeManager->getStore()->getId());
         }
 
+        $this->validateHtml($block);
+
         try {
             $this->resource->save($block);
         } catch (\Exception $exception) {
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 2de44b6691274..b09e9283870bc 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -133,15 +133,21 @@ public function __construct(
     private function validateLayoutUpdate(Data\PageInterface $page): void
     {
         //Persisted data
-        $savedPage = $page->getId() ? $this->getById($page->getId()) : null;
+        $oldData = null;
+        if ($page->getId() && $page instanceof Page) {
+            $oldData = $page->getOrigData();
+        }
         //Custom layout update can be removed or kept as is.
         if ($page->getCustomLayoutUpdateXml()
-            && (!$savedPage || $page->getCustomLayoutUpdateXml() !== $savedPage->getCustomLayoutUpdateXml())
+            && (
+                !$oldData
+                || $page->getCustomLayoutUpdateXml() !== $oldData[Data\PageInterface::CUSTOM_LAYOUT_UPDATE_XML]
+            )
         ) {
             throw new \InvalidArgumentException('Custom layout updates must be selected from a file');
         }
         if ($page->getLayoutUpdateXml()
-            && (!$savedPage || $page->getLayoutUpdateXml() !== $savedPage->getLayoutUpdateXml())
+            && (!$oldData || $page->getLayoutUpdateXml() !== $oldData[Data\PageInterface::LAYOUT_UPDATE_XML])
         ) {
             throw new \InvalidArgumentException('Custom layout updates must be selected from a file');
         }
@@ -161,12 +167,12 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
             $page->setStoreId($storeId);
         }
         $pageId = $page->getId();
+        if ($pageId && !($page instanceof Page && $page->getOrigData())) {
+            $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
+        }
 
         try {
             $this->validateLayoutUpdate($page);
-            if ($pageId) {
-                $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
-            }
             $this->resource->save($page);
             $this->identityMap->add($page);
         } catch (\Exception $exception) {
diff --git a/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php b/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
index 9fd94d4c11e1c..fe8817f5f40b4 100644
--- a/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
+++ b/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
@@ -11,6 +11,8 @@
 use Magento\Cms\Api\Data\PageInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\HydratorInterface;
 
 /**
  * Validates and saves a page
@@ -27,13 +29,20 @@ class ValidationComposite implements PageRepositoryInterface
      */
     private $validators;
 
+    /**
+     * @var HydratorInterface
+     */
+    private $hydrator;
+
     /**
      * @param PageRepositoryInterface $repository
      * @param ValidatorInterface[] $validators
+     * @param HydratorInterface|null $hydrator
      */
     public function __construct(
         PageRepositoryInterface $repository,
-        array $validators = []
+        array $validators = [],
+        ?HydratorInterface $hydrator = null
     ) {
         foreach ($validators as $validator) {
             if (!$validator instanceof ValidatorInterface) {
@@ -44,6 +53,7 @@ public function __construct(
         }
         $this->repository = $repository;
         $this->validators = $validators;
+        $this->hydrator = $hydrator ?? ObjectManager::getInstance()->get(HydratorInterface::class);
     }
 
     /**
@@ -51,6 +61,9 @@ public function __construct(
      */
     public function save(PageInterface $page)
     {
+        if ($page->getId()) {
+            $page = $this->hydrator->hydrate($this->getById($page->getId()), $this->hydrator->extract($page));
+        }
         foreach ($this->validators as $validator) {
             $validator->validate($page);
         }
diff --git a/app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php b/app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php
new file mode 100644
index 0000000000000..6bca6103863fb
--- /dev/null
+++ b/app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Cms\Model\PageRepository\Validator;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\PageRepository\ValidatorInterface;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+
+/**
+ * Validates pages' content.
+ */
+class ContentValidator implements ValidatorInterface
+{
+
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $wysiwygValidator;
+
+    /**
+     * @param WYSIWYGValidatorInterface $wysiwygValidator
+     */
+    public function __construct(WYSIWYGValidatorInterface $wysiwygValidator)
+    {
+        $this->wysiwygValidator = $wysiwygValidator;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(PageInterface $page): void
+    {
+        $oldValue = null;
+        if ($page->getId() && $page instanceof Page && $page->getOrigData()) {
+            $oldValue = $page->getOrigData(PageInterface::CONTENT);
+        }
+
+        if ($page->getContent() && $page->getContent() !== $oldValue) {
+            try {
+                $this->wysiwygValidator->validate($page->getContent());
+            } catch (ValidationException $exception) {
+                throw new ValidationException(
+                    __('Content HTML contains restricted elements. %1', $exception->getMessage()),
+                    $exception
+                );
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 67f88605a3e11..1f2067a6e525b 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -233,6 +233,7 @@
             <argument name="repository" xsi:type="object">Magento\Cms\Model\PageRepository</argument>
             <argument name="validators" xsi:type="array">
                 <item name="layout_update" xsi:type="object">Magento\Cms\Model\PageRepository\Validator\LayoutUpdateValidator</item>
+                <item name="content" xsi:type="object">Magento\Cms\Model\PageRepository\Validator\ContentValidator</item>
             </argument>
         </arguments>
     </type>
@@ -249,4 +250,16 @@
         </arguments>
     </type>
     <preference for="Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface" type="Magento\Cms\Model\Wysiwyg\Validator" />
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="cms_wysiwyg_restrict" xsi:type="object">Magento\Cms\Command\WysiwygRestrictCommand</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Cms\Model\PageRepository\Validator\ContentValidator">
+        <arguments>
+            <argument name="hydrator" xsi:type="object">Magento\Framework\EntityManager\AbstractModelHydrator</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
index 0b1993c044f6f..0e317f071ab39 100644
--- a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
+++ b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
@@ -56,6 +56,9 @@ function (string $tag) use ($allowedTags): bool {
      */
     public function validate(string $content): void
     {
+        if (mb_strlen($content) === 0) {
+            return;
+        }
         $dom = $this->loadHtml($content);
         $xpath = new \DOMXPath($dom);
 

From 1e50290e8fd249a7163cf1f5bc381a2674275b82 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Fri, 17 Jul 2020 10:45:31 -0500
Subject: [PATCH 064/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/Model/Page.php           | 33 ++++++++++-
 .../Validator/ContentValidator.php            | 57 -------------------
 app/code/Magento/Cms/etc/di.xml               |  7 +--
 3 files changed, 33 insertions(+), 64 deletions(-)
 delete mode 100644 app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php

diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index 28d013f45f1fa..35e049caea203 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -13,6 +13,8 @@
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 
 /**
  * Cms Page Model
@@ -64,6 +66,11 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
      */
     private $customLayoutRepository;
 
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $wysiwygValidator;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -71,6 +78,7 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param CustomLayoutRepository|null $customLayoutRepository
+     * @param WYSIWYGValidatorInterface|null $wysiwygValidator
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
@@ -78,11 +86,14 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        ?CustomLayoutRepository $customLayoutRepository = null
+        ?CustomLayoutRepository $customLayoutRepository = null,
+        ?WYSIWYGValidatorInterface $wysiwygValidator = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->customLayoutRepository = $customLayoutRepository
             ?? ObjectManager::getInstance()->get(CustomLayoutRepository::class);
+        $this->wysiwygValidator = $wysiwygValidator
+            ?? ObjectManager::getInstance()->get(WYSIWYGValidatorInterface::class);
     }
 
     /**
@@ -615,6 +626,26 @@ public function beforeSave()
         $this->setData('layout_update_selected', $layoutUpdate);
         $this->customLayoutRepository->validateLayoutSelectedFor($this);
 
+        //Validating Content HTML.
+        $oldValue = null;
+        if ($this->getId()) {
+            if ($this->getOrigData()) {
+                $oldValue = $this->getOrigData(self::CONTENT);
+            } elseif (array_key_exists(self::CONTENT, $this->getStoredData())) {
+                $oldValue = $this->getStoredData()[self::CONTENT];
+            }
+        }
+        if ($this->getContent() && $this->getContent() !== $oldValue) {
+            try {
+                $this->wysiwygValidator->validate($this->getContent());
+            } catch (ValidationException $exception) {
+                throw new ValidationException(
+                    __('Content HTML contains restricted elements. %1', $exception->getMessage()),
+                    $exception
+                );
+            }
+        }
+
         return parent::beforeSave();
     }
 
diff --git a/app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php b/app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php
deleted file mode 100644
index 6bca6103863fb..0000000000000
--- a/app/code/Magento/Cms/Model/PageRepository/Validator/ContentValidator.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\Cms\Model\PageRepository\Validator;
-
-use Magento\Cms\Api\Data\PageInterface;
-use Magento\Cms\Model\Page;
-use Magento\Cms\Model\PageRepository\ValidatorInterface;
-use Magento\Framework\Validation\ValidationException;
-use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
-
-/**
- * Validates pages' content.
- */
-class ContentValidator implements ValidatorInterface
-{
-
-    /**
-     * @var WYSIWYGValidatorInterface
-     */
-    private $wysiwygValidator;
-
-    /**
-     * @param WYSIWYGValidatorInterface $wysiwygValidator
-     */
-    public function __construct(WYSIWYGValidatorInterface $wysiwygValidator)
-    {
-        $this->wysiwygValidator = $wysiwygValidator;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function validate(PageInterface $page): void
-    {
-        $oldValue = null;
-        if ($page->getId() && $page instanceof Page && $page->getOrigData()) {
-            $oldValue = $page->getOrigData(PageInterface::CONTENT);
-        }
-
-        if ($page->getContent() && $page->getContent() !== $oldValue) {
-            try {
-                $this->wysiwygValidator->validate($page->getContent());
-            } catch (ValidationException $exception) {
-                throw new ValidationException(
-                    __('Content HTML contains restricted elements. %1', $exception->getMessage()),
-                    $exception
-                );
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 1f2067a6e525b..1837aaca74789 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -233,8 +233,8 @@
             <argument name="repository" xsi:type="object">Magento\Cms\Model\PageRepository</argument>
             <argument name="validators" xsi:type="array">
                 <item name="layout_update" xsi:type="object">Magento\Cms\Model\PageRepository\Validator\LayoutUpdateValidator</item>
-                <item name="content" xsi:type="object">Magento\Cms\Model\PageRepository\Validator\ContentValidator</item>
             </argument>
+            <argument name="hydrator" xsi:type="object">Magento\Framework\EntityManager\AbstractModelHydrator</argument>
         </arguments>
     </type>
     <preference for="Magento\Cms\Model\Page\CustomLayoutManagerInterface" type="Magento\Cms\Model\Page\CustomLayout\CustomLayoutManager" />
@@ -257,9 +257,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Cms\Model\PageRepository\Validator\ContentValidator">
-        <arguments>
-            <argument name="hydrator" xsi:type="object">Magento\Framework\EntityManager\AbstractModelHydrator</argument>
-        </arguments>
-    </type>
 </config>

From 9b094232f14e1677fac4898b6fff1d0e53f032eb Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Fri, 17 Jul 2020 15:53:44 -0500
Subject: [PATCH 065/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/Model/Block.php          | 57 +++++++++++++++++--
 .../Magento/Cms/Model/BlockRepository.php     | 51 ++++-------------
 app/code/Magento/Cms/etc/di.xml               |  1 +
 3 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Block.php b/app/code/Magento/Cms/Model/Block.php
index 9da444c72e80c..ab8d65399f37c 100644
--- a/app/code/Magento/Cms/Model/Block.php
+++ b/app/code/Magento/Cms/Model/Block.php
@@ -6,8 +6,15 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Data\Collection\AbstractDb;
 
 /**
  * CMS block model
@@ -40,6 +47,32 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
      */
     protected $_eventPrefix = 'cms_block';
 
+    /**
+     * @var WYSIWYGValidatorInterface
+     */
+    private $wysiwygValidator;
+
+    /**
+     * @param Context $context
+     * @param Registry $registry
+     * @param AbstractResource|null $resource
+     * @param AbstractDb|null $resourceCollection
+     * @param array $data
+     * @param WYSIWYGValidatorInterface|null $wysiwygValidator
+     */
+    public function __construct(
+        Context $context,
+        Registry $registry,
+        AbstractResource $resource = null,
+        AbstractDb $resourceCollection = null,
+        array $data = [],
+        ?WYSIWYGValidatorInterface $wysiwygValidator = null
+    ) {
+        parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+        $this->wysiwygValidator = $wysiwygValidator
+            ?? ObjectManager::getInstance()->get(WYSIWYGValidatorInterface::class);
+    }
+
     /**
      * Construct.
      *
@@ -63,12 +96,26 @@ public function beforeSave()
         }
 
         $needle = 'block_id="' . $this->getId() . '"';
-        if (false == strstr($this->getContent(), (string) $needle)) {
-            return parent::beforeSave();
+        if (strstr($this->getContent(), (string) $needle) !== false) {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('Make sure that static block content does not reference the block itself.')
+            );
         }
-        throw new \Magento\Framework\Exception\LocalizedException(
-            __('Make sure that static block content does not reference the block itself.')
-        );
+        parent::beforeSave();
+
+        //Validating HTML content.
+        if ($this->getContent() && $this->getContent() !== $this->getOrigData(self::CONTENT)) {
+            try {
+                $this->wysiwygValidator->validate($this->getContent());
+            } catch (ValidationException $exception) {
+                throw new ValidationException(
+                    __('Content field contains restricted HTML elements. %1', $exception->getMessage()),
+                    $exception
+                );
+            }
+        }
+
+        return $this;
     }
 
     /**
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index 317c3eeb6dcfb..f8129ca4a2961 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -17,9 +17,8 @@
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\DataObjectProcessor;
-use Magento\Framework\Validation\ValidationException;
-use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\EntityManager\HydratorInterface;
 
 /**
  * Class BlockRepository
@@ -73,9 +72,9 @@ class BlockRepository implements BlockRepositoryInterface
     private $collectionProcessor;
 
     /**
-     * @var WYSIWYGValidatorInterface
+     * @var HydratorInterface
      */
-    private $wysiwygValidator;
+    private $hydrator;
 
     /**
      * @param ResourceBlock $resource
@@ -87,7 +86,7 @@ class BlockRepository implements BlockRepositoryInterface
      * @param DataObjectProcessor $dataObjectProcessor
      * @param StoreManagerInterface $storeManager
      * @param CollectionProcessorInterface $collectionProcessor
-     * @param WYSIWYGValidatorInterface|null $wysiwygValidator
+     * @param HydratorInterface|null $hydrator
      */
     public function __construct(
         ResourceBlock $resource,
@@ -99,7 +98,7 @@ public function __construct(
         DataObjectProcessor $dataObjectProcessor,
         StoreManagerInterface $storeManager,
         CollectionProcessorInterface $collectionProcessor = null,
-        ?WYSIWYGValidatorInterface $wysiwygValidator = null
+        ?HydratorInterface $hydrator = null
     ) {
         $this->resource = $resource;
         $this->blockFactory = $blockFactory;
@@ -110,46 +109,14 @@ public function __construct(
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->storeManager = $storeManager;
         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
-        $this->wysiwygValidator = $wysiwygValidator
-            ?? ObjectManager::getInstance()->get(WYSIWYGValidatorInterface::class);
-    }
-
-    /**
-     * Validate block's content.
-     *
-     * @param Data\BlockInterface|Block $block
-     * @throws CouldNotSaveException
-     * @return void
-     */
-    private function validateHtml(Data\BlockInterface $block): void
-    {
-        $oldContent = null;
-        if ($block->getId()) {
-            if ($block instanceof Block && $block->getOrigData()) {
-                $oldContent = $block->getOrigData(Data\BlockInterface::CONTENT);
-            } else {
-                $oldBlock = $this->getById($block->getId());
-                $oldContent = $oldBlock->getContent();
-            }
-        }
-        if ($block->getContent() && $block->getContent() !== $oldContent) {
-            //Validate HTML content.
-            try {
-                $this->wysiwygValidator->validate($block->getContent());
-            } catch (ValidationException $exception) {
-                throw new CouldNotSaveException(
-                    __('Content HTML has restricted elements. %1', $exception->getMessage()),
-                    $exception
-                );
-            }
-        }
+        $this->hydrator = $hydrator ?? ObjectManager::getInstance()->get(HydratorInterface::class);
     }
 
     /**
      * Save Block data
      *
      * @param \Magento\Cms\Api\Data\BlockInterface $block
-     * @return Block|Data\BlockInterface
+     * @return Block
      * @throws CouldNotSaveException
      */
     public function save(Data\BlockInterface $block)
@@ -158,7 +125,9 @@ public function save(Data\BlockInterface $block)
             $block->setStoreId($this->storeManager->getStore()->getId());
         }
 
-        $this->validateHtml($block);
+        if ($block->getId() && $block instanceof Block && !$block->getOrigData()) {
+            $block = $this->hydrator->hydrate($this->getById($block->getId()), $this->hydrator->extract($block));
+        }
 
         try {
             $this->resource->save($block);
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 1837aaca74789..d79e805e25890 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -215,6 +215,7 @@
     <type name="Magento\Cms\Model\BlockRepository">
         <arguments>
             <argument name="collectionProcessor" xsi:type="object">Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor</argument>
+            <argument name="hydrator" xsi:type="object">Magento\Framework\EntityManager\AbstractModelHydrator</argument>
         </arguments>
     </type>
 

From 1abdd4794847e779253487a50f04b711dbf801cd Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Fri, 17 Jul 2020 16:09:03 -0500
Subject: [PATCH 066/671] MC-35389: Set Same Site attribute

---
 .../Stdlib/Cookie/CookieMetadata.php          | 34 ++++++++-
 .../Stdlib/Cookie/PhpCookieManager.php        | 18 +++--
 .../Test/Unit/Cookie/PhpCookieManagerTest.php | 69 +++++++++++++++----
 .../Unit/Cookie/PublicCookieMetadataTest.php  |  1 +
 .../Unit/Cookie/_files/setcookie_mock.php     | 19 +++--
 5 files changed, 114 insertions(+), 27 deletions(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 2b4cddf242113..99c32a1121f82 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -6,7 +6,7 @@
 namespace Magento\Framework\Stdlib\Cookie;
 
 /**
- * Class CookieMetadata
+ * Cookie Attributes
  * @api
  */
 class CookieMetadata
@@ -19,6 +19,12 @@ class CookieMetadata
     const KEY_SECURE = 'secure';
     const KEY_HTTP_ONLY = 'http_only';
     const KEY_DURATION = 'duration';
+    const KEY_SAME_SITE = 'samesite';
+    const SAME_SITE_ALLOWED_VALUES = [
+        'strict' => 'Strict',
+        'lax' => 'Lax',
+        'none' => 'None',
+    ];
     /**#@-*/
 
     /**#@-*/
@@ -135,4 +141,30 @@ public function getSecure()
     {
         return $this->get(self::KEY_SECURE);
     }
+
+    /**
+     * Setter for Cookie SameSite attribute
+     *
+     * @param  string|null $sameSite
+     * @return $this
+     */
+    public function setSameSite($sameSite)
+    {
+        if (! array_key_exists(strtolower($sameSite), self::SAME_SITE_ALLOWED_VALUES)) {
+            throw new \InvalidArgumentException(
+                'Invalid argument provided for SameSite directive expected one of: Strict, Lax or None'
+            );
+        }
+        return $this->set(self::KEY_SAME_SITE, $sameSite);
+    }
+
+    /**
+     * Get Same Site Flag
+     *
+     * @return bool|null
+     */
+    public function getSameSite()
+    {
+        return $this->get(self::KEY_SAME_SITE);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index dff31a897e1ac..b456208fd41f5 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -141,11 +141,14 @@ protected function setCookie($name, $value, array $metadataArray)
         $phpSetcookieSuccess = setcookie(
             $name,
             $value,
-            $expire,
-            $this->extractValue(CookieMetadata::KEY_PATH, $metadataArray, ''),
-            $this->extractValue(CookieMetadata::KEY_DOMAIN, $metadataArray, ''),
-            $this->extractValue(CookieMetadata::KEY_SECURE, $metadataArray, false),
-            $this->extractValue(CookieMetadata::KEY_HTTP_ONLY, $metadataArray, false)
+            [
+                'expires' => $expire,
+                'path' => $this->extractValue(CookieMetadata::KEY_PATH, $metadataArray, ''),
+                'domain' => $this->extractValue(CookieMetadata::KEY_DOMAIN, $metadataArray, ''),
+                'secure' => $this->extractValue(CookieMetadata::KEY_SECURE, $metadataArray, false),
+                'httponly' => $this->extractValue(CookieMetadata::KEY_HTTP_ONLY, $metadataArray, false),
+                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, 'None')
+            ]
         );
 
         if (!$phpSetcookieSuccess) {
@@ -164,6 +167,7 @@ protected function setCookie($name, $value, array $metadataArray)
 
     /**
      * Retrieve the size of a cookie.
+     *
      * The size of a cookie is determined by the length of 'name=value' portion of the cookie.
      *
      * @param string $name
@@ -177,8 +181,7 @@ private function sizeOfCookie($name, $value)
     }
 
     /**
-     * Determines whether or not it is possible to send the cookie, based on the number of cookies that already
-     * exist and the size of the cookie.
+     * Determines ability to send cookies, based on the number of existing cookies and cookie size
      *
      * @param string $name
      * @param string|null $value
@@ -249,6 +252,7 @@ private function computeExpirationTime(array $metadataArray)
 
     /**
      * Determines the value to be used as a $parameter.
+     *
      * If $metadataArray[$parameter] is not set, returns the $defaultValue.
      *
      * @param string $parameter
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index 84e6911266276..ffefdfdf9af62 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -196,6 +196,7 @@ public function testDeleteCookie()
                     'metadata' => [
                         'domain' => 'magento.url',
                         'path' => '/backend',
+                        'samesite' => 'Strict'
                     ]
                 ]
             );
@@ -346,6 +347,7 @@ public function testSetSensitiveCookieWithPathAndDomain()
                         ],
                     ]
                 );
+            $sensitiveCookieMetadata->setSameSite('Strict');
 
             $this->scopeMock->expects($this->once())
                 ->method('getSensitiveCookieMetadata')
@@ -402,6 +404,7 @@ public function testSetPublicCookieDefaultValues()
                     ],
                 ]
             );
+            $publicCookieMetadata->setSameSite('Lax');
 
             $this->scopeMock->expects($this->once())
                 ->method('getPublicCookieMetadata')
@@ -430,6 +433,7 @@ public function testSetPublicCookieSomeFieldsSet()
                         'domain' => 'magento.url',
                         'path' => '/backend',
                         'http_only' => true,
+                        'samesite' => 'Lax'
                     ],
                 ]
             );
@@ -501,6 +505,7 @@ public function testSetCookieSizeTooLarge()
                         'secure' => false,
                         'http_only' => false,
                         'duration' => 3600,
+                        'samesite' => 'Strict'
                     ],
                 ]
             );
@@ -580,7 +585,7 @@ public function testSetTooManyCookies()
          * Suppressing UnusedFormalParameter, since PHPMD doesn't detect the callback call.
          * @SuppressWarnings(PHPMD.UnusedFormalParameter)
          */
-        public static function assertCookie($name, $value, $expiry, $path, $domain, $secure, $httpOnly)
+        public static function assertCookie($name, $value, $expiry, $path, $domain, $secure, $httpOnly, $sameSite)
         {
             if (self::EXCEPTION_COOKIE_NAME == $name) {
                 return false;
@@ -605,7 +610,8 @@ private static function assertDeleteCookie(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::DELETE_COOKIE_NAME, $name);
             self::assertEquals('', $value);
@@ -614,6 +620,7 @@ private static function assertDeleteCookie(
             self::assertFalse($httpOnly);
             self::assertEquals('magento.url', $domain);
             self::assertEquals('/backend', $path);
+            self::assertEquals('Strict', $sameSite);
         }
 
         /**
@@ -629,7 +636,8 @@ private static function assertDeleteCookieWithNoMetadata(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::DELETE_COOKIE_NAME_NO_METADATA, $name);
             self::assertEquals('', $value);
@@ -638,6 +646,7 @@ private static function assertDeleteCookieWithNoMetadata(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -653,7 +662,8 @@ private static function assertSensitiveCookieWithNoMetaDataHttps(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::SENSITIVE_COOKIE_NAME_NO_METADATA_HTTPS, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -662,6 +672,7 @@ private static function assertSensitiveCookieWithNoMetaDataHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -677,7 +688,8 @@ private static function assertSensitiveCookieWithNoMetaDataNotHttps(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::SENSITIVE_COOKIE_NAME_NO_METADATA_NOT_HTTPS, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -686,6 +698,7 @@ private static function assertSensitiveCookieWithNoMetaDataNotHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -701,7 +714,8 @@ private static function assertSensitiveCookieNoDomainNoPath(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::SENSITIVE_COOKIE_NAME_NO_DOMAIN_NO_PATH, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -710,6 +724,7 @@ private static function assertSensitiveCookieNoDomainNoPath(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -725,7 +740,8 @@ private static function assertSensitiveCookieWithDomainAndPath(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::SENSITIVE_COOKIE_NAME_WITH_DOMAIN_AND_PATH, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -734,6 +750,7 @@ private static function assertSensitiveCookieWithDomainAndPath(
             self::assertTrue($httpOnly);
             self::assertEquals('magento.url', $domain);
             self::assertEquals('/backend', $path);
+            self::assertEquals('Strict', $sameSite);
         }
 
         /**
@@ -749,7 +766,8 @@ private static function assertPublicCookieWithNoMetaData(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::PUBLIC_COOKIE_NAME_NO_METADATA, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -758,6 +776,7 @@ private static function assertPublicCookieWithNoMetaData(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -773,7 +792,8 @@ private static function assertPublicCookieWithNoDomainNoPath(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::PUBLIC_COOKIE_NAME_NO_METADATA, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -782,6 +802,7 @@ private static function assertPublicCookieWithNoDomainNoPath(
             self::assertTrue($httpOnly);
             self::assertEquals('magento.url', $domain);
             self::assertEquals('/backend', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -797,7 +818,8 @@ private static function assertPublicCookieWithDefaultValues(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::PUBLIC_COOKIE_NAME_DEFAULT_VALUES, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -806,6 +828,7 @@ private static function assertPublicCookieWithDefaultValues(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -821,7 +844,8 @@ private static function assertPublicCookieWithSomeFieldSet(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::PUBLIC_COOKIE_NAME_SOME_FIELDS_SET, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -830,6 +854,8 @@ private static function assertPublicCookieWithSomeFieldSet(
             self::assertTrue($httpOnly);
             self::assertEquals('magento.url', $domain);
             self::assertEquals('/backend', $path);
+            self::assertEquals('/backend', $path);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -845,7 +871,8 @@ private static function assertCookieSize(
             $path,
             $domain,
             $secure,
-            $httpOnly
+            $httpOnly,
+            $sameSite
         ) {
             self::assertEquals(self::MAX_COOKIE_SIZE_TEST_NAME, $name);
             self::assertEquals(self::COOKIE_VALUE, $value);
@@ -854,6 +881,7 @@ private static function assertCookieSize(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
+            self::assertEquals('None', $sameSite);
         }
 
         /**
@@ -868,5 +896,22 @@ protected function stubGetCookie($get, $default, $return)
                 ->with($get, $default)
                 ->willReturn($return);
         }
+
+        public function testSetCookieInvalidSameSiteValue()
+        {
+            /** @var \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata $cookieMetadata */
+            $cookieMetadata = $this->objectManager->getObject(
+                CookieMetadata::class
+            );
+
+            try {
+                $cookieMetadata->setSameSite('default value');
+            } catch (\InvalidArgumentException $e) {
+                $this->assertEquals(
+                    'Invalid argument provided for SameSite directive expected one of: Strict, Lax or None',
+                    $e->getMessage()
+                );
+            }
+        }
     }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
index f6fee3377f256..5dc13e7727e76 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
@@ -53,6 +53,7 @@ public function getMethodData()
             "getHttpOnly" => ["setHttpOnly", 'getHttpOnly', true],
             "getSecure" => ["setSecure", 'getSecure', true],
             "getDurationOneYear" => ["setDurationOneYear", 'getDuration', (3600*24*365)],
+            "getSameSite" => ["setSameSite", 'getSameSite', 'Strict']
         ];
     }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
index a6d2b53495ec0..a767c1eac9ad0 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
@@ -14,20 +14,25 @@
  *
  * @param string $name
  * @param string $value
- * @param int $expiry
- * @param string $path
- * @param string $domain
- * @param bool $secure
- * @param bool $httpOnly
+ * @param array $options
  * @return bool
  */
-function setcookie($name, $value, $expiry, $path, $domain, $secure, $httpOnly)
+function setcookie($name, $value, $options)
 {
     global $mockTranslateSetCookie;
 
     if (isset($mockTranslateSetCookie) && $mockTranslateSetCookie === true) {
         PhpCookieManagerTest::$isSetCookieInvoked = true;
-        return PhpCookieManagerTest::assertCookie($name, $value, $expiry, $path, $domain, $secure, $httpOnly);
+        return PhpCookieManagerTest::assertCookie(
+            $name,
+            $value,
+            $options['expires'],
+            $options['path'],
+            $options['domain'],
+            $options['secure'],
+            $options['httponly'],
+            $options['samesite']
+        );
     } else {
         return call_user_func_array(__FUNCTION__, func_get_args());
     }

From 7c8a2b166947dd2a280007e880d9d1db7d8da99a Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Sat, 18 Jul 2020 13:09:59 -0500
Subject: [PATCH 067/671] MC-35389: Set same site attribute.

Static fixes
---
 .../Framework/Stdlib/Cookie/CookieMetadata.php    |  8 ++++++--
 .../Framework/Stdlib/Cookie/PhpCookieManager.php  |  4 +++-
 .../Test/Unit/Cookie/PhpCookieManagerTest.php     | 15 +++++++--------
 .../Test/Unit/Cookie/_files/setcookie_mock.php    |  1 +
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 99c32a1121f82..7ef1d816a163a 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -3,8 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Stdlib\Cookie;
 
+// phpcs:ignore Magento2.Functions.MethodDoubleUnderscore
+
 /**
  * Cookie Attributes
  * @api
@@ -59,7 +63,7 @@ public function __toArray()
      * @param string $domain
      * @return $this
      */
-    public function setDomain($domain)
+    public function setDomain($domain): CookieMetadata
     {
         return $this->set(self::KEY_DOMAIN, $domain);
     }
@@ -148,7 +152,7 @@ public function getSecure()
      * @param  string|null $sameSite
      * @return $this
      */
-    public function setSameSite($sameSite)
+    public function setSameSite($sameSite): CookieMetadata
     {
         if (! array_key_exists(strtolower($sameSite), self::SAME_SITE_ALLOWED_VALUES)) {
             throw new \InvalidArgumentException(
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index b456208fd41f5..97b07d8813d1c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\Stdlib\Cookie;
 
@@ -21,6 +22,7 @@
  * stores the cookie.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class PhpCookieManager implements CookieManagerInterface
 {
@@ -147,7 +149,7 @@ protected function setCookie($name, $value, array $metadataArray)
                 'domain' => $this->extractValue(CookieMetadata::KEY_DOMAIN, $metadataArray, ''),
                 'secure' => $this->extractValue(CookieMetadata::KEY_SECURE, $metadataArray, false),
                 'httponly' => $this->extractValue(CookieMetadata::KEY_HTTP_ONLY, $metadataArray, false),
-                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, 'None')
+                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, 'Lax')
             ]
         );
 
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index ffefdfdf9af62..e5b9973d216e8 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -73,8 +73,6 @@ class PhpCookieManagerTest extends TestCase
             self::SENSITIVE_COOKIE_NAME_WITH_DOMAIN_AND_PATH => 'self::assertSensitiveCookieWithDomainAndPath',
             self::PUBLIC_COOKIE_NAME_NO_METADATA => 'self::assertPublicCookieWithNoMetaData',
             self::PUBLIC_COOKIE_NAME_DEFAULT_VALUES => 'self::assertPublicCookieWithDefaultValues',
-            self::PUBLIC_COOKIE_NAME_NO_METADATA => 'self::assertPublicCookieWithNoMetaData',
-            self::PUBLIC_COOKIE_NAME_DEFAULT_VALUES => 'self::assertPublicCookieWithDefaultValues',
             self::PUBLIC_COOKIE_NAME_SOME_FIELDS_SET => 'self::assertPublicCookieWithSomeFieldSet',
             self::MAX_COOKIE_SIZE_TEST_NAME => 'self::assertCookieSize',
         ];
@@ -590,6 +588,7 @@ public static function assertCookie($name, $value, $expiry, $path, $domain, $sec
             if (self::EXCEPTION_COOKIE_NAME == $name) {
                 return false;
             } elseif (isset(self::$functionTestAssertionMapping[$name])) {
+                // phpcs:ignore
                 call_user_func_array(self::$functionTestAssertionMapping[$name], func_get_args());
             } else {
                 self::fail('Non-tested case in mock setcookie()');
@@ -646,7 +645,7 @@ private static function assertDeleteCookieWithNoMetadata(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('None', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -672,7 +671,7 @@ private static function assertSensitiveCookieWithNoMetaDataHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('None', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -698,7 +697,7 @@ private static function assertSensitiveCookieWithNoMetaDataNotHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('None', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -724,7 +723,7 @@ private static function assertSensitiveCookieNoDomainNoPath(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('None', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -776,7 +775,7 @@ private static function assertPublicCookieWithNoMetaData(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('None', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -881,7 +880,7 @@ private static function assertCookieSize(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('None', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
index a767c1eac9ad0..1c01631a94ab2 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/_files/setcookie_mock.php
@@ -34,6 +34,7 @@ function setcookie($name, $value, $options)
             $options['samesite']
         );
     } else {
+        // phpcs:ignore
         return call_user_func_array(__FUNCTION__, func_get_args());
     }
 }

From f39fe6f756537d9577d5943d4d0cea992d34f18a Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Sat, 18 Jul 2020 20:26:59 -0500
Subject: [PATCH 068/671] MC-35389: Set same site attribute.

Fix strict type error.
---
 .../Magento/Framework/Stdlib/Cookie/PhpCookieManager.php      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index 97b07d8813d1c..a5fe6f6c61506 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -100,7 +100,7 @@ public function __construct(
     public function setSensitiveCookie($name, $value, SensitiveCookieMetadata $metadata = null)
     {
         $metadataArray = $this->scope->getSensitiveCookieMetadata($metadata)->__toArray();
-        $this->setCookie($name, $value, $metadataArray);
+        $this->setCookie((string)$name, (string)$value, $metadataArray);
     }
 
     /**
@@ -120,7 +120,7 @@ public function setSensitiveCookie($name, $value, SensitiveCookieMetadata $metad
     public function setPublicCookie($name, $value, PublicCookieMetadata $metadata = null)
     {
         $metadataArray = $this->scope->getPublicCookieMetadata($metadata)->__toArray();
-        $this->setCookie($name, $value, $metadataArray);
+        $this->setCookie((string)$name, (string)$value, $metadataArray);
     }
 
     /**

From f0c645307e031f9c6b8beb31f18c801dc62c02e3 Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Sun, 19 Jul 2020 11:07:26 +0200
Subject: [PATCH 069/671] Avoids indefinite loop of indexers being marked as
 invalid.

---
 app/code/Magento/Indexer/Model/Processor.php  | 80 ++++++++++++++++---
 .../Indexer/Test/Unit/Model/ProcessorTest.php |  8 ++
 2 files changed, 76 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Indexer/Model/Processor.php b/app/code/Magento/Indexer/Model/Processor.php
index 534ea805bb8fc..01f530488fbe7 100644
--- a/app/code/Magento/Indexer/Model/Processor.php
+++ b/app/code/Magento/Indexer/Model/Processor.php
@@ -15,6 +15,11 @@
  */
 class Processor
 {
+    /**
+     * @var array
+     */
+    private $sharedIndexesComplete = [];
+
     /**
      * @var ConfigInterface
      */
@@ -60,32 +65,83 @@ public function __construct(
      */
     public function reindexAllInvalid()
     {
-        $sharedIndexesComplete = [];
         foreach (array_keys($this->config->getIndexers()) as $indexerId) {
             /** @var Indexer $indexer */
             $indexer = $this->indexerFactory->create();
             $indexer->load($indexerId);
             $indexerConfig = $this->config->getIndexer($indexerId);
+            $sharedIndex = $indexerConfig['shared_index'];
+
             if ($indexer->isInvalid()) {
                 // Skip indexers having shared index that was already complete
                 $sharedIndex = $indexerConfig['shared_index'] ?? null;
-                if (!in_array($sharedIndex, $sharedIndexesComplete)) {
+                if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
                     $indexer->reindexAll();
-                } else {
-                    /** @var \Magento\Indexer\Model\Indexer\State $state */
-                    $state = $indexer->getState();
-                    $state->setStatus(StateInterface::STATUS_WORKING);
-                    $state->save();
-                    $state->setStatus(StateInterface::STATUS_VALID);
-                    $state->save();
-                }
-                if ($sharedIndex) {
-                    $sharedIndexesComplete[] = $sharedIndex;
+
+                    if ($sharedIndex) {
+                        $this->validateSharedIndex($sharedIndex);
+                    }
                 }
             }
         }
     }
 
+    /**
+     * Get indexer ids that have common shared index
+     *
+     * @param string $sharedIndex
+     * @return array
+     */
+    private function getIndexerIdsBySharedIndex(string $sharedIndex): array
+    {
+        $indexers = $this->config->getIndexers();
+
+        $result = [];
+        foreach ($indexers as $indexerConfig) {
+            if ($indexerConfig['shared_index'] == $sharedIndex) {
+                $result[] = $indexerConfig['indexer_id'];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate indexers by shared index ID
+     *
+     * @param string $sharedIndex
+     * @return $this
+     */
+    private function validateSharedIndex(string $sharedIndex): self
+    {
+        if (empty($sharedIndex)) {
+            throw new \InvalidArgumentException(
+                'The sharedIndex is an invalid shared index identifier. Verify the identifier and try again.'
+            );
+        }
+
+        $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
+        if (empty($indexerIds)) {
+            return $this;
+        }
+
+        foreach ($indexerIds as $indexerId) {
+            /** @var \Magento\Indexer\Model\Indexer $indexer */
+            $indexer = $this->indexerFactory->create();
+            $indexer->load($indexerId);
+            /** @var \Magento\Indexer\Model\Indexer\State $state */
+            $state = $indexer->getState();
+            $state->setStatus(StateInterface::STATUS_WORKING);
+            $state->save();
+            $state->setStatus(StateInterface::STATUS_VALID);
+            $state->save();
+        }
+
+        $this->sharedIndexesComplete[] = $sharedIndex;
+
+        return $this;
+    }
+
     /**
      * Regenerate indexes for all indexers
      *
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php b/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
index 7a06fb745ba89..9cc0277997289 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
@@ -85,6 +85,14 @@ public function testReindexAllInvalid()
 
         $this->configMock->expects($this->once())->method('getIndexers')->willReturn($indexers);
 
+        $this->configMock->expects($this->exactly(2))
+            ->method('getIndexer')
+            ->willReturn(
+                [
+                    'shared_index' => null
+                ]
+            );
+
         $state1Mock = $this->createPartialMock(State::class, ['getStatus', '__wakeup']);
         $state1Mock->expects(
             $this->once()

From 3dcf9110e7147beebf1529880315dfc1daccedc7 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Mon, 20 Jul 2020 13:32:27 -0500
Subject: [PATCH 070/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/Model/Wysiwyg/Validator.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Validator.php b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
index c3eb14082ee98..eb17a0f3127ea 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
@@ -72,7 +72,10 @@ public function validate(string $content): void
                 throw $exception;
             } else {
                 $this->messages->addWarningMessage(
-                    __('Temporarily allowed to save restricted HTML value. %1', $exception->getMessage())
+                    __(
+                        'Temporarily allowed to save HTML value that contains restricted elements. %1',
+                        $exception->getMessage()
+                    )
                 );
             }
         } catch (\Throwable $exception) {

From a962cced8cf519a90483dfcebcb98af29c8a269f Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Mon, 20 Jul 2020 16:00:47 -0500
Subject: [PATCH 071/671] MC-35389: Set same site attribute.

Fix default value for same site.
Static fixes.
---
 .../Framework/Stdlib/Cookie/CookieMetadata.php       |  8 +++-----
 .../Framework/Stdlib/Cookie/PhpCookieManager.php     |  2 +-
 .../Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php | 12 ++++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 7ef1d816a163a..2c757691a6c91 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -7,8 +7,6 @@
 
 namespace Magento\Framework\Stdlib\Cookie;
 
-// phpcs:ignore Magento2.Functions.MethodDoubleUnderscore
-
 /**
  * Cookie Attributes
  * @api
@@ -48,11 +46,11 @@ public function __construct($metadata = [])
     /**
      * Returns an array representation of this metadata.
      *
-     * If a value has not yet been set then the key will not show up in the array.
+     * If a value has not yet been set then the key will not show up in the array
      *
      * @return array
      */
-    public function __toArray()
+    public function __toArray() //phpcs:ignore PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames
     {
         return $this->metadata;
     }
@@ -63,7 +61,7 @@ public function __toArray()
      * @param string $domain
      * @return $this
      */
-    public function setDomain($domain): CookieMetadata
+    public function setDomain($domain)
     {
         return $this->set(self::KEY_DOMAIN, $domain);
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index a5fe6f6c61506..5cfd38e258145 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -149,7 +149,7 @@ protected function setCookie($name, $value, array $metadataArray)
                 'domain' => $this->extractValue(CookieMetadata::KEY_DOMAIN, $metadataArray, ''),
                 'secure' => $this->extractValue(CookieMetadata::KEY_SECURE, $metadataArray, false),
                 'httponly' => $this->extractValue(CookieMetadata::KEY_HTTP_ONLY, $metadataArray, false),
-                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, 'Lax')
+                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, '')
             ]
         );
 
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index e5b9973d216e8..1a4c1af07ec2f 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -645,7 +645,7 @@ private static function assertDeleteCookieWithNoMetadata(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Lax', $sameSite);
+            self::assertEquals('', $sameSite);
         }
 
         /**
@@ -671,7 +671,7 @@ private static function assertSensitiveCookieWithNoMetaDataHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Lax', $sameSite);
+            self::assertEquals('', $sameSite);
         }
 
         /**
@@ -697,7 +697,7 @@ private static function assertSensitiveCookieWithNoMetaDataNotHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Lax', $sameSite);
+            self::assertEquals('', $sameSite);
         }
 
         /**
@@ -723,7 +723,7 @@ private static function assertSensitiveCookieNoDomainNoPath(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Lax', $sameSite);
+            self::assertEquals('', $sameSite);
         }
 
         /**
@@ -775,7 +775,7 @@ private static function assertPublicCookieWithNoMetaData(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Lax', $sameSite);
+            self::assertEquals('', $sameSite);
         }
 
         /**
@@ -880,7 +880,7 @@ private static function assertCookieSize(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Lax', $sameSite);
+            self::assertEquals('', $sameSite);
         }
 
         /**

From 1a9fc92f48a84dc8744e6254180e33743406de96 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Tue, 21 Jul 2020 10:03:24 -0500
Subject: [PATCH 072/671] MC-35389: Set same site attribute.

Fix punctuation in method signature.
---
 lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 2c757691a6c91..83e1630f939d7 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -46,7 +46,7 @@ public function __construct($metadata = [])
     /**
      * Returns an array representation of this metadata.
      *
-     * If a value has not yet been set then the key will not show up in the array
+     * If a value has not yet been set then the key will not show up in the array.
      *
      * @return array
      */

From fdd36dea96bb8085a67509a3a492e013f0ffae44 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Tue, 21 Jul 2020 15:35:09 -0500
Subject: [PATCH 073/671] MC-35389: Set same site attribute.

Cookie manager default value updates.
Fixes to unit tests.
Cookie Metadata constant visibility updates.
---
 .../Stdlib/Cookie/CookieMetadata.php          | 23 ++++-----
 .../Stdlib/Cookie/PhpCookieManager.php        |  2 +-
 .../Stdlib/Cookie/PublicCookieMetadata.php    | 13 ++++-
 .../Stdlib/Cookie/SensitiveCookieMetadata.php |  9 ++--
 .../Test/Unit/Cookie/PhpCookieManagerTest.php | 21 ++++----
 .../Unit/Cookie/PublicCookieMetadataTest.php  | 48 ++++++++++++++++++-
 .../Cookie/SensitiveCookieMetadataTest.php    |  3 ++
 7 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 83e1630f939d7..8cec82d64199c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -16,13 +16,13 @@ class CookieMetadata
     /**#@+
      * Constant for metadata value key.
      */
-    const KEY_DOMAIN = 'domain';
-    const KEY_PATH = 'path';
-    const KEY_SECURE = 'secure';
-    const KEY_HTTP_ONLY = 'http_only';
-    const KEY_DURATION = 'duration';
-    const KEY_SAME_SITE = 'samesite';
-    const SAME_SITE_ALLOWED_VALUES = [
+    public const KEY_DOMAIN = 'domain';
+    public const KEY_PATH = 'path';
+    public const KEY_SECURE = 'secure';
+    public const KEY_HTTP_ONLY = 'http_only';
+    public const KEY_DURATION = 'duration';
+    public const KEY_SAME_SITE = 'samesite';
+    private const SAME_SITE_ALLOWED_VALUES = [
         'strict' => 'Strict',
         'lax' => 'Lax',
         'none' => 'None',
@@ -150,22 +150,23 @@ public function getSecure()
      * @param  string|null $sameSite
      * @return $this
      */
-    public function setSameSite($sameSite): CookieMetadata
+    public function setSameSite(?string $sameSite): CookieMetadata
     {
-        if (! array_key_exists(strtolower($sameSite), self::SAME_SITE_ALLOWED_VALUES)) {
+        if (!array_key_exists(strtolower($sameSite), self::SAME_SITE_ALLOWED_VALUES)) {
             throw new \InvalidArgumentException(
                 'Invalid argument provided for SameSite directive expected one of: Strict, Lax or None'
             );
         }
+        $sameSite = self::SAME_SITE_ALLOWED_VALUES[strtolower($sameSite)];
         return $this->set(self::KEY_SAME_SITE, $sameSite);
     }
 
     /**
      * Get Same Site Flag
      *
-     * @return bool|null
+     * @return string|null
      */
-    public function getSameSite()
+    public function getSameSite(): ?string
     {
         return $this->get(self::KEY_SAME_SITE);
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
index 5cfd38e258145..a5fe6f6c61506 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PhpCookieManager.php
@@ -149,7 +149,7 @@ protected function setCookie($name, $value, array $metadataArray)
                 'domain' => $this->extractValue(CookieMetadata::KEY_DOMAIN, $metadataArray, ''),
                 'secure' => $this->extractValue(CookieMetadata::KEY_SECURE, $metadataArray, false),
                 'httponly' => $this->extractValue(CookieMetadata::KEY_HTTP_ONLY, $metadataArray, false),
-                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, '')
+                'samesite' => $this->extractValue(CookieMetadata::KEY_SAME_SITE, $metadataArray, 'Lax')
             ]
         );
 
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
index ef40ea94a6d08..6e5e174e4e9f9 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
@@ -7,12 +7,23 @@
 namespace Magento\Framework\Stdlib\Cookie;
 
 /**
- * Class PublicCookieMetadata
+ * Public Cookie Attributes
  *
  * @api
  */
 class PublicCookieMetadata extends CookieMetadata
 {
+    /**
+     * @param array $metadata
+     */
+    public function __construct($metadata = [])
+    {
+        if (!isset($metadata[self::KEY_SAME_SITE])) {
+            $metadata[self::KEY_SAME_SITE] = 'Lax';
+        }
+        parent::__construct($metadata);
+    }
+
     /**
      * Set the number of seconds until the cookie expires
      *
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
index aab8e93160c8d..b913e49e77716 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
@@ -9,7 +9,7 @@
 use Magento\Framework\App\RequestInterface;
 
 /**
- * Class SensitiveCookieMetadata
+ * Sensitive Cookie Attributes
  *
  * The class has only methods extended from CookieMetadata
  * as path and domain are only data to be exposed by SensitiveCookieMetadata
@@ -32,12 +32,15 @@ public function __construct(RequestInterface $request, $metadata = [])
         if (!isset($metadata[self::KEY_HTTP_ONLY])) {
             $metadata[self::KEY_HTTP_ONLY] = true;
         }
+        if (!isset($metadata[self::KEY_SAME_SITE])) {
+            $metadata[self::KEY_SAME_SITE] = 'Strict';
+        }
         $this->request = $request;
         parent::__construct($metadata);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSecure()
     {
@@ -46,7 +49,7 @@ public function getSecure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function __toArray()
     {
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index 1a4c1af07ec2f..d55a4200a5750 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -345,7 +345,6 @@ public function testSetSensitiveCookieWithPathAndDomain()
                         ],
                     ]
                 );
-            $sensitiveCookieMetadata->setSameSite('Strict');
 
             $this->scopeMock->expects($this->once())
                 ->method('getSensitiveCookieMetadata')
@@ -402,7 +401,6 @@ public function testSetPublicCookieDefaultValues()
                     ],
                 ]
             );
-            $publicCookieMetadata->setSameSite('Lax');
 
             $this->scopeMock->expects($this->once())
                 ->method('getPublicCookieMetadata')
@@ -645,7 +643,7 @@ private static function assertDeleteCookieWithNoMetadata(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -671,7 +669,7 @@ private static function assertSensitiveCookieWithNoMetaDataHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('', $sameSite);
+            self::assertEquals('Strict', $sameSite);
         }
 
         /**
@@ -697,7 +695,7 @@ private static function assertSensitiveCookieWithNoMetaDataNotHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('', $sameSite);
+            self::assertEquals('Strict', $sameSite);
         }
 
         /**
@@ -723,7 +721,7 @@ private static function assertSensitiveCookieNoDomainNoPath(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('', $sameSite);
+            self::assertEquals('Strict', $sameSite);
         }
 
         /**
@@ -775,7 +773,7 @@ private static function assertPublicCookieWithNoMetaData(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -880,7 +878,7 @@ private static function assertCookieSize(
             self::assertFalse($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -896,7 +894,12 @@ protected function stubGetCookie($get, $default, $return)
                 ->willReturn($return);
         }
 
-        public function testSetCookieInvalidSameSiteValue()
+        /**
+         * Test Set Invalid Same Site Cookie
+         *
+         * @return void
+         */
+        public function testSetCookieInvalidSameSiteValue(): void
         {
             /** @var \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata $cookieMetadata */
             $cookieMetadata = $this->objectManager->getObject(
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
index 5dc13e7727e76..a6b5e43b44bbe 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
@@ -20,11 +20,13 @@ class PublicCookieMetadataTest extends TestCase
 {
     /** @var PublicCookieMetadata */
     private $publicCookieMetadata;
+    /** @var  ObjectManager */
+    private $objectManager;
 
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
-        $this->publicCookieMetadata = $objectManager->getObject(
+        $this->objectManager = new ObjectManager($this);
+        $this->publicCookieMetadata = $this->objectManager->getObject(
             PublicCookieMetadata::class
         );
     }
@@ -56,4 +58,46 @@ public function getMethodData()
             "getSameSite" => ["setSameSite", 'getSameSite', 'Strict']
         ];
     }
+
+    /**
+     * @return array
+     */
+    public function toArrayDataProvider(): array
+    {
+        return [
+            [
+                [
+                    PublicCookieMetadata::KEY_SECURE => false,
+                    PublicCookieMetadata::KEY_DOMAIN => 'domain',
+                    PublicCookieMetadata::KEY_PATH => 'path',
+                ],
+                [
+                    PublicCookieMetadata::KEY_SECURE => false,
+                    PublicCookieMetadata::KEY_DOMAIN => 'domain',
+                    PublicCookieMetadata::KEY_PATH => 'path',
+                    PublicCookieMetadata::KEY_SAME_SITE => 'Lax',
+                ],
+            ]
+        ];
+    }
+
+    /**
+     * Test To Array
+     *
+     * @param array $metadata
+     * @param array $expected
+     * @dataProvider toArrayDataProvider
+     * @return void
+     */
+    public function testToArray(array $metadata, array $expected): void
+    {
+        /** @var \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata $object */
+        $object = $this->objectManager->getObject(
+            PublicCookieMetadata::class,
+            [
+                'metadata' => $metadata,
+            ]
+        );
+        $this->assertEquals($expected, $object->__toArray());
+    }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
index 864c71ca2cc86..e93e0703d7e04 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
@@ -189,6 +189,7 @@ public function toArrayDataProvider()
                     SensitiveCookieMetadata::KEY_DOMAIN => 'domain',
                     SensitiveCookieMetadata::KEY_PATH => 'path',
                     SensitiveCookieMetadata::KEY_HTTP_ONLY => 1,
+                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
                 ],
                 0,
             ],
@@ -203,6 +204,7 @@ public function toArrayDataProvider()
                     SensitiveCookieMetadata::KEY_DOMAIN => 'domain',
                     SensitiveCookieMetadata::KEY_PATH => 'path',
                     SensitiveCookieMetadata::KEY_HTTP_ONLY => 1,
+                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
                 ],
             ],
             'without secure 2' => [
@@ -216,6 +218,7 @@ public function toArrayDataProvider()
                     SensitiveCookieMetadata::KEY_DOMAIN => 'domain',
                     SensitiveCookieMetadata::KEY_PATH => 'path',
                     SensitiveCookieMetadata::KEY_HTTP_ONLY => 1,
+                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
                 ],
             ],
         ];

From 79f9defaaa00bfafd4411a3900e1f28896fab303 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Tue, 21 Jul 2020 20:24:49 -0500
Subject: [PATCH 074/671] MC-35389: Set same site attribute.

Unit and Integration test fixes.
---
 .../Stdlib/Cookie/CookieScopeTest.php         |  9 ++++++--
 .../Stdlib/Cookie/SensitiveCookieMetadata.php |  2 +-
 .../Test/Unit/Cookie/CookieScopeTest.php      | 21 ++++++++++++-------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
index 5670c54e1fbd2..e10fae226a0be 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
@@ -43,6 +43,7 @@ public function testGetSensitiveCookieMetadataEmpty()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -50,11 +51,11 @@ public function testGetSensitiveCookieMetadataEmpty()
         $this->request->setServer(new Parameters($serverVal));
     }
 
-    public function testGetPublicCookieMetadataEmpty()
+    public function testGetPublicCookieMetadataNotEmpty()
     {
         $cookieScope = $this->createCookieScope();
 
-        $this->assertEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
     }
 
     public function testGetSensitiveCookieMetadataDefaults()
@@ -77,6 +78,7 @@ public function testGetSensitiveCookieMetadataDefaults()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'default domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => false,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -90,6 +92,7 @@ public function testGetPublicCookieMetadataDefaults()
             PublicCookieMetadata::KEY_DURATION => 'default duration',
             PublicCookieMetadata::KEY_HTTP_ONLY => 'default http',
             PublicCookieMetadata::KEY_SECURE => 'default secure',
+            PublicCookieMetadata::KEY_SAME_SITE => 'Lax'
         ];
         $public = $this->createPublicMetadata($defaultValues);
         $cookieScope = $this->createCookieScope(
@@ -139,6 +142,7 @@ public function testGetSensitiveCookieMetadataOverrides()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'override domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => false,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata($override)->__toArray()
         );
@@ -159,6 +163,7 @@ public function testGetPublicCookieMetadataOverrides()
             PublicCookieMetadata::KEY_DURATION => 'override duration',
             PublicCookieMetadata::KEY_HTTP_ONLY => 'override http',
             PublicCookieMetadata::KEY_SECURE => 'override secure',
+            PublicCookieMetadata::KEY_SAME_SITE => 'Lax'
         ];
         $public = $this->createPublicMetadata($defaultValues);
         $cookieScope = $this->createCookieScope(
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
index b913e49e77716..1b184ab979790 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
@@ -51,7 +51,7 @@ public function getSecure()
     /**
      * @inheritdoc
      */
-    public function __toArray()
+    public function __toArray() //phpcs:ignore PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames
     {
         $this->updateSecureValue();
         return parent::__toArray();
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
index ccaa20103652a..4ae3336a40d7d 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
@@ -68,6 +68,7 @@ public function testGetSensitiveCookieMetadataEmpty()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -76,21 +77,21 @@ public function testGetSensitiveCookieMetadataEmpty()
     /**
      * @covers ::getPublicCookieMetadata
      */
-    public function testGetPublicCookieMetadataEmpty()
+    public function testGetPublicCookieMetadataNotEmpty()
     {
         $cookieScope = $this->createCookieScope();
 
-        $this->assertEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
     }
 
     /**
      * @covers ::getCookieMetadata
      */
-    public function testGetCookieMetadataEmpty()
+    public function testGetCookieMetadataNotEmpty()
     {
         $cookieScope = $this->createCookieScope();
 
-        $this->assertEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
     }
 
     /**
@@ -111,7 +112,7 @@ public function testGetSensitiveCookieMetadataDefaults()
             ]
         );
 
-        $this->assertEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
         $this->assertEmpty($cookieScope->getCookieMetadata()->__toArray());
         $this->assertEquals(
             [
@@ -119,6 +120,7 @@ public function testGetSensitiveCookieMetadataDefaults()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'default domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -135,6 +137,7 @@ public function testGetPublicCookieMetadataDefaults()
             PublicCookieMetadata::KEY_DURATION => 'default duration',
             PublicCookieMetadata::KEY_HTTP_ONLY => 'default http',
             PublicCookieMetadata::KEY_SECURE => 'default secure',
+            SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
         ];
         $public = $this->createPublicMetadata($defaultValues);
         $cookieScope = $this->createCookieScope(
@@ -149,6 +152,7 @@ public function testGetPublicCookieMetadataDefaults()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -200,7 +204,7 @@ public function testGetSensitiveCookieMetadataOverrides()
         );
         $override = $this->createSensitiveMetadata($overrideValues);
 
-        $this->assertEmpty($cookieScope->getPublicCookieMetadata($this->createPublicMetadata())->__toArray());
+        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata($this->createPublicMetadata())->__toArray());
         $this->assertEmpty($cookieScope->getCookieMetadata($this->createCookieMetadata())->__toArray());
         $this->assertEquals(
             [
@@ -208,6 +212,7 @@ public function testGetSensitiveCookieMetadataOverrides()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'override domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata($override)->__toArray()
         );
@@ -231,6 +236,7 @@ public function testGetPublicCookieMetadataOverrides()
             PublicCookieMetadata::KEY_DURATION => 'override duration',
             PublicCookieMetadata::KEY_HTTP_ONLY => 'override http',
             PublicCookieMetadata::KEY_SECURE => 'override secure',
+            PublicCookieMetadata::KEY_SAME_SITE => 'Strict'
         ];
         $public = $this->createPublicMetadata($defaultValues);
         $cookieScope = $this->createCookieScope(
@@ -271,11 +277,12 @@ public function testGetCookieMetadataOverrides()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
             ],
             $cookieScope->getSensitiveCookieMetadata($this->createSensitiveMetadata())->__toArray()
         );
         $this->assertEquals(
-            [],
+            ['samesite' => 'Lax'],
             $cookieScope->getPublicCookieMetadata($this->createPublicMetadata())->__toArray()
         );
         $this->assertEquals($overrideValues, $cookieScope->getCookieMetadata($override)->__toArray());

From 3dd1811cd5e4dad3f05b3881a8a1b63490086be3 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Wed, 22 Jul 2020 16:41:14 -0500
Subject: [PATCH 075/671] MC-34385: Filter fields allowing HTML

---
 app/etc/di.xml                                | 31 +++++++
 .../HTML/ConfigurableWYSIWYGValidatorTest.php | 89 +++++++++++++++----
 .../HTML/StyleAttributeValidatorTest.php      | 57 ++++++++++++
 .../HTML/AttributeValidatorInterface.php      | 28 ++++++
 .../HTML/ConfigurableWYSIWYGValidator.php     | 32 +++++--
 .../HTML/StyleAttributeValidator.php          | 31 +++++++
 6 files changed, 248 insertions(+), 20 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Test/Unit/Validator/HTML/StyleAttributeValidatorTest.php
 create mode 100644 lib/internal/Magento/Framework/Validator/HTML/AttributeValidatorInterface.php
 create mode 100644 lib/internal/Magento/Framework/Validator/HTML/StyleAttributeValidator.php

diff --git a/app/etc/di.xml b/app/etc/di.xml
index 9b85e09ac9611..fa1887cbe1372 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1837,14 +1837,45 @@
             <argument name="allowedTags" xsi:type="array">
                 <item name="div" xsi:type="string">div</item>
                 <item name="a" xsi:type="string">a</item>
+                <item name="p" xsi:type="string">p</item>
+                <item name="span" xsi:type="string">span</item>
+                <item name="em" xsi:type="string">em</item>
+                <item name="strong" xsi:type="string">strong</item>
+                <item name="ul" xsi:type="string">ul</item>
+                <item name="li" xsi:type="string">li</item>
+                <item name="ol" xsi:type="string">ol</item>
+                <item name="h5" xsi:type="string">h5</item>
+                <item name="h4" xsi:type="string">h4</item>
+                <item name="h3" xsi:type="string">h3</item>
+                <item name="h2" xsi:type="string">h2</item>
+                <item name="h1" xsi:type="string">h1</item>
+                <item name="table" xsi:type="string">table</item>
+                <item name="tbody" xsi:type="string">tbody</item>
+                <item name="tr" xsi:type="string">tr</item>
+                <item name="td" xsi:type="string">td</item>
+                <item name="th" xsi:type="string">th</item>
+                <item name="tfoot" xsi:type="string">tfoot</item>
+                <item name="img" xsi:type="string">img</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>
+                <item name="width" xsi:type="string">width</item>
+                <item name="height" xsi:type="string">height</item>
+                <item name="style" xsi:type="string">style</item>
+                <item name="alt" xsi:type="string">alt</item>
+                <item name="title" xsi:type="string">title</item>
+                <item name="border" xsi:type="string">border</item>
             </argument>
             <argument name="attributesAllowedByTags" xsi:type="array">
                 <item name="a" xsi:type="array">
                     <item name="href" xsi:type="string">href</item>
                 </item>
+                <item name="img" xsi:type="array">
+                    <item name="src" xsi:type="string">src</item>
+                </item>
+            </argument>
+            <argument name="attributeValidators" xsi:type="array">
+                <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
index aef019b20f519..43ff2ae1377b0 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
@@ -10,6 +10,7 @@
 
 use Magento\Framework\Validation\ValidationException;
 use Magento\Framework\Validator\HTML\ConfigurableWYSIWYGValidator;
+use Magento\Framework\Validator\HTML\AttributeValidatorInterface;
 use PHPUnit\Framework\TestCase;
 
 class ConfigurableWYSIWYGValidatorTest extends TestCase
@@ -22,25 +23,34 @@ class ConfigurableWYSIWYGValidatorTest extends TestCase
     public function getConfigurations(): array
     {
         return [
-            'no-html' => [['div'], [], [], 'just text', true],
-            'allowed-tag' => [['div'], [], [], 'just text and <div>a div</div>', true],
-            'restricted-tag' => [['div', 'p'], [], [], 'text and <p>a p</p>, <div>a div</div>,  <tr>a tr</tr>', false],
-            'restricted-tag-wtih-attr' => [['div'], [], [], 'just text and <p class="fake-class">a p</p>', false],
-            'allowed-tag-with-attr' => [['div'], [], [], 'just text and <div class="fake-class">a div</div>', false],
-            'multiple-tags' => [['div', 'p'], [], [], 'just text and <div>a div</div> and <p>a p</p>', true],
+            'no-html' => [['div'], [], [], 'just text', true, []],
+            'allowed-tag' => [['div'], [], [], 'just text and <div>a div</div>', true, []],
+            'restricted-tag' => [
+                ['div', 'p'],
+                [],
+                [],
+                'text and <p>a p</p>, <div>a div</div>,  <tr>a tr</tr>',
+                false,
+                []
+            ],
+            'restricted-tag-wtih-attr' => [['div'], [], [], 'just text and <p class="fake-class">a p</p>', false, []],
+            'allowed-tag-with-attr' => [['div'], [], [], 'just text and <div class="fake-class">a div</div>', false, []],
+            'multiple-tags' => [['div', 'p'], [], [], 'just text and <div>a div</div> and <p>a p</p>', true, []],
             'tags-with-attrs' => [
                 ['div', 'p'],
                 ['class', 'style'],
                 [],
                 'text and <div class="fake-class">a div</div> and <p style="color: blue">a p</p>',
-                true
+                true,
+                []
             ],
             'tags-with-restricted-attrs' => [
                 ['div', 'p'],
                 ['class', 'align'],
                 [],
                 'text and <div class="fake-class">a div</div> and <p style="color: blue">a p</p>',
-                false
+                false,
+                []
             ],
             'tags-with-specific-attrs' => [
                 ['div', 'a', 'p'],
@@ -48,14 +58,16 @@ public function getConfigurations(): array
                 ['a' => ['href'], 'div' => ['style']],
                 '<div class="fake-class" style="color: blue">a div</div>, <a href="/some-path" class="a">an a</a>'
                 .', <p class="p-class">a p</p>',
-                true
+                true,
+                []
             ],
             'tags-with-specific-restricted-attrs' => [
                 ['div', 'a'],
                 ['class'],
                 ['a' => ['href']],
                 'text and <div class="fake-class" href="what">a div</div> and <a href="/some-path" class="a">an a</a>',
-                false
+                false,
+                []
             ],
             'invalid-tag-with-full-config' => [
                 ['div', 'a', 'p'],
@@ -63,21 +75,48 @@ public function getConfigurations(): array
                 ['a' => ['href'], 'div' => ['style']],
                 '<div class="fake-class" style="color: blue">a div</div>, <a href="/some-path" class="a">an a</a>'
                 .', <p class="p-class">a p</p>, <img src="test.jpg" />',
-                false
+                false,
+                []
             ],
             'invalid-html' => [
                 ['div', 'a', 'p'],
                 ['class', 'src'],
                 ['a' => ['href'], 'div' => ['style']],
                 'some </,none-> </html>',
-                true
+                true,
+                []
             ],
             'invalid-html-with-violations' => [
                 ['div', 'a', 'p'],
                 ['class', 'src'],
                 ['a' => ['href'], 'div' => ['style']],
                 'some </,none-> </html> <tr>some trs</tr>',
-                false
+                false,
+                []
+            ],
+            'invalid-html-attributes' => [
+                ['div', 'a', 'p'],
+                ['class', 'src'],
+                [],
+                'some <div class="value">DIV</div>',
+                false,
+                ['class' => false]
+            ],
+            'ignored-html-attributes' => [
+                ['div', 'a', 'p'],
+                ['class', 'src'],
+                [],
+                'some <div class="value">DIV</div>',
+                true,
+                ['src' => false, 'class' => true]
+            ],
+            'valid-html-attributes' => [
+                ['div', 'a', 'p'],
+                ['class', 'src'],
+                [],
+                'some <div class="value">DIV</div>',
+                true,
+                ['src' => true, 'class' => true]
             ]
         ];
     }
@@ -90,6 +129,7 @@ public function getConfigurations(): array
      * @param array $allowedTagAttrs
      * @param string $html
      * @param bool $isValid
+     * @param array $attributeValidityMap
      * @return void
      * @dataProvider getConfigurations
      */
@@ -98,9 +138,28 @@ public function testConfigurations(
         array $allowedAttr,
         array $allowedTagAttrs,
         string $html,
-        bool $isValid
+        bool $isValid,
+        array $attributeValidityMap
     ): void {
-        $validator = new ConfigurableWYSIWYGValidator($allowedTags, $allowedAttr, $allowedTagAttrs);
+        $attributeValidator = $this->getMockForAbstractClass(AttributeValidatorInterface::class);
+        $attributeValidator->method('validate')
+            ->willReturnCallback(
+                function (string $tag, string $attribute, string $content) use ($attributeValidityMap): void {
+                    if (array_key_exists($attribute, $attributeValidityMap) && !$attributeValidityMap[$attribute]) {
+                        throw new ValidationException(__('Invalid attribute for %1', $tag));
+                    }
+                }
+            );
+        $attrValidators = [];
+        foreach (array_keys($attributeValidityMap) as $attr) {
+            $attrValidators[$attr] = $attributeValidator;
+        }
+        $validator = new ConfigurableWYSIWYGValidator(
+            $allowedTags,
+            $allowedAttr,
+            $allowedTagAttrs,
+            $attrValidators
+        );
         $valid = true;
         try {
             $validator->validate($html);
diff --git a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/StyleAttributeValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/StyleAttributeValidatorTest.php
new file mode 100644
index 0000000000000..b705939feec16
--- /dev/null
+++ b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/StyleAttributeValidatorTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Test\Unit\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\StyleAttributeValidator;
+use PHPUnit\Framework\TestCase;
+
+class StyleAttributeValidatorTest extends TestCase
+{
+    /**
+     * Cases for "validate" test.
+     *
+     * @return array
+     */
+    public function getAttributes(): array
+    {
+        return [
+            'not a style' => ['class', 'value', true],
+            'valid style' => ['style', 'color: blue', true],
+            'invalid position style' => ['style', 'color: blue; position: absolute; width: 100%', false],
+            'another invalid position style' => ['style', 'position: fixed; width: 100%', false],
+            'valid position style' => ['style', 'color: blue; position: inherit; width: 100%', true],
+            'valid background style' => ['style', 'color: blue; background-position: left; width: 100%', true],
+            'invalid opacity style' => ['style', 'color: blue; width: 100%; opacity: 0.5', false],
+            'invalid z-index style' => ['style', 'color: blue; width: 100%; z-index: 11', false]
+        ];
+    }
+
+    /**
+     * Test "validate" method.
+     *
+     * @param string $attr
+     * @param string $value
+     * @param bool $expectedValid
+     * @return void
+     * @dataProvider getAttributes
+     */
+    public function testValidate(string $attr, string $value, bool $expectedValid): void
+    {
+        $validator = new StyleAttributeValidator();
+
+        try {
+            $validator->validate('does not matter', $attr, $value);
+            $actuallyValid = true;
+        } catch (ValidationException $exception) {
+            $actuallyValid = false;
+        }
+        $this->assertEquals($expectedValid, $actuallyValid);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Validator/HTML/AttributeValidatorInterface.php b/lib/internal/Magento/Framework/Validator/HTML/AttributeValidatorInterface.php
new file mode 100644
index 0000000000000..6426e19a537da
--- /dev/null
+++ b/lib/internal/Magento/Framework/Validator/HTML/AttributeValidatorInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+
+/**
+ * Validates HTML attributes content.
+ */
+interface AttributeValidatorInterface
+{
+    /**
+     * Validate attribute.
+     *
+     * @param string $tag
+     * @param string $attributeName
+     * @param string $value
+     * @return void
+     * @throws ValidationException
+     */
+    public function validate(string $tag, string $attributeName, string $value): void;
+}
diff --git a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
index 0e317f071ab39..5b9a73a5f2570 100644
--- a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
+++ b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
@@ -31,12 +31,22 @@ class ConfigurableWYSIWYGValidator implements WYSIWYGValidatorInterface
     private $attributesAllowedByTags;
 
     /**
-     * @param array $allowedTags
-     * @param array $allowedAttributes
-     * @param array $attributesAllowedByTags
+     * @var AttributeValidatorInterface[]
      */
-    public function __construct(array $allowedTags, array $allowedAttributes = [], array $attributesAllowedByTags = [])
-    {
+    private $attributeValidators;
+
+    /**
+     * @param string[] $allowedTags
+     * @param string[] $allowedAttributes
+     * @param string[] $attributesAllowedByTags
+     * @param AttributeValidatorInterface[] $attributeValidators
+     */
+    public function __construct(
+        array $allowedTags,
+        array $allowedAttributes = [],
+        array $attributesAllowedByTags = [],
+        array $attributeValidators = []
+    ) {
         if (empty(array_filter($allowedTags))) {
             throw new \InvalidArgumentException('List of allowed HTML tags cannot be empty');
         }
@@ -49,6 +59,7 @@ function (string $tag) use ($allowedTags): bool {
             },
             ARRAY_FILTER_USE_KEY
         );
+        $this->attributeValidators = $attributeValidators;
     }
 
     /**
@@ -132,6 +143,17 @@ function (string $attribute): string {
                 );
             }
         }
+
+        //Validating allowed attributes.
+        if ($this->attributeValidators) {
+            foreach ($this->attributeValidators as $attr => $validator) {
+                $found = $xpath->query("//@*[name() = '$attr']");
+                foreach ($found as $attribute) {
+                    $validator->validate($attribute->parentNode->tagName, $attribute->name, $attribute->value);
+                }
+            }
+        }
+
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Validator/HTML/StyleAttributeValidator.php b/lib/internal/Magento/Framework/Validator/HTML/StyleAttributeValidator.php
new file mode 100644
index 0000000000000..4b5ccc9e32863
--- /dev/null
+++ b/lib/internal/Magento/Framework/Validator/HTML/StyleAttributeValidator.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+
+/**
+ * Validates "style" attribute.
+ */
+class StyleAttributeValidator implements AttributeValidatorInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function validate(string $tag, string $attributeName, string $value): void
+    {
+        if ($attributeName !== 'style' || !$value) {
+            return;
+        }
+
+        if (preg_match('/([^\-]position\s*?\:\s*?[^i\s][^n\s]\w)|(opacity)|(z-index)/ims', " $value")) {
+            throw new ValidationException(__('HTML attribute "style" contains restricted styles'));
+        }
+    }
+}

From 12f13238e729bc7ff374f12307cade7e8c5c8028 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Wed, 22 Jul 2020 16:49:37 -0500
Subject: [PATCH 076/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/etc/di.xml | 47 +++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index d79e805e25890..74ba239bca587 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -258,4 +258,51 @@
             </argument>
         </arguments>
     </type>
+    <virtualType name="DefaultWYSIWYGValidator" type="Magento\Framework\Validator\HTML\ConfigurableWYSIWYGValidator">
+        <arguments>
+            <argument name="allowedTags" xsi:type="array">
+                <item name="div" xsi:type="string">div</item>
+                <item name="a" xsi:type="string">a</item>
+                <item name="p" xsi:type="string">p</item>
+                <item name="span" xsi:type="string">span</item>
+                <item name="em" xsi:type="string">em</item>
+                <item name="strong" xsi:type="string">strong</item>
+                <item name="ul" xsi:type="string">ul</item>
+                <item name="li" xsi:type="string">li</item>
+                <item name="ol" xsi:type="string">ol</item>
+                <item name="h5" xsi:type="string">h5</item>
+                <item name="h4" xsi:type="string">h4</item>
+                <item name="h3" xsi:type="string">h3</item>
+                <item name="h2" xsi:type="string">h2</item>
+                <item name="h1" xsi:type="string">h1</item>
+                <item name="table" xsi:type="string">table</item>
+                <item name="tbody" xsi:type="string">tbody</item>
+                <item name="tr" xsi:type="string">tr</item>
+                <item name="td" xsi:type="string">td</item>
+                <item name="th" xsi:type="string">th</item>
+                <item name="tfoot" xsi:type="string">tfoot</item>
+                <item name="img" xsi:type="string">img</item>
+            </argument>
+            <argument name="allowedAttributes" xsi:type="array">
+                <item name="class" xsi:type="string">class</item>
+                <item name="width" xsi:type="string">width</item>
+                <item name="height" xsi:type="string">height</item>
+                <item name="style" xsi:type="string">style</item>
+                <item name="alt" xsi:type="string">alt</item>
+                <item name="title" xsi:type="string">title</item>
+                <item name="border" xsi:type="string">border</item>
+            </argument>
+            <argument name="attributesAllowedByTags" xsi:type="array">
+                <item name="a" xsi:type="array">
+                    <item name="href" xsi:type="string">href</item>
+                </item>
+                <item name="img" xsi:type="array">
+                    <item name="src" xsi:type="string">src</item>
+                </item>
+            </argument>
+            <argument name="attributeValidators" xsi:type="array">
+                <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
+            </argument>
+        </arguments>
+    </virtualType>
 </config>

From 62ccdbe6226d7d3c7a30ac4b909f89f258470203 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Thu, 23 Jul 2020 16:17:26 -0500
Subject: [PATCH 077/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/etc/di.xml               |  2 +
 app/etc/di.xml                                |  4 +-
 .../HTML/ConfigurableWYSIWYGValidatorTest.php | 97 ++++++++++++++++---
 .../HTML/ConfigurableWYSIWYGValidator.php     | 83 +++++++++++++---
 .../Validator/HTML/TagValidatorInterface.php  | 34 +++++++
 5 files changed, 188 insertions(+), 32 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Validator/HTML/TagValidatorInterface.php

diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 74ba239bca587..18d45980c6328 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -282,6 +282,8 @@
                 <item name="th" xsi:type="string">th</item>
                 <item name="tfoot" xsi:type="string">tfoot</item>
                 <item name="img" xsi:type="string">img</item>
+                <item name="hr" xsi:type="string">hr</item>
+                <item name="figure" xsi:type="string">figure</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index fa1887cbe1372..16fb4b65700cb 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1875,7 +1875,9 @@
                 </item>
             </argument>
             <argument name="attributeValidators" xsi:type="array">
-                <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
+                <item name="style" xsi:type="array">
+                    <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
+                </item>
             </argument>
         </arguments>
     </virtualType>
diff --git a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
index 43ff2ae1377b0..029098a4252c6 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Validation\ValidationException;
 use Magento\Framework\Validator\HTML\ConfigurableWYSIWYGValidator;
 use Magento\Framework\Validator\HTML\AttributeValidatorInterface;
+use Magento\Framework\Validator\HTML\TagValidatorInterface;
 use PHPUnit\Framework\TestCase;
 
 class ConfigurableWYSIWYGValidatorTest extends TestCase
@@ -23,25 +24,43 @@ class ConfigurableWYSIWYGValidatorTest extends TestCase
     public function getConfigurations(): array
     {
         return [
-            'no-html' => [['div'], [], [], 'just text', true, []],
-            'allowed-tag' => [['div'], [], [], 'just text and <div>a div</div>', true, []],
+            'no-html' => [['div'], [], [], 'just text', true, [], []],
+            'allowed-tag' => [['div'], [], [], 'just text and <div>a div</div>', true, [], []],
             'restricted-tag' => [
                 ['div', 'p'],
                 [],
                 [],
                 'text and <p>a p</p>, <div>a div</div>,  <tr>a tr</tr>',
                 false,
+                [],
+                []
+            ],
+            'restricted-tag-wtih-attr' => [
+                ['div'],
+                [],
+                [],
+                'just text and <p class="fake-class">a p</p>',
+                false,
+                [],
+                []
+            ],
+            'allowed-tag-with-attr' => [
+                ['div'],
+                [],
+                [],
+                'just text and <div class="fake-class">a div</div>',
+                false,
+                [],
                 []
             ],
-            'restricted-tag-wtih-attr' => [['div'], [], [], 'just text and <p class="fake-class">a p</p>', false, []],
-            'allowed-tag-with-attr' => [['div'], [], [], 'just text and <div class="fake-class">a div</div>', false, []],
-            'multiple-tags' => [['div', 'p'], [], [], 'just text and <div>a div</div> and <p>a p</p>', true, []],
+            'multiple-tags' => [['div', 'p'], [], [], 'just text and <div>a div</div> and <p>a p</p>', true, [], []],
             'tags-with-attrs' => [
                 ['div', 'p'],
                 ['class', 'style'],
                 [],
                 'text and <div class="fake-class">a div</div> and <p style="color: blue">a p</p>',
                 true,
+                [],
                 []
             ],
             'tags-with-restricted-attrs' => [
@@ -50,6 +69,7 @@ public function getConfigurations(): array
                 [],
                 'text and <div class="fake-class">a div</div> and <p style="color: blue">a p</p>',
                 false,
+                [],
                 []
             ],
             'tags-with-specific-attrs' => [
@@ -59,6 +79,7 @@ public function getConfigurations(): array
                 '<div class="fake-class" style="color: blue">a div</div>, <a href="/some-path" class="a">an a</a>'
                 .', <p class="p-class">a p</p>',
                 true,
+                [],
                 []
             ],
             'tags-with-specific-restricted-attrs' => [
@@ -67,6 +88,7 @@ public function getConfigurations(): array
                 ['a' => ['href']],
                 'text and <div class="fake-class" href="what">a div</div> and <a href="/some-path" class="a">an a</a>',
                 false,
+                [],
                 []
             ],
             'invalid-tag-with-full-config' => [
@@ -76,6 +98,7 @@ public function getConfigurations(): array
                 '<div class="fake-class" style="color: blue">a div</div>, <a href="/some-path" class="a">an a</a>'
                 .', <p class="p-class">a p</p>, <img src="test.jpg" />',
                 false,
+                [],
                 []
             ],
             'invalid-html' => [
@@ -84,6 +107,7 @@ public function getConfigurations(): array
                 ['a' => ['href'], 'div' => ['style']],
                 'some </,none-> </html>',
                 true,
+                [],
                 []
             ],
             'invalid-html-with-violations' => [
@@ -92,6 +116,7 @@ public function getConfigurations(): array
                 ['a' => ['href'], 'div' => ['style']],
                 'some </,none-> </html> <tr>some trs</tr>',
                 false,
+                [],
                 []
             ],
             'invalid-html-attributes' => [
@@ -100,7 +125,8 @@ public function getConfigurations(): array
                 [],
                 'some <div class="value">DIV</div>',
                 false,
-                ['class' => false]
+                ['class' => false],
+                []
             ],
             'ignored-html-attributes' => [
                 ['div', 'a', 'p'],
@@ -108,7 +134,8 @@ public function getConfigurations(): array
                 [],
                 'some <div class="value">DIV</div>',
                 true,
-                ['src' => false, 'class' => true]
+                ['src' => false, 'class' => true],
+                []
             ],
             'valid-html-attributes' => [
                 ['div', 'a', 'p'],
@@ -116,7 +143,26 @@ public function getConfigurations(): array
                 [],
                 'some <div class="value">DIV</div>',
                 true,
-                ['src' => true, 'class' => true]
+                ['src' => true, 'class' => true],
+                []
+            ],
+            'invalid-allowed-tag' => [
+                ['div'],
+                ['class', 'src'],
+                [],
+                '<div class="some-class" src="some-src">IS A DIV</div>',
+                false,
+                [],
+                ['div' => ['class' => false]]
+            ],
+            'valid-allowed-tag' => [
+                ['div'],
+                ['class', 'src'],
+                [],
+                '<div class="some-class">IS A DIV</div>',
+                true,
+                [],
+                ['div' => ['src' => false]]
             ]
         ];
     }
@@ -124,12 +170,13 @@ public function getConfigurations(): array
     /**
      * Test different configurations and content.
      *
-     * @param array $allowedTags
-     * @param array $allowedAttr
-     * @param array $allowedTagAttrs
+     * @param string[] $allowedTags
+     * @param string[] $allowedAttr
+     * @param string[][] $allowedTagAttrs
      * @param string $html
      * @param bool $isValid
-     * @param array $attributeValidityMap
+     * @param bool[] $attributeValidityMap
+     * @param bool[][] $tagValidators
      * @return void
      * @dataProvider getConfigurations
      */
@@ -139,7 +186,8 @@ public function testConfigurations(
         array $allowedTagAttrs,
         string $html,
         bool $isValid,
-        array $attributeValidityMap
+        array $attributeValidityMap,
+        array $tagValidators
     ): void {
         $attributeValidator = $this->getMockForAbstractClass(AttributeValidatorInterface::class);
         $attributeValidator->method('validate')
@@ -152,13 +200,32 @@ function (string $tag, string $attribute, string $content) use ($attributeValidi
             );
         $attrValidators = [];
         foreach (array_keys($attributeValidityMap) as $attr) {
-            $attrValidators[$attr] = $attributeValidator;
+            $attrValidators[$attr] = [$attributeValidator];
+        }
+        $tagValidatorsMocks = [];
+        foreach ($tagValidators as $tag => $allowedAttributes) {
+            $mock = $this->getMockForAbstractClass(TagValidatorInterface::class);
+            $mock->method('validate')
+                ->willReturnCallback(
+                    function (string $givenTag, array $attrs, string $value) use($tag, $allowedAttributes): void {
+                        if ($givenTag !== $tag) {
+                            throw new \RuntimeException();
+                        }
+                        foreach (array_keys($attrs) as $attr) {
+                            if (array_key_exists($attr, $allowedAttributes) && !$allowedAttributes[$attr]) {
+                                throw new ValidationException(__('Invalid tag'));
+                            }
+                        }
+                    }
+                );
+            $tagValidatorsMocks[$tag] = [$mock];
         }
         $validator = new ConfigurableWYSIWYGValidator(
             $allowedTags,
             $allowedAttr,
             $allowedTagAttrs,
-            $attrValidators
+            $attrValidators,
+            $tagValidatorsMocks
         );
         $valid = true;
         try {
diff --git a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
index 5b9a73a5f2570..caa32be4abc55 100644
--- a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
+++ b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
@@ -31,21 +31,28 @@ class ConfigurableWYSIWYGValidator implements WYSIWYGValidatorInterface
     private $attributesAllowedByTags;
 
     /**
-     * @var AttributeValidatorInterface[]
+     * @var AttributeValidatorInterface[][]
      */
     private $attributeValidators;
 
+    /**
+     * @var TagValidatorInterface[][]
+     */
+    private $tagValidators;
+
     /**
      * @param string[] $allowedTags
      * @param string[] $allowedAttributes
-     * @param string[] $attributesAllowedByTags
-     * @param AttributeValidatorInterface[] $attributeValidators
+     * @param string[][] $attributesAllowedByTags
+     * @param AttributeValidatorInterface[][] $attributeValidators
+     * @param TagValidatorInterface[][] $tagValidators
      */
     public function __construct(
         array $allowedTags,
         array $allowedAttributes = [],
         array $attributesAllowedByTags = [],
-        array $attributeValidators = []
+        array $attributeValidators = [],
+        array $tagValidators = []
     ) {
         if (empty(array_filter($allowedTags))) {
             throw new \InvalidArgumentException('List of allowed HTML tags cannot be empty');
@@ -60,6 +67,7 @@ function (string $tag) use ($allowedTags): bool {
             ARRAY_FILTER_USE_KEY
         );
         $this->attributeValidators = $attributeValidators;
+        $this->tagValidators = $tagValidators;
     }
 
     /**
@@ -73,19 +81,32 @@ public function validate(string $content): void
         $dom = $this->loadHtml($content);
         $xpath = new \DOMXPath($dom);
 
+        $this->validateConfigured($xpath);
+        $this->callDynamicValidators($xpath);
+    }
+
+    /**
+     * Check declarative restrictions
+     *
+     * @param \DOMXPath $xpath
+     * @return void
+     * @throws ValidationException
+     */
+    private function validateConfigured(\DOMXPath $xpath): void
+    {
         //Validating tags
         $found = $xpath->query(
             $query='//*['
-            . implode(
-                ' and ',
-                array_map(
-                    function (string $tag): string {
-                        return "name() != '$tag'";
-                    },
-                    array_merge($this->allowedTags, ['body', 'html'])
+                . implode(
+                    ' and ',
+                    array_map(
+                        function (string $tag): string {
+                            return "name() != '$tag'";
+                        },
+                        array_merge($this->allowedTags, ['body', 'html'])
+                    )
                 )
-            )
-            .']'
+                .']'
         );
         if (count($found)) {
             throw new ValidationException(
@@ -143,17 +164,48 @@ function (string $attribute): string {
                 );
             }
         }
+    }
 
+    /**
+     * Cycle dynamic validators.
+     *
+     * @param \DOMXPath $xpath
+     * @return void
+     * @throws ValidationException
+     */
+    private function callDynamicValidators(\DOMXPath $xpath): void
+    {
         //Validating allowed attributes.
         if ($this->attributeValidators) {
-            foreach ($this->attributeValidators as $attr => $validator) {
+            foreach ($this->attributeValidators as $attr => $validators) {
                 $found = $xpath->query("//@*[name() = '$attr']");
                 foreach ($found as $attribute) {
-                    $validator->validate($attribute->parentNode->tagName, $attribute->name, $attribute->value);
+                    foreach ($validators as $validator) {
+                        $validator->validate($attribute->parentNode->tagName, $attribute->name, $attribute->value);
+                    }
                 }
             }
         }
 
+        //Validating allowed tags
+        if ($this->tagValidators) {
+            foreach ($this->tagValidators as $tag => $validators) {
+                $found = $xpath->query("//*[name() = '$tag']");
+                /** @var \DOMElement $tagNode */
+                foreach ($found as $tagNode) {
+                    $attributes = [];
+                    if ($tagNode->hasAttributes()) {
+                        /** @var \DOMAttr $attributeNode */
+                        foreach ($tagNode->attributes as $attributeNode) {
+                            $attributes[$attributeNode->name] = $attributeNode->value;
+                        }
+                    }
+                    foreach ($validators as $validator) {
+                        $validator->validate($tagNode->tagName, $attributes, $tagNode->textContent, $this);
+                    }
+                }
+            }
+        }
     }
 
     /**
@@ -166,7 +218,6 @@ function (string $attribute): string {
     private function loadHtml(string $content): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
-        $loaded = true;
         set_error_handler(
             function () use (&$loaded) {
                 $loaded = false;
diff --git a/lib/internal/Magento/Framework/Validator/HTML/TagValidatorInterface.php b/lib/internal/Magento/Framework/Validator/HTML/TagValidatorInterface.php
new file mode 100644
index 0000000000000..d81172edc87c9
--- /dev/null
+++ b/lib/internal/Magento/Framework/Validator/HTML/TagValidatorInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Validator\HTML;
+
+use Magento\Framework\Validation\ValidationException;
+
+/**
+ * Validates tag for user HTML content.
+ */
+interface TagValidatorInterface
+{
+    /**
+     * Validate a tag.
+     *
+     * @param string $tag
+     * @param string[] $attributes
+     * @param string $value
+     * @param WYSIWYGValidatorInterface $recursiveValidator
+     * @return void
+     * @throws ValidationException
+     */
+    public function validate(
+        string $tag,
+        array $attributes,
+        string $value,
+        WYSIWYGValidatorInterface $recursiveValidator
+    ): void;
+}

From ff9026000f545497efeb87033e9adbea426fb3e0 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Mon, 27 Jul 2020 15:07:55 -0500
Subject: [PATCH 078/671] MC-34385: Filter fields allowing HTML

---
 .../Cms/Command/WysiwygRestrictCommand.php    |  2 ++
 .../Magento/Cms/Model/BlockRepository.php     |  6 ++--
 app/code/Magento/Cms/Model/Page.php           |  5 +++-
 .../HTML/ConfigurableWYSIWYGValidatorTest.php |  8 ++++--
 .../HTML/ConfigurableWYSIWYGValidator.php     | 28 +++++++++++++------
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php b/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
index bafe98ad377f5..e676cb1fe0ee5 100644
--- a/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
+++ b/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
@@ -66,5 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->cache->cleanType('config');
 
         $output->writeln('HTML user content validation is now ' .($restrictArg === 'y' ? 'enforced' : 'suggested'));
+
+        return 0;
     }
 }
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index f8129ca4a2961..5d5a0b9f6bed9 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -21,7 +21,7 @@
 use Magento\Framework\EntityManager\HydratorInterface;
 
 /**
- * Class BlockRepository
+ * Default block repo impl.
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class BlockRepository implements BlockRepositoryInterface
@@ -87,6 +87,8 @@ class BlockRepository implements BlockRepositoryInterface
      * @param StoreManagerInterface $storeManager
      * @param CollectionProcessorInterface $collectionProcessor
      * @param HydratorInterface|null $hydrator
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ResourceBlock $resource,
@@ -217,7 +219,7 @@ private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                'Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor'
+                \Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor::class
             );
         }
         return $this->collectionProcessor;
diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index 35e049caea203..7e3e3ff44cfa0 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -23,12 +23,13 @@
  * @method Page setStoreId(int $storeId)
  * @method int getStoreId()
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
 class Page extends AbstractModel implements PageInterface, IdentityInterface
 {
     /**
-     * No route page id
+     * Page ID for the 404 page.
      */
     const NOROUTE_PAGE_ID = 'no-route';
 
@@ -605,6 +606,8 @@ private function validateNewIdentifier(): void
     /**
      * @inheritdoc
      * @since 101.0.0
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function beforeSave()
     {
diff --git a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
index 029098a4252c6..3c703c9f037d7 100644
--- a/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/Validator/HTML/ConfigurableWYSIWYGValidatorTest.php
@@ -20,6 +20,8 @@ class ConfigurableWYSIWYGValidatorTest extends TestCase
      * Configurations to test.
      *
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function getConfigurations(): array
     {
@@ -178,7 +180,9 @@ public function getConfigurations(): array
      * @param bool[] $attributeValidityMap
      * @param bool[][] $tagValidators
      * @return void
+     *
      * @dataProvider getConfigurations
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function testConfigurations(
         array $allowedTags,
@@ -192,7 +196,7 @@ public function testConfigurations(
         $attributeValidator = $this->getMockForAbstractClass(AttributeValidatorInterface::class);
         $attributeValidator->method('validate')
             ->willReturnCallback(
-                function (string $tag, string $attribute, string $content) use ($attributeValidityMap): void {
+                function (string $tag, string $attribute) use ($attributeValidityMap): void {
                     if (array_key_exists($attribute, $attributeValidityMap) && !$attributeValidityMap[$attribute]) {
                         throw new ValidationException(__('Invalid attribute for %1', $tag));
                     }
@@ -207,7 +211,7 @@ function (string $tag, string $attribute, string $content) use ($attributeValidi
             $mock = $this->getMockForAbstractClass(TagValidatorInterface::class);
             $mock->method('validate')
                 ->willReturnCallback(
-                    function (string $givenTag, array $attrs, string $value) use($tag, $allowedAttributes): void {
+                    function (string $givenTag, array $attrs) use ($tag, $allowedAttributes): void {
                         if ($givenTag !== $tag) {
                             throw new \RuntimeException();
                         }
diff --git a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
index caa32be4abc55..f436fddf26e8d 100644
--- a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
+++ b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
@@ -82,7 +82,8 @@ public function validate(string $content): void
         $xpath = new \DOMXPath($dom);
 
         $this->validateConfigured($xpath);
-        $this->callDynamicValidators($xpath);
+        $this->callAttributeValidators($xpath);
+        $this->callTagValidators($xpath);
     }
 
     /**
@@ -96,7 +97,7 @@ private function validateConfigured(\DOMXPath $xpath): void
     {
         //Validating tags
         $found = $xpath->query(
-            $query='//*['
+            '//*['
                 . implode(
                     ' and ',
                     array_map(
@@ -117,10 +118,11 @@ function (string $tag): string {
         //Validating attributes
         if ($this->attributesAllowedByTags) {
             foreach ($this->allowedTags as $tag) {
-                $allowed = $this->allowedAttributes;
+                $allowed = [$this->allowedAttributes];
                 if (!empty($this->attributesAllowedByTags[$tag])) {
-                    $allowed = array_unique(array_merge($allowed, $this->attributesAllowedByTags[$tag]));
+                    $allowed[] = $this->attributesAllowedByTags[$tag];
                 }
+                $allowed = array_unique(array_merge(...$allowed));
                 $allowedQuery = '';
                 if ($allowed) {
                     $allowedQuery = '['
@@ -167,15 +169,14 @@ function (string $attribute): string {
     }
 
     /**
-     * Cycle dynamic validators.
+     * Validate allowed HTML attributes' content.
      *
      * @param \DOMXPath $xpath
-     * @return void
      * @throws ValidationException
+     * @return void
      */
-    private function callDynamicValidators(\DOMXPath $xpath): void
+    private function callAttributeValidators(\DOMXPath $xpath): void
     {
-        //Validating allowed attributes.
         if ($this->attributeValidators) {
             foreach ($this->attributeValidators as $attr => $validators) {
                 $found = $xpath->query("//@*[name() = '$attr']");
@@ -186,8 +187,17 @@ private function callDynamicValidators(\DOMXPath $xpath): void
                 }
             }
         }
+    }
 
-        //Validating allowed tags
+    /**
+     * Validate allowed tags.
+     *
+     * @param \DOMXPath $xpath
+     * @return void
+     * @throws ValidationException
+     */
+    private function callTagValidators(\DOMXPath $xpath): void
+    {
         if ($this->tagValidators) {
             foreach ($this->tagValidators as $tag => $validators) {
                 $found = $xpath->query("//*[name() = '$tag']");

From 49f7dae9013c1be18f61433973459f51567e59c4 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Mon, 27 Jul 2020 15:36:03 -0500
Subject: [PATCH 079/671] MC-34385: Filter fields allowing HTML

---
 .../Catalog/Model/Attribute/Backend/DefaultBackend.php     | 4 +++-
 app/code/Magento/Cms/etc/di.xml                            | 1 +
 app/etc/di.xml                                             | 7 ++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php b/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php
index e3b38bf7a578a..a02d589fae055 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/DefaultBackend.php
@@ -47,7 +47,9 @@ private function validateHtml(DataObject $object): void
         $attribute = $this->getAttribute();
         $code = $attribute->getAttributeCode();
         if ($attribute instanceof Attribute && $attribute->getIsHtmlAllowedOnFront()) {
-            if ($object->getData($code)
+            $value = $object->getData($code);
+            if ($value
+                && is_string($value)
                 && (!($object instanceof AbstractModel) || $object->getData($code) !== $object->getOrigData($code))
             ) {
                 try {
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 18d45980c6328..c18aadd3f6a80 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -293,6 +293,7 @@
                 <item name="alt" xsi:type="string">alt</item>
                 <item name="title" xsi:type="string">title</item>
                 <item name="border" xsi:type="string">border</item>
+                <item name="id" xsi:type="string">id</item>
             </argument>
             <argument name="attributesAllowedByTags" xsi:type="array">
                 <item name="a" xsi:type="array">
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 887ed6d96d7ad..f3dac922b5a2d 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1856,6 +1856,8 @@
                 <item name="th" xsi:type="string">th</item>
                 <item name="tfoot" xsi:type="string">tfoot</item>
                 <item name="img" xsi:type="string">img</item>
+                <item name="hr" xsi:type="string">hr</item>
+                <item name="figure" xsi:type="string">figure</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>
@@ -1865,6 +1867,7 @@
                 <item name="alt" xsi:type="string">alt</item>
                 <item name="title" xsi:type="string">title</item>
                 <item name="border" xsi:type="string">border</item>
+                <item name="id" xsi:type="string">id</item>
             </argument>
             <argument name="attributesAllowedByTags" xsi:type="array">
                 <item name="a" xsi:type="array">
@@ -1875,9 +1878,7 @@
                 </item>
             </argument>
             <argument name="attributeValidators" xsi:type="array">
-                <item name="style" xsi:type="array">
-                    <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
-                </item>
+                <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
             </argument>
         </arguments>
     </virtualType>

From efc25d74e4c8f34f11115add6c0eb5f0f60bbc1c Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Tue, 28 Jul 2020 10:48:00 -0500
Subject: [PATCH 080/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/Model/BlockRepository.php                  | 2 +-
 .../Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index 7502b017584df..c26e2d809d996 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -219,7 +219,7 @@ private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                \Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor::class
+                'Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor'
             );
         }
         return $this->collectionProcessor;
diff --git a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
index f436fddf26e8d..bfa6bc37600bf 100644
--- a/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
+++ b/lib/internal/Magento/Framework/Validator/HTML/ConfigurableWYSIWYGValidator.php
@@ -122,6 +122,7 @@ function (string $tag): string {
                 if (!empty($this->attributesAllowedByTags[$tag])) {
                     $allowed[] = $this->attributesAllowedByTags[$tag];
                 }
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $allowed = array_unique(array_merge(...$allowed));
                 $allowedQuery = '';
                 if ($allowed) {

From 420fb3cb7dcb2393bf83065a2871df1adc26dafe Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Tue, 28 Jul 2020 12:10:16 -0500
Subject: [PATCH 081/671] MC-35389: Set same site attribute.

Add validation in setters for directive "None".
Fix unit and integration tests.
---
 .../Magento/Framework/Stdlib/Cookie/CookieMetadata.php    | 8 ++++++++
 .../Framework/Stdlib/Cookie/PublicCookieMetadata.php      | 5 +++++
 .../Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php  | 2 +-
 .../Test/Unit/Cookie/SensitiveCookieMetadataTest.php      | 3 ++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index 8cec82d64199c..8ae35837cebf8 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -41,6 +41,9 @@ public function __construct($metadata = [])
             $metadata = [];
         }
         $this->metadata = $metadata;
+        if (isset($metadata[self::KEY_SAME_SITE])) {
+            $this->setSameSite($metadata[self::KEY_SAME_SITE]);
+        }
     }
 
     /**
@@ -157,6 +160,11 @@ public function setSameSite(?string $sameSite): CookieMetadata
                 'Invalid argument provided for SameSite directive expected one of: Strict, Lax or None'
             );
         }
+        if (!$this->getSecure() && strtolower($sameSite) === 'none') {
+            throw new \InvalidArgumentException(
+                'Cookie must be secure in order to use the Same Site None directive.'
+            );
+        }
         $sameSite = self::SAME_SITE_ALLOWED_VALUES[strtolower($sameSite)];
         return $this->set(self::KEY_SAME_SITE, $sameSite);
     }
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
index 6e5e174e4e9f9..b6707d14c6c85 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
@@ -78,6 +78,11 @@ public function setHttpOnly($httpOnly)
      */
     public function setSecure($secure)
     {
+        if (!$secure && strtolower(self::KEY_SAME_SITE) === 'none') {
+            throw new \InvalidArgumentException(
+                'Cookie must be secure in order to use the Same Site None directive.'
+            );
+        }
         return $this->set(self::KEY_SECURE, $secure);
     }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
index a6b5e43b44bbe..2cf56b661fe27 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
@@ -55,7 +55,7 @@ public function getMethodData()
             "getHttpOnly" => ["setHttpOnly", 'getHttpOnly', true],
             "getSecure" => ["setSecure", 'getSecure', true],
             "getDurationOneYear" => ["setDurationOneYear", 'getDuration', (3600*24*365)],
-            "getSameSite" => ["setSameSite", 'getSameSite', 'Strict']
+            "getSameSite" => ["setSameSite", 'getSameSite', 'Lax']
         ];
     }
 
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
index e93e0703d7e04..b113944299a7e 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
@@ -243,7 +243,8 @@ public function getMethodData()
     {
         return [
             "getDomain" => ["setDomain", 'getDomain', "example.com"],
-            "getPath" => ["setPath", 'getPath', "path"]
+            "getPath" => ["setPath", 'getPath', "path"],
+            "getSameSite" => ["setSameSite", 'getSameSite', 'Strict']
         ];
     }
 }

From d2d7e8d1f44928e6642a78b1bcb8c8a860cf8d97 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 28 Jul 2020 22:19:30 -0500
Subject: [PATCH 082/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../InvoiceItemTypeResolver.php               | 29 +++++++
 .../Resolver/DownloadableOrderItem/Links.php  | 76 +++++++++++++++++++
 .../OrderItemTypeResolver.php                 | 29 +++++++
 .../Magento/DownloadableGraphQl/composer.json |  2 +
 .../DownloadableGraphQl/etc/graphql/di.xml    | 14 ++++
 .../DownloadableGraphQl/etc/schema.graphqls   | 11 +++
 .../Query/Resolver/TypeResolverInterface.php  |  2 +-
 7 files changed, 162 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php
 create mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php
 create mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php
new file mode 100644
index 0000000000000..35120e4c0917d
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Leaf for composite class to resolve invoice item type
+ */
+class InvoiceItemTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolveType(array $data): string
+    {
+        if (isset($data['product_type'])) {
+            if ($data['product_type'] == 'downloadable') {
+                return 'DownloadableInvoiceItem';
+            }
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php
new file mode 100644
index 0000000000000..97da31a6af912
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
+
+use Magento\Downloadable\Model\ResourceModel\Link\Collection;
+use Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory;
+use Magento\DownloadableGraphQl\Model\ConvertLinksToArray;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Sales\Model\Order\Item as OrderItem;
+use Magento\Store\Api\Data\StoreInterface;
+
+/**
+ * Resolver fetches downloadable order item links and formats it according to the GraphQL schema.
+ */
+class Links implements ResolverInterface
+{
+    /**
+     * @var ConvertLinksToArray
+     */
+    private $convertLinksToArray;
+
+    /**
+     * @var CollectionFactory
+     */
+    private $linkCollectionFactory;
+
+    /**
+     * @param ConvertLinksToArray $convertLinksToArray
+     * @param CollectionFactory $linkCollectionFactory
+     */
+    public function __construct(
+        ConvertLinksToArray $convertLinksToArray,
+        CollectionFactory $linkCollectionFactory
+    ) {
+        $this->convertLinksToArray = $convertLinksToArray;
+        $this->linkCollectionFactory = $linkCollectionFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+        /** @var StoreInterface $store */
+        $store = $context->getExtensionAttributes()->getStore();
+
+        /** @var OrderItem $orderItem */
+        $orderItem = $value['model'];
+
+        $orderLinks = $orderItem->getProductOptionByCode('links');
+
+        /** @var Collection */
+        $linksCollection = $this->linkCollectionFactory->create();
+        $linksCollection->addTitleToResult($store->getStoreId())
+            ->addPriceToResult($store->getWebsiteId())
+            ->addFieldToFilter('main_table.link_id', ['in' => $orderLinks]);
+
+        return $this->convertLinksToArray->execute($linksCollection->getItems());
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php
new file mode 100644
index 0000000000000..2f835e790d0db
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
+
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+
+/**
+ * Leaf for composite class to resolve order item type
+ */
+class OrderItemTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolveType(array $data): string
+    {
+        if (isset($data['product_type'])) {
+            if ($data['product_type'] == 'downloadable') {
+                return 'DownloadableOrderItem';
+            }
+        }
+        return '';
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index 185a50f77cc15..d4f506d886bfb 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -7,7 +7,9 @@
         "magento/module-catalog": "*",
         "magento/module-downloadable": "*",
         "magento/module-quote": "*",
+        "magento/module-sales": "*",
         "magento/module-quote-graph-ql": "*",
+        "magento/module-sales-graph-ql": "*",
         "magento/framework": "*"
     },
     "suggest": {
diff --git a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
index c95667de15ac3..b54d88b0f1ae6 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
@@ -39,4 +39,18 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\SalesGraphQl\Model\OrderItemInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="orderItemTypeResolvers" xsi:type="array">
+                <item name="downloadable_order_catalog_item_type_resolver" xsi:type="object">Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem\OrderItemTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\InvoiceItemInterfaceTypeResolverComposite">
+        <arguments>
+            <argument name="invoiceItemTypeResolvers" xsi:type="array">
+                <item name="downloadable_invoice_catalog_item_type_resolver" xsi:type="object">Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem\InvoiceItemTypeResolver</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 5863e62e81b1b..5fe6914ee3903 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -64,3 +64,14 @@ type DownloadableProductSamples @doc(description: "DownloadableProductSamples de
     sample_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
     sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
 }
+
+type DownloadableOrderItem implements OrderItemInterface {
+    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are assigned to the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Links")
+}
+
+type DownloadableItemsLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
+    title: String @doc(description: "The display name of the link")
+    sort_order: Int @doc(description: "A number indicating the sort order")
+    price: Float @doc(description: "The price of the downloadable product")
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
+}
diff --git a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.php b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.php
index 34e9c0796b5a5..fc078a0ab184f 100644
--- a/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.php
+++ b/lib/internal/Magento/Framework/GraphQl/Query/Resolver/TypeResolverInterface.php
@@ -21,5 +21,5 @@ interface TypeResolverInterface
      * @return string
      * @throws GraphQlInputException
      */
-    public function resolveType(array $data) : string;
+    public function resolveType(array $data): string;
 }

From 43a721a1dd74eb9cb0bb12f07d96749d6688fa8c Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Tue, 28 Jul 2020 23:18:47 -0500
Subject: [PATCH 083/671] MC-36015: Update in Order Status Does Not Reflect in
 Email

- fixed
- modified unit test
---
 .../Controller/Adminhtml/Order/AddComment.php |  3 +++
 app/code/Magento/Sales/Model/Order/Config.php |  2 +-
 .../Magento/Sales/Model/Order/ConfigTest.php  | 24 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
index e85083a50d725..492d2d71df8d9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
@@ -10,6 +10,8 @@
 
 /**
  * Class AddComment
+ *
+ * Controller responsible for addition of the order comment to the order
  */
 class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
 {
@@ -42,6 +44,7 @@ public function execute()
                     );
                 }
 
+                $order->setStatus($data['status']);
                 $notify = $data['is_customer_notified'] ?? false;
                 $visible = $data['is_visible_on_front'] ?? false;
 
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 32b9298be2b5f..20aee5c76cc1f 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -52,7 +52,7 @@ class Config
      */
     protected $maskStatusesMapping = [
         \Magento\Framework\App\Area::AREA_FRONTEND => [
-            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATE_PROCESSING,
+            \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,
             \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING
         ]
     ];
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
index 5f1ac868c5f4e..9e43fb16eac11 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Order/ConfigTest.php
@@ -50,4 +50,28 @@ public function testCorrectCompleteStatusInStatesList()
 
         $this->assertEquals($completeStatus->getLabel(), $completeState->getText());
     }
+
+    /**
+     * Test Mask Status For Area
+     *
+     * @param string $code
+     * @param string $expected
+     * @dataProvider dataProviderForTestMaskStatusForArea
+     */
+    public function testMaskStatusForArea(string $code, string $expected)
+    {
+        $result = $this->orderConfig->getStatusFrontendLabel($code);
+        $this->assertEquals($expected, $result);
+    }
+
+    /**
+     * @return array
+     */
+    public function dataProviderForTestMaskStatusForArea()
+    {
+        return [
+            ['fraud', 'Suspected Fraud'],
+            ['processing', 'Processing'],
+        ];
+    }
 }

From 475d7a087ffd31dbf758b9162629637141714f54 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Wed, 29 Jul 2020 14:35:24 +0300
Subject: [PATCH 084/671] MC-35480: Bug with Company Structure Page

---
 app/code/Magento/Cms/Model/PageRepository.php | 79 +++++++++++++------
 .../Magento/Cms/Model/PageRepositoryTest.php  | 22 +++++-
 2 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 0439fbcd2f799..56b9e639cd14e 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -7,14 +7,20 @@
 namespace Magento\Cms\Model;
 
 use Magento\Cms\Api\Data;
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\Data\PageInterfaceFactory;
+use Magento\Cms\Api\Data\PageSearchResultsInterface;
 use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor;
 use Magento\Cms\Model\Page\IdentityMap;
 use Magento\Cms\Model\ResourceModel\Page as ResourcePage;
 use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
 use Magento\Framework\Api\DataObjectHelper;
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Framework\App\Route\Config;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -22,7 +28,7 @@
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
- * @inheritdoc
+ * Cms page repository
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -59,12 +65,12 @@ class PageRepository implements PageRepositoryInterface
     protected $dataObjectProcessor;
 
     /**
-     * @var \Magento\Cms\Api\Data\PageInterfaceFactory
+     * @var PageInterfaceFactory
      */
     protected $dataPageFactory;
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
@@ -83,10 +89,15 @@ class PageRepository implements PageRepositoryInterface
      */
     private $hydrator;
 
+    /**
+     * @var Config
+     */
+    private $routeConfig;
+
     /**
      * @param ResourcePage $resource
      * @param PageFactory $pageFactory
-     * @param Data\PageInterfaceFactory $dataPageFactory
+     * @param PageInterfaceFactory $dataPageFactory
      * @param PageCollectionFactory $pageCollectionFactory
      * @param Data\PageSearchResultsInterfaceFactory $searchResultsFactory
      * @param DataObjectHelper $dataObjectHelper
@@ -95,12 +106,13 @@ class PageRepository implements PageRepositoryInterface
      * @param CollectionProcessorInterface $collectionProcessor
      * @param IdentityMap|null $identityMap
      * @param HydratorInterface|null $hydrator
+     * @param Config|null $routeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ResourcePage $resource,
         PageFactory $pageFactory,
-        Data\PageInterfaceFactory $dataPageFactory,
+        PageInterfaceFactory $dataPageFactory,
         PageCollectionFactory $pageCollectionFactory,
         Data\PageSearchResultsInterfaceFactory $searchResultsFactory,
         DataObjectHelper $dataObjectHelper,
@@ -108,7 +120,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         CollectionProcessorInterface $collectionProcessor = null,
         ?IdentityMap $identityMap = null,
-        ?HydratorInterface $hydrator = null
+        ?HydratorInterface $hydrator = null,
+        ?Config $routeConfig = null
     ) {
         $this->resource = $resource;
         $this->pageFactory = $pageFactory;
@@ -119,18 +132,22 @@ public function __construct(
         $this->dataObjectProcessor = $dataObjectProcessor;
         $this->storeManager = $storeManager;
         $this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
-        $this->identityMap = $identityMap ?? ObjectManager::getInstance()->get(IdentityMap::class);
-        $this->hydrator = $hydrator ?: ObjectManager::getInstance()->get(HydratorInterface::class);
+        $this->identityMap = $identityMap ?? ObjectManager::getInstance()
+                ->get(IdentityMap::class);
+        $this->hydrator = $hydrator ?: ObjectManager::getInstance()
+            ->get(HydratorInterface::class);
+        $this->routeConfig = $routeConfig ?? ObjectManager::getInstance()
+                ->get(Config::class);
     }
 
     /**
      * Validate new layout update values.
      *
-     * @param Data\PageInterface $page
+     * @param PageInterface $page
      * @return void
      * @throws \InvalidArgumentException
      */
-    private function validateLayoutUpdate(Data\PageInterface $page): void
+    private function validateLayoutUpdate(PageInterface $page): void
     {
         //Persisted data
         $savedPage = $page->getId() ? $this->getById($page->getId()) : null;
@@ -150,11 +167,11 @@ private function validateLayoutUpdate(Data\PageInterface $page): void
     /**
      * Save Page data
      *
-     * @param \Magento\Cms\Api\Data\PageInterface|Page $page
+     * @param PageInterface|Page $page
      * @return Page
      * @throws CouldNotSaveException
      */
-    public function save(\Magento\Cms\Api\Data\PageInterface $page)
+    public function save(PageInterface $page)
     {
         if ($page->getStoreId() === null) {
             $storeId = $this->storeManager->getStore()->getId();
@@ -167,6 +184,7 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
             if ($pageId) {
                 $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
             }
+            $this->validateRoutesDuplication($page);
             $this->resource->save($page);
             $this->identityMap->add($page);
         } catch (\Exception $exception) {
@@ -183,7 +201,7 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
      *
      * @param string $pageId
      * @return Page
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws NoSuchEntityException
      */
     public function getById($pageId)
     {
@@ -202,17 +220,15 @@ public function getById($pageId)
      *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria
-     * @return \Magento\Cms\Api\Data\PageSearchResultsInterface
+     * @param SearchCriteriaInterface $criteria
+     * @return PageSearchResultsInterface
      */
-    public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria)
+    public function getList(SearchCriteriaInterface $criteria)
     {
-        /** @var \Magento\Cms\Model\ResourceModel\Page\Collection $collection */
         $collection = $this->pageCollectionFactory->create();
 
         $this->collectionProcessor->process($criteria, $collection);
 
-        /** @var Data\PageSearchResultsInterface $searchResults */
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($criteria);
         $searchResults->setItems($collection->getItems());
@@ -223,11 +239,11 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
     /**
      * Delete Page
      *
-     * @param \Magento\Cms\Api\Data\PageInterface $page
+     * @param PageInterface $page
      * @return bool
      * @throws CouldNotDeleteException
      */
-    public function delete(\Magento\Cms\Api\Data\PageInterface $page)
+    public function delete(PageInterface $page)
     {
         try {
             $this->resource->delete($page);
@@ -262,11 +278,26 @@ public function deleteById($pageId)
     private function getCollectionProcessor()
     {
         if (!$this->collectionProcessor) {
-            $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
-                // phpstan:ignore "Class Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor not found."
-                \Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor::class
-            );
+            // phpstan:ignore "Class Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor not found."
+            $this->collectionProcessor = ObjectManager::getInstance()
+                ->get(PageCollectionProcessor::class);
         }
         return $this->collectionProcessor;
     }
+
+    /**
+     * Checks that page identifier doesn't duplicate existed routes
+     *
+     * @param PageInterface $page
+     * @return void
+     * @throws CouldNotSaveException
+     */
+    private function validateRoutesDuplication($page): void
+    {
+        if ($this->routeConfig->getRouteByFrontName($page->getIdentifier(), 'frontend')) {
+            throw new CouldNotSaveException(
+                __('The value specified in the URL Key field would generate a URL that already exists.')
+            );
+        }
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
index 53e514083d6ba..42845c0d8ac73 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Model/PageRepositoryTest.php
@@ -40,8 +40,9 @@ protected function setUp(): void
                     \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
             ]
         ]);
-        $this->repo = Bootstrap::getObjectManager()->get(PageRepositoryInterface::class);
-        $this->retriever = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
+        $objectManager = Bootstrap::getObjectManager();
+        $this->repo = $objectManager->get(PageRepositoryInterface::class);
+        $this->retriever = $objectManager->get(GetPageByIdentifierInterface::class);
     }
 
     /**
@@ -54,7 +55,7 @@ protected function setUp(): void
     public function testSaveUpdateXml(): void
     {
         $page = $this->retriever->execute('test_custom_layout_page_1', 0);
-        $page->setTitle($page->getTitle() .'TEST');
+        $page->setTitle($page->getTitle() . 'TEST');
 
         //Is successfully saved without changes to the custom layout xml.
         $page = $this->repo->save($page);
@@ -86,4 +87,19 @@ public function testSaveUpdateXml(): void
         $this->assertEmpty($page->getCustomLayoutUpdateXml());
         $this->assertEmpty($page->getLayoutUpdateXml());
     }
+
+    /**
+     * Verifies that cms page with identifier which duplicates existed route shouldn't be saved
+     *
+     * @return void
+     * @throws \Throwable
+     * @magentoDataFixture Magento/Cms/_files/pages.php
+     */
+    public function testSaveWithRouteDuplicate(): void
+    {
+        $page = $this->retriever->execute('page100', 0);
+        $page->setIdentifier('customer');
+        $this->expectException(CouldNotSaveException::class);
+        $this->repo->save($page);
+    }
 }

From 0c79ecf00d7e2c88c833ad2325dfd6dfd5af9c27 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 29 Jul 2020 11:19:21 -0500
Subject: [PATCH 085/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../Resolver/DownloadableOrderItem/Title.php  | 31 +++++++++++++++++++
 .../DownloadableGraphQl/etc/schema.graphqls   |  4 +--
 .../Magento/SalesGraphQl/etc/schema.graphqls  |  4 +--
 3 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php
new file mode 100644
index 0000000000000..42e7b94e51515
--- /dev/null
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolver fetches title for links and formats it according to the GraphQL schema.
+ */
+class Title implements ResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        return __('Links');
+    }
+}
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 5fe6914ee3903..31b93f3b2779d 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -66,12 +66,12 @@ type DownloadableProductSamples @doc(description: "DownloadableProductSamples de
 }
 
 type DownloadableOrderItem implements OrderItemInterface {
-    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are assigned to the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Links")
+    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are ordered from the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Links")
+    downloadable_links_title: String @doc(description: "The label title for the links for the downloadable products") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Title")
 }
 
 type DownloadableItemsLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
     title: String @doc(description: "The display name of the link")
     sort_order: Int @doc(description: "A number indicating the sort order")
-    price: Float @doc(description: "The price of the downloadable product")
     uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
 }
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 218619e0ced34..ebda2b5a829b2 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -77,7 +77,7 @@ type OrderAddress @doc(description: "OrderAddress contains detailed information
     vat_id: String @doc(description: "The customer's Value-added tax (VAT) number (for corporate customers)")
 }
 
-interface OrderItemInterface @doc(description: "Order item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\OrderItemTypeResolver") {
+interface OrderItemInterface @doc(description: "Order item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\OrderItemInterfaceTypeResolverComposite") {
     id: ID! @doc(description: "The unique identifier of the order item")
     product_name: String @doc(description: "The name of the base product")
     product_sku: String! @doc(description: "The SKU of the base product")
@@ -147,7 +147,7 @@ type Invoice @doc(description: "Invoice details") {
     comments: [CommentItem] @doc(description: "Comments on the invoice")
 }
 
-interface InvoiceItemInterface @doc(description: "Invoice item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\InvoiceItemTypeResolver")  {
+interface InvoiceItemInterface @doc(description: "Invoice item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\InvoiceItemInterfaceTypeResolverComposite") {
     id: ID! @doc(description: "The unique ID of the invoice item")
     order_item: OrderItemInterface @doc(description: "Contains details about an individual order item")
     product_name: String @doc(description: "The name of the base product")

From b1c86405a1ebffd47d0b8854b9613bc8db5c6818 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 29 Jul 2020 12:36:06 -0500
Subject: [PATCH 086/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../Resolver/DownloadableOrderItem/Title.php  | 31 -------------------
 .../DownloadableGraphQl/etc/schema.graphqls   |  1 -
 2 files changed, 32 deletions(-)
 delete mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php
deleted file mode 100644
index 42e7b94e51515..0000000000000
--- a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Title.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
-
-use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\ResolverInterface;
-use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-
-/**
- * Resolver fetches title for links and formats it according to the GraphQL schema.
- */
-class Title implements ResolverInterface
-{
-    /**
-     * @inheritdoc
-     */
-    public function resolve(
-        Field $field,
-        $context,
-        ResolveInfo $info,
-        array $value = null,
-        array $args = null
-    ) {
-        return __('Links');
-    }
-}
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 31b93f3b2779d..9c9dd438746f0 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -67,7 +67,6 @@ type DownloadableProductSamples @doc(description: "DownloadableProductSamples de
 
 type DownloadableOrderItem implements OrderItemInterface {
     downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are ordered from the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Links")
-    downloadable_links_title: String @doc(description: "The label title for the links for the downloadable products") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Title")
 }
 
 type DownloadableItemsLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {

From 4c7afa57eb00d7d356eb93c1df578d743ac27ac7 Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Wed, 29 Jul 2020 14:57:12 -0500
Subject: [PATCH 087/671] MC-35389: Set same site attribute.

CookieManager default value fixes in unit and integration tests.
---
 .../Stdlib/Cookie/CookieScopeTest.php         | 14 +++++-----
 .../Stdlib/Cookie/CookieMetadata.php          |  6 ++---
 .../Stdlib/Cookie/PublicCookieMetadata.php    |  4 +--
 .../Stdlib/Cookie/SensitiveCookieMetadata.php |  2 +-
 .../Test/Unit/Cookie/CookieScopeTest.php      | 26 +++++++++++--------
 .../Test/Unit/Cookie/PhpCookieManagerTest.php | 22 ++++++----------
 .../Unit/Cookie/PublicCookieMetadataTest.php  | 17 ++++++++++++
 .../Cookie/SensitiveCookieMetadataTest.php    |  8 +++---
 8 files changed, 58 insertions(+), 41 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
index e10fae226a0be..3fa318e6cc98e 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Stdlib/Cookie/CookieScopeTest.php
@@ -43,7 +43,7 @@ public function testGetSensitiveCookieMetadataEmpty()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -51,11 +51,13 @@ public function testGetSensitiveCookieMetadataEmpty()
         $this->request->setServer(new Parameters($serverVal));
     }
 
-    public function testGetPublicCookieMetadataNotEmpty()
+    public function testGetPublicCookieDefaultMetadata()
     {
         $cookieScope = $this->createCookieScope();
-
-        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $expected = [
+            PublicCookieMetadata::KEY_SAME_SITE => 'Lax'
+        ];
+        $this->assertEquals($expected, $cookieScope->getPublicCookieMetadata()->__toArray());
     }
 
     public function testGetSensitiveCookieMetadataDefaults()
@@ -78,7 +80,7 @@ public function testGetSensitiveCookieMetadataDefaults()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'default domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => false,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -142,7 +144,7 @@ public function testGetSensitiveCookieMetadataOverrides()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'override domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => false,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata($override)->__toArray()
         );
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
index ccba535ebb2a7..c799821519c60 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/CookieMetadata.php
@@ -151,10 +151,10 @@ public function getSecure()
     /**
      * Setter for Cookie SameSite attribute
      *
-     * @param  string|null $sameSite
+     * @param  string $sameSite
      * @return $this
      */
-    public function setSameSite(?string $sameSite): CookieMetadata
+    public function setSameSite(string $sameSite): CookieMetadata
     {
         if (!array_key_exists(strtolower($sameSite), self::SAME_SITE_ALLOWED_VALUES)) {
             throw new \InvalidArgumentException(
@@ -163,7 +163,7 @@ public function setSameSite(?string $sameSite): CookieMetadata
         }
         if (!$this->getSecure() && strtolower($sameSite) === 'none') {
             throw new \InvalidArgumentException(
-                'Cookie must be secure in order to use the Same Site None directive.'
+                'Cookie must be secure in order to use the SameSite None directive.'
             );
         }
         $sameSite = self::SAME_SITE_ALLOWED_VALUES[strtolower($sameSite)];
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
index 41201a3f4cbf1..2978177586ad3 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/PublicCookieMetadata.php
@@ -79,9 +79,9 @@ public function setHttpOnly($httpOnly)
      */
     public function setSecure($secure)
     {
-        if (!$secure && strtolower(self::KEY_SAME_SITE) === 'none') {
+        if (!$secure && $this->get(self::KEY_SAME_SITE) === 'None') {
             throw new \InvalidArgumentException(
-                'Cookie must be secure in order to use the Same Site None directive.'
+                'Cookie must be secure in order to use the SameSite None directive.'
             );
         }
         return $this->set(self::KEY_SECURE, $secure);
diff --git a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
index 1d787b1a6a488..24bfabaebf08c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
+++ b/lib/internal/Magento/Framework/Stdlib/Cookie/SensitiveCookieMetadata.php
@@ -34,7 +34,7 @@ public function __construct(RequestInterface $request, $metadata = [])
             $metadata[self::KEY_HTTP_ONLY] = true;
         }
         if (!isset($metadata[self::KEY_SAME_SITE])) {
-            $metadata[self::KEY_SAME_SITE] = 'Strict';
+            $metadata[self::KEY_SAME_SITE] = 'Lax';
         }
         $this->request = $request;
         parent::__construct($metadata);
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
index 4ae3336a40d7d..6baa1fca5f2e2 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/CookieScopeTest.php
@@ -68,7 +68,7 @@ public function testGetSensitiveCookieMetadataEmpty()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax',
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -77,21 +77,25 @@ public function testGetSensitiveCookieMetadataEmpty()
     /**
      * @covers ::getPublicCookieMetadata
      */
-    public function testGetPublicCookieMetadataNotEmpty()
+    public function testGetPublicCookieDefaultMetadata()
     {
         $cookieScope = $this->createCookieScope();
-
-        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $expected = [
+            PublicCookieMetadata::KEY_SAME_SITE => 'Lax'
+        ];
+        $this->assertEquals($expected, $cookieScope->getPublicCookieMetadata()->__toArray());
     }
 
     /**
      * @covers ::getCookieMetadata
      */
-    public function testGetCookieMetadataNotEmpty()
+    public function testGetCookieDefaultMetadata()
     {
         $cookieScope = $this->createCookieScope();
-
-        $this->assertNotEmpty($cookieScope->getPublicCookieMetadata()->__toArray());
+        $expected = [
+            CookieMetadata::KEY_SAME_SITE => 'Lax'
+        ];
+        $this->assertEquals($expected, $cookieScope->getPublicCookieMetadata()->__toArray());
     }
 
     /**
@@ -120,7 +124,7 @@ public function testGetSensitiveCookieMetadataDefaults()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'default domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -152,7 +156,7 @@ public function testGetPublicCookieMetadataDefaults()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata()->__toArray()
         );
@@ -212,7 +216,7 @@ public function testGetSensitiveCookieMetadataOverrides()
                 SensitiveCookieMetadata::KEY_DOMAIN => 'override domain',
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata($override)->__toArray()
         );
@@ -277,7 +281,7 @@ public function testGetCookieMetadataOverrides()
             [
                 SensitiveCookieMetadata::KEY_HTTP_ONLY => true,
                 SensitiveCookieMetadata::KEY_SECURE => true,
-                SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict'
+                SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax'
             ],
             $cookieScope->getSensitiveCookieMetadata($this->createSensitiveMetadata())->__toArray()
         );
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index d55a4200a5750..9b4e07092751c 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -669,7 +669,7 @@ private static function assertSensitiveCookieWithNoMetaDataHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Strict', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -695,7 +695,7 @@ private static function assertSensitiveCookieWithNoMetaDataNotHttps(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Strict', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -721,7 +721,7 @@ private static function assertSensitiveCookieNoDomainNoPath(
             self::assertTrue($httpOnly);
             self::assertEquals('', $domain);
             self::assertEquals('', $path);
-            self::assertEquals('Strict', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -747,7 +747,7 @@ private static function assertSensitiveCookieWithDomainAndPath(
             self::assertTrue($httpOnly);
             self::assertEquals('magento.url', $domain);
             self::assertEquals('/backend', $path);
-            self::assertEquals('Strict', $sameSite);
+            self::assertEquals('Lax', $sameSite);
         }
 
         /**
@@ -901,19 +901,13 @@ protected function stubGetCookie($get, $default, $return)
          */
         public function testSetCookieInvalidSameSiteValue(): void
         {
-            /** @var \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata $cookieMetadata */
+            /** @var \Magento\Framework\Stdlib\Cookie\CookieMetadata $cookieMetadata */
             $cookieMetadata = $this->objectManager->getObject(
                 CookieMetadata::class
             );
-
-            try {
-                $cookieMetadata->setSameSite('default value');
-            } catch (\InvalidArgumentException $e) {
-                $this->assertEquals(
-                    'Invalid argument provided for SameSite directive expected one of: Strict, Lax or None',
-                    $e->getMessage()
-                );
-            }
+            $this->expectException('InvalidArgumentException');
+            $this->expectExceptionMessage('Invalid argument provided for SameSite directive expected one of: Strict, Lax or None');
+            $cookieMetadata->setSameSite('default value');
         }
     }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
index 2cf56b661fe27..a94377e686409 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PublicCookieMetadataTest.php
@@ -100,4 +100,21 @@ public function testToArray(array $metadata, array $expected): void
         );
         $this->assertEquals($expected, $object->__toArray());
     }
+
+    /**
+     * Test Set SameSite None With Insecure Cookies
+     *
+     * @return void
+     */
+    public function testSetSecureWithSameSiteNone(): void
+    {
+        /** @var \Magento\Framework\Stdlib\Cookie\PublicCookieMetadata $publicCookieMetadata */
+        $publicCookieMetadata = $this->objectManager->getObject(
+            PublicCookieMetadata::class
+        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Cookie must be secure in order to use the SameSite None directive.');
+        $publicCookieMetadata->setSameSite('None');
+        $publicCookieMetadata->setSecure(false);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
index b113944299a7e..b71a70c687897 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/SensitiveCookieMetadataTest.php
@@ -189,7 +189,7 @@ public function toArrayDataProvider()
                     SensitiveCookieMetadata::KEY_DOMAIN => 'domain',
                     SensitiveCookieMetadata::KEY_PATH => 'path',
                     SensitiveCookieMetadata::KEY_HTTP_ONLY => 1,
-                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
+                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax',
                 ],
                 0,
             ],
@@ -204,7 +204,7 @@ public function toArrayDataProvider()
                     SensitiveCookieMetadata::KEY_DOMAIN => 'domain',
                     SensitiveCookieMetadata::KEY_PATH => 'path',
                     SensitiveCookieMetadata::KEY_HTTP_ONLY => 1,
-                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
+                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax',
                 ],
             ],
             'without secure 2' => [
@@ -218,7 +218,7 @@ public function toArrayDataProvider()
                     SensitiveCookieMetadata::KEY_DOMAIN => 'domain',
                     SensitiveCookieMetadata::KEY_PATH => 'path',
                     SensitiveCookieMetadata::KEY_HTTP_ONLY => 1,
-                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Strict',
+                    SensitiveCookieMetadata::KEY_SAME_SITE => 'Lax',
                 ],
             ],
         ];
@@ -244,7 +244,7 @@ public function getMethodData()
         return [
             "getDomain" => ["setDomain", 'getDomain', "example.com"],
             "getPath" => ["setPath", 'getPath', "path"],
-            "getSameSite" => ["setSameSite", 'getSameSite', 'Strict']
+            "getSameSite" => ["setSameSite", 'getSameSite', 'Lax']
         ];
     }
 }

From 98aaeab27f4b26c9ba898f5afdefdf75788cec60 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 29 Jul 2020 15:47:11 -0500
Subject: [PATCH 088/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 app/code/Magento/DownloadableGraphQl/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index d4f506d886bfb..36f06b7ba8284 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -4,6 +4,7 @@
     "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
+        "magento/module-store": "*",
         "magento/module-catalog": "*",
         "magento/module-downloadable": "*",
         "magento/module-quote": "*",

From cacc407d356f0c0018e82f6e014402de791ea44c Mon Sep 17 00:00:00 2001
From: Sachin Admane <sadmane@adobe.com>
Date: Wed, 29 Jul 2020 19:15:39 -0500
Subject: [PATCH 089/671] MC-35389: Set same site attribute.

Static fix.
---
 .../Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
index 9b4e07092751c..e41cbdfe51638 100644
--- a/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
+++ b/lib/internal/Magento/Framework/Stdlib/Test/Unit/Cookie/PhpCookieManagerTest.php
@@ -906,7 +906,8 @@ public function testSetCookieInvalidSameSiteValue(): void
                 CookieMetadata::class
             );
             $this->expectException('InvalidArgumentException');
-            $this->expectExceptionMessage('Invalid argument provided for SameSite directive expected one of: Strict, Lax or None');
+            $exceptionMessage = 'Invalid argument provided for SameSite directive expected one of: Strict, Lax or None';
+            $this->expectExceptionMessage($exceptionMessage);
             $cookieMetadata->setSameSite('default value');
         }
     }

From dae1dd8d1bbab88eb7f6ee2d12c7049f9dcb930b Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Fri, 31 Jul 2020 15:31:27 -0500
Subject: [PATCH 090/671] MC-36403: DB setup patch update

- Added clean up patch to quote, sales, and wishlist module
---
 .../Setup/Patch/Data/WishlistDataCleanUp.php  | 154 +++++++++++++++++
 .../Setup/Patch/Data/WishlistDataCleanUp.php  | 157 ++++++++++++++++++
 .../Setup/Patch/Data/WishlistDataCleanUp.php  | 153 +++++++++++++++++
 3 files changed, 464 insertions(+)
 create mode 100644 app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php
 create mode 100644 app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php
 create mode 100644 app/code/Magento/Wishlist/Setup/Patch/Data/WishlistDataCleanUp.php

diff --git a/app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php b/app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php
new file mode 100644
index 0000000000000..3d66f53ff6c6d
--- /dev/null
+++ b/app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Quote\Setup\Patch\Data;
+
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Quote\Setup\QuoteSetupFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Clean Up Data Removes unused data
+ */
+class WishlistDataCleanUp implements DataPatchInterface
+{
+    /**
+     * Batch size for query
+     */
+    private const BATCH_SIZE = 1000;
+
+    /**
+     * @var QuoteSetupFactory
+     */
+    private $quoteSetupFactory;
+
+    /**
+     * @var Generator
+     */
+    private $queryGenerator;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * RemoveData constructor.
+     * @param Json $json
+     * @param Generator $queryGenerator
+     * @param QuoteSetupFactory $quoteSetupFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Json $json,
+        Generator $queryGenerator,
+        QuoteSetupFactory $quoteSetupFactory,
+        LoggerInterface $logger
+    ) {
+        $this->json = $json;
+        $this->queryGenerator = $queryGenerator;
+        $this->quoteSetupFactory = $quoteSetupFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        try {
+            $this->cleanQuoteItemOptionTable();
+        } catch (\Throwable $e) {
+            $this->logger->warning(
+                'Quote module WishlistDataCleanUp patch experienced an error and could not be completed.'
+                . ' Please submit a support ticket or email us at security@magento.com.'
+            );
+
+            return $this;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove login data from quote_item_option table.
+     *
+     * @throws LocalizedException
+     */
+    private function cleanQuoteItemOptionTable()
+    {
+        $quoteSetup = $this->quoteSetupFactory->create();
+        $tableName = $quoteSetup->getTable('quote_item_option');
+        $select = $quoteSetup
+            ->getConnection()
+            ->select()
+            ->from(
+                $tableName,
+                ['option_id', 'value']
+            )
+            ->where(
+                'value LIKE ?',
+                '%login%'
+            );
+        $iterator = $this->queryGenerator->generate('option_id', $select, self::BATCH_SIZE);
+        $rowErrorFlag = false;
+        foreach ($iterator as $selectByRange) {
+            $optionRows = $quoteSetup->getConnection()->fetchAll($selectByRange);
+            foreach ($optionRows as $optionRow) {
+                try {
+                    $rowValue = $this->json->unserialize($optionRow['value']);
+                    if (is_array($rowValue)
+                        && array_key_exists('login', $rowValue)
+                    ) {
+                        unset($rowValue['login']);
+                    }
+                    $rowValue = $this->json->serialize($rowValue);
+                    $quoteSetup->getConnection()->update(
+                        $tableName,
+                        ['value' => $rowValue],
+                        ['option_id = ?' => $optionRow['option_id']]
+                    );
+                } catch (\Throwable $e) {
+                    $rowErrorFlag = true;
+                    continue;
+                }
+            }
+        }
+        if ($rowErrorFlag) {
+            $this->logger->warning(
+                'Data clean up could not be completed due to unexpected data format in the table "'
+                . $tableName
+                . '". Please submit a support ticket or email us at security@magento.com.'
+            );
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            ConvertSerializedDataToJson::class
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php b/app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php
new file mode 100644
index 0000000000000..7a10d5cd191bf
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Sales\Setup\Patch\Data;
+
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Magento\Sales\Setup\SalesSetupFactory;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Clean Up Data Removes unused data
+ */
+class WishlistDataCleanUp implements DataPatchInterface
+{
+    /**
+     * Batch size for query
+     */
+    private const BATCH_SIZE = 1000;
+
+    /**
+     * @var SalesSetupFactory
+     */
+    private $salesSetupFactory;
+
+    /**
+     * @var Generator
+     */
+    private $queryGenerator;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * RemoveData constructor.
+     * @param Json $json
+     * @param Generator $queryGenerator
+     * @param SalesSetupFactory $salesSetupFactory
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Json $json,
+        Generator $queryGenerator,
+        SalesSetupFactory $salesSetupFactory,
+        LoggerInterface $logger
+    ) {
+        $this->json = $json;
+        $this->queryGenerator = $queryGenerator;
+        $this->salesSetupFactory = $salesSetupFactory;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function apply()
+    {
+        try {
+            $this->cleanSalesOrderItemTable();
+        } catch (\Throwable $e) {
+            $this->logger->warning(
+                'Sales module WishlistDataCleanUp patch experienced an error and could not be completed.'
+                . ' Please submit a support ticket or email us at security@magento.com.'
+            );
+
+            return $this;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove login data from sales_order_item table.
+     *
+     * @throws LocalizedException
+     */
+    private function cleanSalesOrderItemTable()
+    {
+        $salesSetup = $this->salesSetupFactory->create();
+        $tableName = $salesSetup->getTable('sales_order_item');
+        $select = $salesSetup
+            ->getConnection()
+            ->select()
+            ->from(
+                $tableName,
+                ['item_id', 'product_options']
+            )
+            ->where(
+                'product_options LIKE ?',
+                '%login%'
+            );
+        $iterator = $this->queryGenerator->generate('item_id', $select, self::BATCH_SIZE);
+        $rowErrorFlag = false;
+        foreach ($iterator as $selectByRange) {
+            $itemRows = $salesSetup->getConnection()->fetchAll($selectByRange);
+            foreach ($itemRows as $itemRow) {
+                try {
+                    $rowValue = $this->json->unserialize($itemRow['product_options']);
+                    if (is_array($rowValue)
+                        && array_key_exists('info_buyRequest', $rowValue)
+                        && array_key_exists('login', $rowValue['info_buyRequest'])
+                    ) {
+                        unset($rowValue['info_buyRequest']['login']);
+                    }
+                    $rowValue = $this->json->serialize($rowValue);
+                    $salesSetup->getConnection()->update(
+                        $tableName,
+                        ['product_options' => $rowValue],
+                        ['item_id = ?' => $itemRow['item_id']]
+                    );
+                } catch (\Throwable $e) {
+                    $rowErrorFlag = true;
+                    continue;
+                }
+            }
+        }
+        if ($rowErrorFlag) {
+            $this->logger->warning(
+                'Data clean up could not be completed due to unexpected data format in the table "'
+                . $tableName
+                . '". Please submit a support ticket or email us at security@magento.com.'
+            );
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            ConvertSerializedDataToJson::class
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/Wishlist/Setup/Patch/Data/WishlistDataCleanUp.php b/app/code/Magento/Wishlist/Setup/Patch/Data/WishlistDataCleanUp.php
new file mode 100644
index 0000000000000..df0aed7daf2c0
--- /dev/null
+++ b/app/code/Magento/Wishlist/Setup/Patch/Data/WishlistDataCleanUp.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+namespace Magento\Wishlist\Setup\Patch\Data;
+
+use Magento\Framework\DB\Query\Generator;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\DataPatchInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * Class Clean Up Data Removes unused data
+ */
+class WishlistDataCleanUp implements DataPatchInterface
+{
+    /**
+     * Batch size for query
+     */
+    private const BATCH_SIZE = 1000;
+
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var Generator
+     */
+    private $queryGenerator;
+
+    /**
+     * @var Json
+     */
+    private $json;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * RemoveData constructor.
+     * @param Json $json
+     * @param Generator $queryGenerator
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param LoggerInterface $logger
+     */
+    public function __construct(
+        Json $json,
+        Generator $queryGenerator,
+        ModuleDataSetupInterface $moduleDataSetup,
+        LoggerInterface $logger
+    ) {
+        $this->json = $json;
+        $this->queryGenerator = $queryGenerator;
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->logger = $logger;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function apply()
+    {
+        try {
+            $this->cleanWishlistItemOptionTable();
+        } catch (\Throwable $e) {
+            $this->logger->warning(
+                'Wishlist module WishlistDataCleanUp patch experienced an error and could not be completed.'
+                . ' Please submit a support ticket or email us at security@magento.com.'
+            );
+
+            return $this;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Remove login data from wishlist_item_option table.
+     *
+     * @throws LocalizedException
+     */
+    private function cleanWishlistItemOptionTable()
+    {
+        $tableName = $this->moduleDataSetup->getTable('wishlist_item_option');
+        $select = $this->moduleDataSetup
+            ->getConnection()
+            ->select()
+            ->from(
+                $tableName,
+                ['option_id', 'value']
+            )
+            ->where(
+                'value LIKE ?',
+                '%login%'
+            );
+        $iterator = $this->queryGenerator->generate('option_id', $select, self::BATCH_SIZE);
+        $rowErrorFlag = false;
+        foreach ($iterator as $selectByRange) {
+            $optionRows = $this->moduleDataSetup->getConnection()->fetchAll($selectByRange);
+            foreach ($optionRows as $optionRow) {
+                try {
+                    $rowValue = $this->json->unserialize($optionRow['value']);
+                    if (is_array($rowValue)
+                        && array_key_exists('login', $rowValue)
+                    ) {
+                        unset($rowValue['login']);
+                    }
+                    $rowValue = $this->json->serialize($rowValue);
+                    $this->moduleDataSetup->getConnection()->update(
+                        $tableName,
+                        ['value' => $rowValue],
+                        ['option_id = ?' => $optionRow['option_id']]
+                    );
+                } catch (\Throwable $e) {
+                    $rowErrorFlag = true;
+                    continue;
+                }
+            }
+        }
+        if ($rowErrorFlag) {
+            $this->logger->warning(
+                'Data clean up could not be completed due to unexpected data format in the table "'
+                . $tableName
+                . '". Please submit a support ticket or email us at security@magento.com.'
+            );
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            ConvertSerializedData::class
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}

From efeff4cce3904d1042614c1a956ecdd7cbdff69f Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Fri, 31 Jul 2020 16:08:16 -0500
Subject: [PATCH 091/671] MC-35230: Password lifetime is not honored, it's
 possible to use the old password

---
 .../Backend/TrackAdminNewPasswordObserver.php | 33 +++++++++++--------
 .../TrackAdminNewPasswordObserverTest.php     |  7 ++--
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
index 059879ab9613f..9573aaa1547ab 100644
--- a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
+++ b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
@@ -8,52 +8,57 @@
 
 use Magento\Framework\Event\Observer as EventObserver;
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\User\Model\User;
+use Magento\User\Model\Backend\Config\ObserverConfig;
+use Magento\User\Model\ResourceModel\User as UserResource;
+use Magento\Backend\Model\Auth\Session as AuthSession;
 
 /**
  * User backend observer model for passwords
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class TrackAdminNewPasswordObserver implements ObserverInterface
 {
     /**
      * Backend configuration interface
      *
-     * @var \Magento\User\Model\Backend\Config\ObserverConfig
+     * @var ObserverConfig
      */
     protected $observerConfig;
 
     /**
      * Admin user resource model
      *
-     * @var \Magento\User\Model\ResourceModel\User
+     * @var UserResource
      */
     protected $userResource;
 
     /**
      * Backend authorization session
      *
-     * @var \Magento\Backend\Model\Auth\Session
+     * @var AuthSession
      */
     protected $authSession;
 
     /**
      * Message manager interface
      *
-     * @var \Magento\Framework\Message\ManagerInterface
+     * @var ManagerInterface
      */
     protected $messageManager;
 
     /**
-     * @param \Magento\User\Model\Backend\Config\ObserverConfig $observerConfig
-     * @param \Magento\User\Model\ResourceModel\User $userResource
-     * @param \Magento\Backend\Model\Auth\Session $authSession
-     * @param \Magento\Framework\Message\ManagerInterface $messageManager
+     * @param ObserverConfig $observerConfig
+     * @param UserResource $userResource
+     * @param AuthSession $authSession
+     * @param ManagerInterface $messageManager
      */
     public function __construct(
-        \Magento\User\Model\Backend\Config\ObserverConfig $observerConfig,
-        \Magento\User\Model\ResourceModel\User $userResource,
-        \Magento\Backend\Model\Auth\Session $authSession,
-        \Magento\Framework\Message\ManagerInterface $messageManager
+        ObserverConfig $observerConfig,
+        UserResource $userResource,
+        AuthSession $authSession,
+        ManagerInterface $messageManager
     ) {
         $this->observerConfig = $observerConfig;
         $this->userResource = $userResource;
@@ -69,11 +74,11 @@ public function __construct(
      */
     public function execute(EventObserver $observer)
     {
-        /* @var $user \Magento\User\Model\User */
+        /* @var $user User */
         $user = $observer->getEvent()->getObject();
         if ($user->getId()) {
             $passwordHash = $user->getPassword();
-            if ($passwordHash && !$user->getForceNewPassword()) {
+            if ($passwordHash && $user->dataHasChangedFor('password')) {
                 $this->userResource->trackPassword($user, $passwordHash);
                 $this->messageManager->getMessages()->deleteMessageByIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED);
                 $this->authSession->unsPciAdminUserIsPasswordExpired();
diff --git a/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php b/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php
index 10477bdf80303..90e5f04b9c73e 100644
--- a/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php
+++ b/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php
@@ -112,14 +112,17 @@ public function testTrackAdminPassword()
         /** @var \Magento\User\Model\User|MockObject $userMock */
         $userMock = $this->getMockBuilder(\Magento\User\Model\User::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getId', 'getPassword', 'getForceNewPassword'])
+            ->setMethods(['getId', 'getPassword', 'dataHasChangedFor'])
             ->getMock();
 
         $eventObserverMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
         $eventMock->expects($this->once())->method('getObject')->willReturn($userMock);
         $userMock->expects($this->once())->method('getId')->willReturn($uid);
         $userMock->expects($this->once())->method('getPassword')->willReturn($newPW);
-        $userMock->expects($this->once())->method('getForceNewPassword')->willReturn(false);
+        $userMock->expects($this->once())
+            ->method('dataHasChangedFor')
+            ->with('password')
+            ->willReturn(true);
 
         /** @var Collection|MockObject $collectionMock */
         $collectionMock = $this->getMockBuilder(Collection::class)

From 5c111dd8ecfa1d7a2c5dc1216f44a6455cd36d58 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Mon, 3 Aug 2020 09:11:57 -0500
Subject: [PATCH 092/671] MC-20639: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- test for downloadable product
---
 ...rieveOrdersWithDownloadableProductTest.php | 157 ++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
new file mode 100644
index 0000000000000..143e0bb1cddb6
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Sales;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Class RetrieveOrdersTest
+ */
+class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
+{
+    /** @var OrderRepositoryInterface */
+    private $orderRepository;
+
+    /** @var SearchCriteriaBuilder */
+    private $searchCriteriaBuilder;
+
+    /** @var GetCustomerAuthenticationHeader */
+    private $customerAuthenticationHeader;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    protected function setUp():void
+    {
+        parent::setUp();
+        $objectManager = Bootstrap::getObjectManager();
+        $this->customerAuthenticationHeader = $objectManager->get(GetCustomerAuthenticationHeader::class);
+        $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/order_with_customer_and_downloadable_product.php
+     */
+    public function testGetCustomerOrdersDownloadableProduct()
+    {
+        $orderNumber = '100000001';
+        $response = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderItemsInResponse = $response[0]['items'];
+
+        $this->assertNotEmpty($customerOrderItemsInResponse);
+        $downloadableItemInTheOrder = $customerOrderItemsInResponse[0];
+        $this->assertEquals(
+            'downloadable-product',
+            $downloadableItemInTheOrder['product_sku']
+        );
+        $priceOfDownloadableItemInOrder = $downloadableItemInTheOrder['product_sale_price']['value'];
+        $this->assertEquals(10, $priceOfDownloadableItemInOrder);
+        $this->assertArrayHasKey('downloadable_links', $downloadableItemInTheOrder);
+        $downloadableLinksFromResponse = $downloadableItemInTheOrder['downloadable_links'];
+        $this->assertNotEmpty($downloadableLinksFromResponse);
+
+        $downloadableProduct = $this->productRepository->get('downloadable-product');
+        /** @var LinkInterface $downloadableProductLinks */
+        $downloadableProductLinks = $downloadableProduct->getExtensionAttributes()->getDownloadableProductLinks();
+        $linkId = $downloadableProductLinks[0]->getId();
+        $expectedDownloadableLinksData =
+            [
+                [
+                    'title' =>'Downloadable Product Link',
+                    'sort_order' => 1,
+                    'uid'=> base64_encode("downloadable/{$linkId}")
+                ]
+            ];
+        $this->assertResponseFields($expectedDownloadableLinksData,$downloadableLinksFromResponse);
+    }
+
+    /**
+     * Get customer order query
+     *
+     * @param string $orderNumber
+     * @return array
+     */
+    private function getCustomerOrderQuery($orderNumber): array
+    {
+        $query =
+            <<<QUERY
+{
+     customer {
+       orders(filter:{number:{eq:"{$orderNumber}"}}) {
+         total_count
+         items {
+          id
+           number
+           order_date
+           status
+           items{
+            __typename
+            product_sku
+            product_name
+            product_url_key
+            product_sale_price{value}
+            quantity_ordered
+            discounts{amount{value} label}
+            ... on DownloadableOrderItem{
+              downloadable_links{
+                title
+                sort_order
+                uid
+              }
+              entered_options{value id}
+              product_sku
+              product_name
+              quantity_ordered
+          }
+         }
+           total {
+             base_grand_total{value currency}
+             grand_total{value currency}
+             subtotal {value currency }
+             total_tax{value currency}
+             taxes {amount{value currency} title rate}
+             total_shipping{value currency}
+             shipping_handling
+             {
+               amount_including_tax{value}
+               amount_excluding_tax{value}
+               total_amount{value}
+               discounts{amount{value} label}
+               taxes {amount{value} title rate}
+             }
+             discounts {amount{value currency} label}
+           }
+         }
+       }
+     }
+   }
+QUERY;
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+
+        $this->assertArrayHasKey('orders', $response['customer']);
+        $this->assertArrayHasKey('items', $response['customer']['orders']);
+        $this->assertNotEmpty($response['customer']['orders']['items']);
+        $customerOrderItemsInResponse = $response['customer']['orders']['items'];
+        return $customerOrderItemsInResponse;
+    }
+}

From 5512263dca239bc415648ce5605ab07b58f2d784 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Mon, 3 Aug 2020 12:32:46 -0500
Subject: [PATCH 093/671] MC-34939: Not able to export customers from backend

---
 .../VersionControl/AbstractCollection.php          | 11 +++++++++++
 .../ResourceModel/Db/VersionControl/Snapshot.php   | 14 ++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php b/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
index 631bfa3c2d2b5..5ecbf70c246d1 100644
--- a/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
+++ b/app/code/Magento/Eav/Model/Entity/Collection/VersionControl/AbstractCollection.php
@@ -87,4 +87,15 @@ protected function beforeAddLoadedItem(\Magento\Framework\DataObject $item)
         $this->entitySnapshot->registerSnapshot($item);
         return $item;
     }
+
+    /**
+     * Clear collection
+     *
+     * @return $this
+     */
+    public function clear()
+    {
+        $this->entitySnapshot->clear($this->getNewEmptyItem());
+        return parent::clear();
+    }
 }
diff --git a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php
index 095b5accda7c3..a287fa5e1af42 100644
--- a/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php
+++ b/lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php
@@ -72,4 +72,18 @@ public function isModified(\Magento\Framework\DataObject $entity)
 
         return false;
     }
+
+    /**
+     * Clear snapshot data
+     *
+     * @param \Magento\Framework\DataObject|null $entity
+     */
+    public function clear(\Magento\Framework\DataObject $entity = null)
+    {
+        if ($entity !== null) {
+            $this->snapshotData[get_class($entity)] = [];
+        } else {
+            $this->snapshotData = [];
+        }
+    }
 }

From d425596643b966a3f08229cf7dcdb6cd38c527bd Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Mon, 3 Aug 2020 16:21:48 -0500
Subject: [PATCH 094/671] MC-34939: Not able to export customers from backend

---
 .../VersionControl/AbstractCollectionTest.php |  8 ++++++-
 .../Db/VersionControl/SnapshotTest.php        | 23 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
index aa49a78ced7e3..0afe5a2c2d0d7 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
@@ -36,7 +36,7 @@ protected function setUp(): void
 
         $this->entitySnapshot = $this->createPartialMock(
             Snapshot::class,
-            ['registerSnapshot']
+            ['registerSnapshot', 'clear']
         );
 
         $this->subject = $objectManager->getObject(
@@ -82,4 +82,10 @@ public static function fetchItemDataProvider()
             [['attribute' => 'test']]
         ];
     }
+
+    public function testClearSnapshot()
+    {
+        $item = $this->getMagentoObject();
+        $this->entitySnapshot->expects($this->once())->method('clear')->with($item);
+    }
 }
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/VersionControl/SnapshotTest.php b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/VersionControl/SnapshotTest.php
index 9777e2df558bd..ed2dd09331f69 100644
--- a/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/VersionControl/SnapshotTest.php
+++ b/lib/internal/Magento/Framework/Model/Test/Unit/ResourceModel/Db/VersionControl/SnapshotTest.php
@@ -96,4 +96,27 @@ public function testIsModified()
         $this->entitySnapshot->registerSnapshot($this->model);
         $this->assertFalse($this->entitySnapshot->isModified($this->model));
     }
+
+    public function testClear()
+    {
+        $entityId = 1;
+        $data = [
+            'id' => $entityId,
+            'name' => 'test',
+            'description' => '',
+            'custom_not_present_attribute' => ''
+        ];
+        $fields = [
+            'id' => [],
+            'name' => [],
+            'description' => []
+        ];
+        $this->assertTrue($this->entitySnapshot->isModified($this->model));
+        $this->model->setData($data);
+        $this->model->expects($this->any())->method('getId')->willReturn($entityId);
+        $this->entityMetadata->expects($this->any())->method('getFields')->with($this->model)->willReturn($fields);
+        $this->entitySnapshot->registerSnapshot($this->model);
+        $this->entitySnapshot->clear($this->model);
+        $this->assertTrue($this->entitySnapshot->isModified($this->model));
+    }
 }

From 5e3ee96efdb20ea129b82e909c9fe88c9c58a5df Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Tue, 4 Aug 2020 07:34:05 -0500
Subject: [PATCH 095/671] MC-34939: Not able to export customers from backend

---
 .../Entity/Collection/VersionControl/AbstractCollectionTest.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
index 0afe5a2c2d0d7..bc3f81c7385d1 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Collection/VersionControl/AbstractCollectionTest.php
@@ -87,5 +87,6 @@ public function testClearSnapshot()
     {
         $item = $this->getMagentoObject();
         $this->entitySnapshot->expects($this->once())->method('clear')->with($item);
+        $this->subject->clear();
     }
 }

From 638e7f16178c81c31b448c7f8215fe54d039731d Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Tue, 4 Aug 2020 17:16:42 +0300
Subject: [PATCH 096/671] MC-35971: Not selected Parent page on CMS Page

---
 .../Magento/Store/Model/ScopeResolver.php     | 147 +++++++++++++++
 .../Test/Unit/Model/ScopeResolverTest.php     | 178 ++++++++++++++++++
 2 files changed, 325 insertions(+)
 create mode 100644 app/code/Magento/Store/Model/ScopeResolver.php
 create mode 100644 app/code/Magento/Store/Test/Unit/Model/ScopeResolverTest.php

diff --git a/app/code/Magento/Store/Model/ScopeResolver.php b/app/code/Magento/Store/Model/ScopeResolver.php
new file mode 100644
index 0000000000000..330ef29c8ac10
--- /dev/null
+++ b/app/code/Magento/Store/Model/ScopeResolver.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ScopeTreeProviderInterface;
+
+/**
+ * Class used to check if some scope belongs to other scope
+ */
+class ScopeResolver
+{
+    /**
+     * @var ScopeTreeProviderInterface
+     */
+    private $scopeTree;
+
+    /**
+     * @param ScopeTreeProviderInterface $scopeTree
+     */
+    public function __construct(ScopeTreeProviderInterface $scopeTree)
+    {
+        $this->scopeTree = $scopeTree;
+    }
+
+    /**
+     * Check is some scope belongs to other scope
+     *
+     * @param string $baseScope
+     * @param int $baseScopeId
+     * @param string $requestedScope
+     * @param int $requestedScopeId
+     * @return bool
+     */
+    public function isBelongsToScope(
+        string $baseScope,
+        int $baseScopeId,
+        string $requestedScope,
+        int $requestedScopeId
+    ) : bool {
+        /* All scopes belongs to All Store Views */
+        if ($baseScope === ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
+            return true;
+        }
+
+        $scopeNode = $this->getScopeNode($baseScope, $baseScopeId, [$this->scopeTree->get()]);
+        if (empty($scopeNode)) {
+            return false;
+        }
+
+        return $this->isBelongsToScopeRecurse($requestedScope, $requestedScopeId, [$scopeNode]);
+    }
+
+    /**
+     * Check is Belongs some scope to other scope (internal recurse)
+     *
+     * @param string $requestedScope
+     * @param int $requestedScopeId
+     * @param array $tree
+     * @return bool
+     */
+    private function isBelongsToScopeRecurse(
+        string $requestedScope,
+        int $requestedScopeId,
+        array $tree
+    ) : bool {
+        foreach ($tree as $node) {
+            if ($this->isScopeEquals($node['scope'], $requestedScope) && (int)$node['scope_id'] === $requestedScopeId) {
+                return true;
+            }
+            if (!empty($node['scopes'])) {
+                $isBelongsToChild = $this->isBelongsToScopeRecurse(
+                    $requestedScope,
+                    $requestedScopeId,
+                    $node['scopes']
+                );
+                if ($isBelongsToChild) {
+                    return $isBelongsToChild;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get tree by scope
+     *
+     * @param string $scope
+     * @param int $scopeId
+     * @param array $tree
+     * @return array
+     */
+    private function getScopeNode(string $scope, int $scopeId, array $tree): array
+    {
+        foreach ($tree as $node) {
+            if ($this->isScopeEquals($node['scope'], $scope) && (int)$node['scope_id'] === $scopeId) {
+                return $node;
+            }
+            if (!empty($node['scopes'])) {
+                $found = $this->getScopeNode($scope, $scopeId, $node['scopes']);
+                if (!empty($found)) {
+                    return $found;
+                }
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * Is scope equals with normalize names
+     *
+     * @param string $firstScope
+     * @param string $secondScope
+     * @return bool
+     */
+    private function isScopeEquals(string $firstScope, string $secondScope): bool
+    {
+        return $this->normalizeScopeName($firstScope) === $this->normalizeScopeName($secondScope);
+    }
+
+    /**
+     * Normalize scope name
+     *
+     * @param string $scope
+     * @return string
+     */
+    private function normalizeScopeName(string $scope): string
+    {
+        switch ($scope) {
+            case ScopeInterface::SCOPE_STORES:
+                return ScopeInterface::SCOPE_STORE;
+            case ScopeInterface::SCOPE_WEBSITES:
+                return ScopeInterface::SCOPE_WEBSITE;
+            case ScopeInterface::SCOPE_GROUPS:
+                return ScopeInterface::SCOPE_GROUP;
+            default:
+                return $scope;
+        }
+    }
+}
diff --git a/app/code/Magento/Store/Test/Unit/Model/ScopeResolverTest.php b/app/code/Magento/Store/Test/Unit/Model/ScopeResolverTest.php
new file mode 100644
index 0000000000000..d93c08eb3b27f
--- /dev/null
+++ b/app/code/Magento/Store/Test/Unit/Model/ScopeResolverTest.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Store\Test\Unit\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ScopeTreeProviderInterface;
+use Magento\Store\Model\ScopeInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
+use Magento\Store\Model\ScopeResolver;
+
+/**
+ * Test for ScopeResolver
+ */
+class ScopeResolverTest extends TestCase
+{
+    /**
+     * @var ScopeTreeProviderInterface|MockObject
+     */
+    private $scopeTreeMock;
+
+    /**
+     * @var ScopeResolver
+     */
+    private $scopeResolver;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->scopeTreeMock = $this->getMockBuilder(ScopeTreeProviderInterface::class)
+            ->getMockForAbstractClass();
+        $this->scopeResolver = new ScopeResolver($this->scopeTreeMock);
+    }
+
+    /**
+     * Check is some scope belongs to other scope
+     *
+     * @param string $baseScope
+     * @param int $baseScopeId
+     * @param string $requestedScope
+     * @param int $requestedScopeId
+     * @param bool $isBelong
+     * @dataProvider testIsBelongsToScopeDataProvider
+     */
+    public function testIsBelongsToScope(
+        string $baseScope,
+        int $baseScopeId,
+        string $requestedScope,
+        int $requestedScopeId,
+        bool $isBelong
+    ) {
+        $this->scopeTreeMock->expects($this->any())
+            ->method('get')
+            ->willReturn(
+                $this->getTree()
+            );
+        $this->assertEquals(
+            $isBelong,
+            $this->scopeResolver->isBelongsToScope($baseScope, $baseScopeId, $requestedScope, $requestedScopeId)
+        );
+    }
+
+    /**
+     * Data provider for testIsBelongsToScope
+     *
+     * @return array[]
+     */
+    public function testIsBelongsToScopeDataProvider()
+    {
+        return [
+            'All scopes belongs to Default' => [
+                'baseScope' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+                'baseScopeId' => 0,
+                'requestedScope' => ScopeInterface::SCOPE_WEBSITE,
+                'requestedScopeId' => 1,
+                'isBelong' => true
+            ],
+            'Store group belongs to website' => [
+                'baseScope' => ScopeInterface::SCOPE_WEBSITE,
+                'baseScopeId' => 1,
+                'requestedScope' => ScopeInterface::SCOPE_GROUP,
+                'requestedScopeId' => 1,
+                'isBelong' => true
+            ],
+            'Store belongs to store group' => [
+                'baseScope' => ScopeInterface::SCOPE_GROUP,
+                'baseScopeId' => 1,
+                'requestedScope' => ScopeInterface::SCOPE_STORE,
+                'requestedScopeId' => 1,
+                'isBelong' => true
+            ],
+            'Store belongs to website' => [
+                'baseScope' => ScopeInterface::SCOPE_WEBSITE,
+                'baseScopeId' => 1,
+                'requestedScope' => ScopeInterface::SCOPE_STORE,
+                'requestedScopeId' => 1,
+                'isBelong' => true
+            ],
+            'Store group not belongs to website' => [
+                'baseScope' => ScopeInterface::SCOPE_WEBSITE,
+                'baseScopeId' => 1,
+                'requestedScope' => ScopeInterface::SCOPE_GROUP,
+                'requestedScopeId' => 2,
+                'isBelong' => false
+            ],
+            'Store not belongs to store group' => [
+                'baseScope' => ScopeInterface::SCOPE_GROUP,
+                'baseScopeId' => 1,
+                'requestedScope' => ScopeInterface::SCOPE_STORE,
+                'requestedScopeId' => 2,
+                'isBelong' => false
+            ],
+            'Store not belongs to website' => [
+                'baseScope' => ScopeInterface::SCOPE_WEBSITE,
+                'baseScopeId' => 1,
+                'requestedScope' => ScopeInterface::SCOPE_STORE,
+                'requestedScopeId' => 2,
+                'isBelong' => false
+            ],
+        ];
+    }
+
+    /**
+     * Get scope tree with 2 websites, 2 groups and 2 stores
+     *
+     * @return array
+     */
+    private function getTree()
+    {
+        return [
+            'scope' => ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            'scope_id' => null,
+            'scopes' => [
+                [
+                    'scope' => ScopeInterface::SCOPE_WEBSITE,
+                    'scope_id' => 1,
+                    'scopes' => [
+                        [
+                            'scope' => ScopeInterface::SCOPE_GROUP,
+                            'scope_id' => 1,
+                            'scopes' => [
+                                [
+                                    'scope' => ScopeInterface::SCOPE_STORE,
+                                    'scope_id' => 1,
+                                    'scopes' => [],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+                [
+                    'scope' => ScopeInterface::SCOPE_WEBSITE,
+                    'scope_id' => 2,
+                    'scopes' => [
+                        [
+                            'scope' => ScopeInterface::SCOPE_GROUP,
+                            'scope_id' => 2,
+                            'scopes' => [
+                                [
+                                    'scope' => ScopeInterface::SCOPE_STORE,
+                                    'scope_id' => 2,
+                                    'scopes' => [],
+                                ],
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+}

From b1adaf89ca4a23dfac22464ff658d86286efd8e4 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Tue, 4 Aug 2020 15:27:11 -0500
Subject: [PATCH 097/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 .../Magento/CatalogSearch/Model/Advanced.php  |  5 ++
 .../Product/FieldProvider/StaticField.php     | 26 +++++++
 .../Model/Adapter/Index/Builder.php           | 39 ++++++++---
 .../Controller/Advanced/ResultTest.php        | 70 +++++++++++++++++++
 .../product_for_search_with_hyphen_in_sku.php | 51 ++++++++++++++
 ...for_search_with_hyphen_in_sku_rollback.php | 39 +++++++++++
 6 files changed, 220 insertions(+), 10 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php

diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 5143762a07e08..b498cb09e34fa 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -233,6 +233,11 @@ public function addFilters($values)
                     ? date('Y-m-d\TH:i:s\Z', strtotime($value['to']))
                     : '';
             }
+
+            if ($attribute->getAttributeCode() === 'sku') {
+                $value = mb_strtolower($value);
+            }
+
             $condition = $this->_getResource()->prepareCondition(
                 $attribute,
                 $value,
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
index f7dfcd29e5036..6eff57e0c90e3 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php
@@ -102,6 +102,7 @@ public function __construct(
      * @param array $context
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function getFields(array $context = []): array
     {
@@ -118,6 +119,9 @@ public function getFields(array $context = []): array
             $allAttributes[$fieldName] = [
                 'type' => $this->fieldTypeResolver->getFieldType($attributeAdapter),
             ];
+            if ($this->isNeedToAddCustomAnalyzer($fieldName) && $this->getCustomAnalyzer($fieldName)) {
+                $allAttributes[$fieldName]['analyzer'] = $this->getCustomAnalyzer($fieldName);
+            }
 
             $index = $this->fieldIndexResolver->getFieldIndex($attributeAdapter);
             if (null !== $index) {
@@ -172,4 +176,26 @@ public function getFields(array $context = []): array
 
         return $allAttributes;
     }
+
+    /**
+     * Check is the custom analyzer exists for the field
+     *
+     * @param string $fieldName
+     * @return bool
+     */
+    private function isNeedToAddCustomAnalyzer(string $fieldName): bool
+    {
+        return $fieldName === 'sku';
+    }
+
+    /**
+     * Getter for the field custom analyzer if it's exists
+     *
+     * @param string $fieldName
+     * @return string|null
+     */
+    private function getCustomAnalyzer(string $fieldName): ?string
+    {
+        return $fieldName === 'sku' ? 'sku' : null;
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
index 773faf49f8fda..1cad781ad6d74 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
@@ -8,6 +8,9 @@
 use Magento\Framework\Locale\Resolver as LocaleResolver;
 use Magento\Elasticsearch\Model\Adapter\Index\Config\EsConfigInterface;
 
+/**
+ * Index Builder
+ */
 class Builder implements BuilderInterface
 {
     /**
@@ -40,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function build()
     {
@@ -59,6 +62,14 @@ public function build()
                             array_keys($filter)
                         ),
                         'char_filter' => array_keys($charFilter)
+                    ],
+                    'sku' => [
+                        'type' => 'custom',
+                        'tokenizer' => 'keyword',
+                        'filter' => array_merge(
+                            ['lowercase', 'keyword_repeat'],
+                            array_keys($filter)
+                        ),
                     ]
                 ],
                 'tokenizer' => $tokenizer,
@@ -71,7 +82,10 @@ public function build()
     }
 
     /**
-     * {@inheritdoc}
+     * Setter for storeId property
+     *
+     * @param int $storeId
+     * @return void
      */
     public function setStoreId($storeId)
     {
@@ -79,47 +93,52 @@ public function setStoreId($storeId)
     }
 
     /**
+     * Return tokenizer configuration
+     *
      * @return array
      */
     protected function getTokenizer()
     {
-        $tokenizer = [
+        return [
             'default_tokenizer' => [
-                'type' => 'standard',
-            ],
+                'type' => 'standard'
+            ]
         ];
-        return $tokenizer;
     }
 
     /**
+     * Return filter configuration
+     *
      * @return array
      */
     protected function getFilter()
     {
-        $filter = [
+        return [
             'default_stemmer' => $this->getStemmerConfig(),
             'unique_stem' => [
                 'type' => 'unique',
                 'only_on_same_position' => true
             ]
         ];
-        return $filter;
     }
 
     /**
+     * Return char filter configuration
+     *
      * @return array
      */
     protected function getCharFilter()
     {
-        $charFilter = [
+        return [
             'default_char_filter' => [
                 'type' => 'html_strip',
             ],
         ];
-        return $charFilter;
     }
 
     /**
+     * Return stemmer configuration
+     *
      * @return array
      */
     protected function getStemmerConfig()
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
index dcbaa4addd85e..d9b9a41f5fdbb 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
@@ -67,6 +67,76 @@ public function testExecute(array $searchParams): void
         $this->assertStringContainsString('Simple product name', $responseBody);
     }
 
+    /**
+     * Advanced search test by difference product attributes.
+     *
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     *
+     * @return void
+     */
+    public function testExecuteSkuWithHyphen(): void
+    {
+        $this->getRequest()->setQuery(
+            $this->_objectManager->create(
+                Parameters::class,
+                [
+                    'values' => [
+                        'name' => '',
+                        'sku' => '24-mb01',
+                        'description' => '',
+                        'short_description' => '',
+                        'price' => [
+                            'from' => '',
+                            'to' => '',
+                        ],
+                        'test_searchable_attribute' => '',
+                    ]
+                ]
+            )
+        );
+        $this->dispatch('catalogsearch/advanced/result');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('Simple product name', $responseBody);
+    }
+
+    /**
+     * Advanced search test by difference product attributes.
+     *
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
+     * @magentoAppArea frontend
+     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
+     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
+     *
+     * @return void
+     */
+    public function testExecuteSkuWithHyphen(): void
+    {
+        $this->getRequest()->setQuery(
+            $this->_objectManager->create(
+                Parameters::class,
+                [
+                    'values' => [
+                        'name' => '',
+                        'sku' => '24-mb01',
+                        'description' => '',
+                        'short_description' => '',
+                        'price' => [
+                            'from' => '',
+                            'to' => '',
+                        ],
+                        'test_searchable_attribute' => '',
+                    ]
+                ]
+            )
+        );
+        $this->dispatch('catalogsearch/advanced/result');
+        $responseBody = $this->getResponse()->getBody();
+        $this->assertContains('Simple product name', $responseBody);
+    }
+
     /**
      * Data provider with strings for quick search.
      *
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
new file mode 100644
index 0000000000000..5503ff98078a3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+require 'searchable_attribute.php';
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([1])
+    ->setName('Simple product name')
+    ->setSku('24-mb01')
+    ->setPrice(100)
+    ->setWeight(1)
+    ->setShortDescription('Product short description')
+    ->setTaxClassId(0)
+    ->setDescription('Product description')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setTestSearchableAttribute($attribute->getSource()->getOptionId('Option 1'))
+    ->setStockData(
+        [
+            'use_config_manage_stock' => 1,
+            'qty' => 100,
+            'is_qty_decimal' => 0,
+            'is_in_stock' => 1,
+        ]
+    );
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php
new file mode 100644
index 0000000000000..1e41f393894e7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku_rollback.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Eav\Setup\EavSetupFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+/** @var ObjectManager $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var EavSetupFactory $eavSetupFactory */
+$eavSetupFactory = $objectManager->create(EavSetupFactory::class);
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $productRepository->deleteById('24-mb01');
+} catch (NoSuchEntityException $e) {
+    //Product already deleted.
+}
+/** @var EavSetup $eavSetup */
+$eavSetup = $eavSetupFactory->create();
+$eavSetup->removeAttribute(Product::ENTITY, 'test_searchable_attribute');
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 700dc997c65a792b442d407db3ffea6859b34498 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Wed, 5 Aug 2020 10:52:03 -0500
Subject: [PATCH 098/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 .../Controller/Advanced/ResultTest.php        | 37 +------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
index d9b9a41f5fdbb..455668e83b518 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
@@ -70,42 +70,7 @@ public function testExecute(array $searchParams): void
     /**
      * Advanced search test by difference product attributes.
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
-     * @magentoAppArea frontend
-     * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
-     * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php
-     *
-     * @return void
-     */
-    public function testExecuteSkuWithHyphen(): void
-    {
-        $this->getRequest()->setQuery(
-            $this->_objectManager->create(
-                Parameters::class,
-                [
-                    'values' => [
-                        'name' => '',
-                        'sku' => '24-mb01',
-                        'description' => '',
-                        'short_description' => '',
-                        'price' => [
-                            'from' => '',
-                            'to' => '',
-                        ],
-                        'test_searchable_attribute' => '',
-                    ]
-                ]
-            )
-        );
-        $this->dispatch('catalogsearch/advanced/result');
-        $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('Simple product name', $responseBody);
-    }
-
-    /**
-     * Advanced search test by difference product attributes.
-     *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch6
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch7
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php

From 5e9739dd506877992fbbb2cc5c6dcaef6d1e149c Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Tue, 4 Aug 2020 15:44:19 -0500
Subject: [PATCH 099/671] MC-35655: Delete customer button is displayed for
 restricted admin user

- Fix customer delete button is displayed for restricted admin
---
 .../Controller/Adminhtml/IndexTest.php        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
index 40c84d8b5db58..e70056be69ba7 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php
@@ -191,6 +191,32 @@ public function testResetPasswordActionSuccess()
         $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'edit'));
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testAclDeleteActionAllow()
+    {
+        $this->getRequest()->setParam('id', 1);
+        $this->dispatch('backend/customer/index/edit');
+        $body = $this->getResponse()->getBody();
+        $this->assertStringContainsString('Delete Customer', $body);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     */
+    public function testAclDeleteActionDeny()
+    {
+        $resource= 'Magento_Customer::delete';
+        $this->_objectManager->get(\Magento\Framework\Acl\Builder::class)
+            ->getAcl()
+            ->deny(null, $resource);
+        $this->getRequest()->setParam('id', 1);
+        $this->dispatch('backend/customer/index/edit');
+        $body = $this->getResponse()->getBody();
+        $this->assertStringNotContainsString('Delete Customer', $body);
+    }
+
     /**
      * Prepare email mock to test emails.
      *

From 2c7a66835c30863a273e8d05cb99f96184c783b8 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Wed, 5 Aug 2020 12:52:53 -0500
Subject: [PATCH 100/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 .../_files/product_for_search_with_hyphen_in_sku.php         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
index 5503ff98078a3..2800af5115825 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
@@ -6,8 +6,6 @@
 
 declare(strict_types=1);
 
-require 'searchable_attribute.php';
-
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
@@ -15,6 +13,9 @@
 use Magento\Catalog\Model\ProductFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/CatalogSearch/_files/searchable_attribute.php');
 
 /** @var ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();

From 4ccc0380fb47c0324f351060742c8aaf8d04f66c Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Wed, 5 Aug 2020 12:54:41 -0500
Subject: [PATCH 101/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 .../Magento/CatalogSearch/Controller/Advanced/ResultTest.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
index 455668e83b518..64444c4ecde21 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
@@ -99,7 +99,7 @@ public function testExecuteSkuWithHyphen(): void
         );
         $this->dispatch('catalogsearch/advanced/result');
         $responseBody = $this->getResponse()->getBody();
-        $this->assertContains('Simple product name', $responseBody);
+        $this->assertStringContainsString('Simple product name', $responseBody);
     }
 
     /**

From 6dc13d8ece81cd15bb4ebb09e22a785c2ff8ae7c Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Wed, 5 Aug 2020 17:36:19 -0500
Subject: [PATCH 102/671] MC-36418: checkout success page, there should be a
 registration form for the guest.

---
 .../Magento/Customer/view/frontend/web/js/customer-data.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
index 8976d0dda4673..8282146959869 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js
@@ -47,9 +47,9 @@ define([
 
         if (new Date($.localStorage.get('mage-cache-timeout')) < new Date()) {
             storage.removeAll();
-            date = new Date(Date.now() + parseInt(invalidateOptions.cookieLifeTime, 10) * 1000);
-            $.localStorage.set('mage-cache-timeout', date);
         }
+        date = new Date(Date.now() + parseInt(invalidateOptions.cookieLifeTime, 10) * 1000);
+        $.localStorage.set('mage-cache-timeout', date);
     };
 
     /**

From 0eeadc38950ac34d0e6e63cf107a94ff4ceafc70 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Thu, 6 Aug 2020 10:15:38 -0500
Subject: [PATCH 103/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 .../_files/product_for_search_with_hyphen_in_sku.php        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
index 2800af5115825..9139fe69738b3 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
@@ -19,6 +20,11 @@
 
 /** @var ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductAttributeRepositoryInterface $productAttributeRepository */
+$productAttributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+$attribute = $productAttributeRepository->get('test_searchable_attribute');
+
 /** @var ProductRepositoryInterface $productRepository */
 $productRepository = $objectManager->get(ProductRepositoryInterface::class);
 /** @var ProductFactory $productFactory */

From 4d3ebd8289dd055f3d3196512a321ac15c04bd47 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 6 Aug 2020 16:38:10 -0500
Subject: [PATCH 104/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../InvoiceItemTypeResolver.php               | 29 -------------------
 .../OrderItemTypeResolver.php                 | 29 -------------------
 .../DownloadableGraphQl/etc/graphql/di.xml    | 19 ++++++++----
 3 files changed, 13 insertions(+), 64 deletions(-)
 delete mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php
 delete mode 100644 app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php
deleted file mode 100644
index 35120e4c0917d..0000000000000
--- a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/InvoiceItemTypeResolver.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
-
-use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-
-/**
- * Leaf for composite class to resolve invoice item type
- */
-class InvoiceItemTypeResolver implements TypeResolverInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function resolveType(array $data): string
-    {
-        if (isset($data['product_type'])) {
-            if ($data['product_type'] == 'downloadable') {
-                return 'DownloadableInvoiceItem';
-            }
-        }
-        return '';
-    }
-}
diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php b/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php
deleted file mode 100644
index 2f835e790d0db..0000000000000
--- a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/OrderItemTypeResolver.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
-
-use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
-
-/**
- * Leaf for composite class to resolve order item type
- */
-class OrderItemTypeResolver implements TypeResolverInterface
-{
-    /**
-     * @inheritDoc
-     */
-    public function resolveType(array $data): string
-    {
-        if (isset($data['product_type'])) {
-            if ($data['product_type'] == 'downloadable') {
-                return 'DownloadableOrderItem';
-            }
-        }
-        return '';
-    }
-}
diff --git a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
index b54d88b0f1ae6..156466175beaa 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/DownloadableGraphQl/etc/graphql/di.xml
@@ -39,17 +39,24 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\OrderItemInterfaceTypeResolverComposite">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\OrderItem">
         <arguments>
-            <argument name="orderItemTypeResolvers" xsi:type="array">
-                <item name="downloadable_order_catalog_item_type_resolver" xsi:type="object">Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem\OrderItemTypeResolver</item>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="downloadable" xsi:type="string">DownloadableOrderItem</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\SalesGraphQl\Model\InvoiceItemInterfaceTypeResolverComposite">
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\InvoiceItem">
         <arguments>
-            <argument name="invoiceItemTypeResolvers" xsi:type="array">
-                <item name="downloadable_invoice_catalog_item_type_resolver" xsi:type="object">Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem\InvoiceItemTypeResolver</item>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="downloadable" xsi:type="string">DownloadableInvoiceItem</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\SalesGraphQl\Model\TypeResolver\CreditMemoItem">
+        <arguments>
+            <argument name="productTypeMap" xsi:type="array">
+                <item name="downloadable" xsi:type="string">DownloadableCreditMemoItem</item>
             </argument>
         </arguments>
     </type>

From fe4b27b6a46810fb456bcfc6202e938eb3e288bc Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 7 Aug 2020 10:12:06 -0500
Subject: [PATCH 105/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../{DownloadableOrderItem => Order/Item}/Links.php    |  2 +-
 .../Magento/DownloadableGraphQl/etc/schema.graphqls    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
 rename app/code/Magento/DownloadableGraphQl/Resolver/{DownloadableOrderItem => Order/Item}/Links.php (97%)

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php b/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
similarity index 97%
rename from app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php
rename to app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
index 97da31a6af912..7fd1f2e3079be 100644
--- a/app/code/Magento/DownloadableGraphQl/Resolver/DownloadableOrderItem/Links.php
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\DownloadableGraphQl\Resolver\DownloadableOrderItem;
+namespace Magento\DownloadableGraphQl\Resolver\Order\Item;
 
 use Magento\Downloadable\Model\ResourceModel\Link\Collection;
 use Magento\Downloadable\Model\ResourceModel\Link\CollectionFactory;
diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 9c9dd438746f0..451e135325720 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -66,7 +66,15 @@ type DownloadableProductSamples @doc(description: "DownloadableProductSamples de
 }
 
 type DownloadableOrderItem implements OrderItemInterface {
-    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are ordered from the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\DownloadableOrderItem\\Links")
+    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are ordered from the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Order\\Item\\Links")
+}
+
+type DownloadableInvoiceItem implements InvoiceItemInterface {
+    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are invoiced from the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Order\\Item\\Links")
+}
+
+type DownloadableCreditMemoItem implements CreditMemoItemInterface {
+    downloadable_links: [DownloadableItemsLinks] @doc(description: "A list of downloadable links that are refunded from the downloadable product") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Order\\Item\\Links")
 }
 
 type DownloadableItemsLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {

From 9c59b3bb0605078937addddff468811b0ffa0e9f Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Fri, 7 Aug 2020 10:16:51 -0500
Subject: [PATCH 106/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 .../Magento/CatalogSearch/Controller/Advanced/ResultTest.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
index 64444c4ecde21..33fac8e670f3d 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php
@@ -70,7 +70,6 @@ public function testExecute(array $searchParams): void
     /**
      * Advanced search test by difference product attributes.
      *
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch7
      * @magentoAppArea frontend
      * @magentoDataFixture Magento/CatalogSearch/_files/product_for_search_with_hyphen_in_sku.php
      * @magentoDataFixture Magento/CatalogSearch/_files/full_reindex.php

From c4519d0c3557264b95507e0ac5bc3224bcebc588 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Fri, 7 Aug 2020 10:32:07 -0500
Subject: [PATCH 107/671] MC-32659: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- added fixtures for downloadable product
---
 ...rieveOrdersWithDownloadableProductTest.php |  9 +-
 ...wnloadable_product_with_multiple_links.php | 88 +++++++++++++++++++
 ...e_product_with_multiple_links_rollback.php | 39 ++++++++
 3 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index 143e0bb1cddb6..f89559f2c4464 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -75,7 +75,14 @@ public function testGetCustomerOrdersDownloadableProduct()
                     'uid'=> base64_encode("downloadable/{$linkId}")
                 ]
             ];
-        $this->assertResponseFields($expectedDownloadableLinksData,$downloadableLinksFromResponse);
+        $this->assertResponseFields($expectedDownloadableLinksData, $downloadableLinksFromResponse);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
+     */
+    public function testGetCustomerOrdersDownloadableWithmultiplelinks()
+    {
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
new file mode 100644
index 0000000000000..b80fa4fc93704
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Customer\Model\CustomerRegistry;
+use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Downloadable\Model\Product\Type;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\Order\AddressFactory;
+use Magento\Sales\Model\Order\ItemFactory;
+use Magento\Sales\Model\Order\PaymentFactory;
+use Magento\Sales\Model\OrderFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+
+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
+$objectManager = Bootstrap::getObjectManager();
+/** @var CustomerRegistry $customerRegistry */
+$customerRegistry = $objectManager->create(CustomerRegistry::class);
+$customer = $customerRegistry->retrieve(1);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+/** @var AddressFactory $addressFactory */
+$addressFactory = $objectManager->get(AddressFactory::class);
+$billingAddress = $addressFactory->create(['data' => $addressData]);
+$billingAddress->setAddressType(Address::TYPE_BILLING);
+/** @var ItemFactory $orderItemFactory */
+$orderItemFactory = $objectManager->get(ItemFactory::class);
+/** @var PaymentFactory $orderPaymentFactory */
+$orderPaymentFactory = $objectManager->get(PaymentFactory::class);
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+/** @var OrderFactory $orderFactory */
+$orderFactory = $objectManager->get(OrderFactory::class);
+
+$payment = $orderPaymentFactory->create();
+$payment->setMethod('checkmo')
+    ->setAdditionalInformation('last_trans_id', '11122')
+    ->setAdditionalInformation(
+        'metadata',
+        ['type' => 'free', 'fraudulent' => false]
+    );
+/** @var ProductInterface $product */
+$product = $productRepository->get('downloadable-product');
+/** @var LinkInterface $links */
+$links = $product->getExtensionAttributes()->getDownloadableProductLinks();
+$link = reset($links);
+
+$orderItem = $orderItemFactory->create();
+$orderItem->setProductId($product->getId())
+    ->setQtyOrdered(1)
+    ->setBasePrice($product->getPrice())
+    ->setProductOptions(['links' => [$link->getId()]])
+    ->setPrice($product->getPrice())
+    ->setRowTotal($product->getPrice())
+    ->setProductType(Type::TYPE_DOWNLOADABLE)
+    ->setName($product->getName())
+    ->setSku($product->getSku());
+
+$order = $orderFactory->create();
+$order->setIncrementId('100000002')
+    ->setState(Order::STATE_PROCESSING)
+    ->setStatus($order->getConfig()->getStateDefaultStatus(Order::STATE_PROCESSING))
+    ->setSubtotal(100)
+    ->setGrandTotal(100)
+    ->setBaseSubtotal(100)
+    ->setBaseGrandTotal(100)
+    ->setCustomerId($customer->getId())
+    ->setCustomerEmail($customer->getEmail())
+    ->setBillingAddress($billingAddress)
+    ->setStoreId($storeManager->getStore()->getId())
+    ->addItem($orderItem)
+    ->setPayment($payment);
+
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
new file mode 100644
index 0000000000000..a15aa0cf57dbb
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\OrderFactory;
+use Magento\TestFramework\Downloadable\Model\RemoveLinkPurchasedByOrderIncrementId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var RemoveLinkPurchasedByOrderIncrementId $removeLinkPurchasedByOrderIncrementId */
+$removeLinkPurchasedByOrderIncrementId = $objectManager->get(RemoveLinkPurchasedByOrderIncrementId::class);
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+$orderIncrementIdToDelete = '100000002';
+$removeLinkPurchasedByOrderIncrementId->execute($orderIncrementIdToDelete);
+/** @var OrderFactory $order */
+$order = $objectManager->get(OrderFactory::class)->create();
+$order->loadByIncrementId($orderIncrementIdToDelete);
+
+if ($order->getId()) {
+    $orderRepository->delete($order);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 536a728213fd4a36634dd958bbde243fe9154734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Fri, 7 Aug 2020 18:56:25 +0200
Subject: [PATCH 108/671] Fix #24091 - reduce amount of js code needed to set
 options for configurable product on wishlist

---
 .../view/frontend/web/js/add-to-wishlist.js   | 66 ++++++-------------
 1 file changed, 21 insertions(+), 45 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 1cdad4953b3c2..727a9751cc2f6 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -19,7 +19,6 @@ define([
             qtyInfo: '#qty',
             actionElement: '[data-action="add-to-wishlist"]',
             productListItem: '.item.product-item',
-            productListPriceBox: '.price-box',
             isProductList: false
         },
 
@@ -68,16 +67,25 @@ define([
         _updateWishlistData: function (event) {
             var dataToAdd = {},
                 isFileUploaded = false,
-                productId = null,
+                productItem = null,
+                handleObjSelector = null,
                 self = this;
 
             if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
-                this._updateAddToWishlistButton({});
+                this._updateAddToWishlistButton({}, productItem);
                 event.stopPropagation();
 
                 return;
             }
-            $(event.handleObj.selector).each(function (index, element) {
+
+            if (this.options.isProductList) {
+                productItem = $(event.target).closest(this.options.productListItem);
+                handleObjSelector = productItem.find(event.handleObj.selector);
+            } else {
+                handleObjSelector = $(event.handleObj.selector);
+            }
+
+            handleObjSelector.each(function (index, element) {
                 if ($(element).is('input[type=text]') ||
                     $(element).is('input[type=email]') ||
                     $(element).is('input[type=number]') ||
@@ -87,19 +95,7 @@ define([
                     $(element).is('textarea') ||
                     $('#' + element.id + ' option:selected').length
                 ) {
-                    if (!($(element).data('selector') || $(element).attr('name'))) {
-                        return;
-                    }
-
-                    if (self.options.isProductList) {
-                        productId = self.retrieveListProductId(this);
-
-                        dataToAdd[productId] = $.extend(
-                            {},
-                            dataToAdd[productId] ? dataToAdd[productId] : {},
-                            self._getElementData(element)
-                        );
-                    } else {
+                    if ($(element).data('selector') || $(element).attr('name')) {
                         dataToAdd = $.extend({}, dataToAdd, self._getElementData(element));
                     }
 
@@ -114,26 +110,21 @@ define([
             if (isFileUploaded) {
                 this.bindFormSubmit();
             }
-            this._updateAddToWishlistButton(dataToAdd);
+            this._updateAddToWishlistButton(dataToAdd, productItem);
             event.stopPropagation();
         },
 
         /**
          * @param {Object} dataToAdd
+         * @param {Object} productItem
          * @private
          */
-        _updateAddToWishlistButton: function (dataToAdd) {
-            var productId = null,
-                self = this;
+        _updateAddToWishlistButton: function (dataToAdd, productItem) {
+            var self = this,
+                buttons = productItem ? productItem.find(this.options.actionElement) : $(this.options.actionElement);
 
-            $('[data-action="add-to-wishlist"]').each(function (index, element) {
-                var params = $(element).data('post'),
-                    dataToAddObj = dataToAdd;
-
-                if (self.options.isProductList) {
-                    productId = self.retrieveListProductId(element);
-                    dataToAddObj = typeof dataToAdd[productId] !== 'undefined' ? dataToAdd[productId] : {};
-                }
+            buttons.each(function (index, element) {
+                var params = $(element).data('post');
 
                 if (!params) {
                     params = {
@@ -141,7 +132,7 @@ define([
                     };
                 }
 
-                params.data = $.extend({}, params.data, dataToAddObj, {
+                params.data = $.extend({}, params.data, dataToAdd, {
                     'qty': $(self.options.qtyInfo).val()
                 });
                 $(element).data('post', params);
@@ -264,21 +255,6 @@ define([
 
                 return;
             }
-        },
-
-        /**
-         * Retrieve product id from element on products list
-         *
-         * @param {jQuery.Object} element
-         * @private
-         */
-        retrieveListProductId: function (element) {
-            return parseInt(
-                $(element).closest(this.options.productListItem)
-                    .find(this.options.productListPriceBox)
-                    .data('product-id'),
-                10
-            );
         }
     });
 

From 4bc3b49b55435e96b922e60d28d0b229222f5c78 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Fri, 7 Aug 2020 14:10:16 -0500
Subject: [PATCH 109/671] MC-36064: Protect payment related web APIs by CAPTCHA

---
 .../Model/CompositeUserContext.php            |   6 +-
 .../Magento/Captcha/Model/DefaultModel.php    |  21 +-
 .../Observer/CaptchaStringResolver.php        |  13 +-
 .../Captcha/Test/Unit/Model/DefaultTest.php   |  30 ++-
 app/code/Magento/Captcha/composer.json        |   1 +
 app/code/Magento/Captcha/i18n/en_US.csv       |   1 +
 ...ntProcessingRateLimitExceededException.php |  19 ++
 .../PaymentProcessingRateLimiterInterface.php |  25 +++
 .../CaptchaPaymentProcessingRateLimiter.php   | 123 ++++++++++++
 .../GuestPaymentInformationManagement.php     |  15 +-
 .../Model/PaymentCaptchaConfigProvider.php    |  88 +++++++++
 .../Model/PaymentInformationManagement.php    |  19 +-
 .../GuestPaymentInformationManagementTest.php | 117 ++++++++---
 .../PaymentInformationManagementTest.php      | 124 ++++++++----
 app/code/Magento/Checkout/composer.json       |   3 +-
 app/code/Magento/Checkout/etc/config.xml      |   4 +
 app/code/Magento/Checkout/etc/di.xml          |   2 +
 app/code/Magento/Checkout/etc/frontend/di.xml |   8 +
 .../frontend/layout/checkout_index_index.xml  |   6 +
 .../set-payment-information-extended.js       |  17 +-
 .../web/js/model/payment/place-order-hooks.js |  13 ++
 .../web/js/model/payment/set-payment-hooks.js |  13 ++
 .../view/frontend/web/js/model/place-order.js |  16 +-
 .../web/js/view/checkout/placeOrderCaptcha.js |  38 ++++
 .../web/js/view/checkout/setPaymentCaptcha.js |  38 ++++
 .../view/frontend/web/template/payment.html   |   4 +
 .../Multishipping/Block/Checkout/Overview.php |  16 ++
 .../Controller/Checkout/OverviewPost.php      |  32 +--
 app/code/Magento/Multishipping/composer.json  |   3 +-
 .../templates/checkout/overview.phtml         |   1 +
 .../Model/Cart/SetPaymentMethodOnCart.php     |  22 ++-
 .../Model/Cart/SetPaymentMethodOnCartTest.php |  61 ++++++
 ...aptchaPaymentProcessingRateLimiterTest.php | 185 ++++++++++++++++++
 .../set-payment-information-extended.test.js  |   3 +-
 lib/web/mage/storage.js                       |  28 ++-
 35 files changed, 1000 insertions(+), 115 deletions(-)
 create mode 100644 app/code/Magento/Checkout/Api/Exception/PaymentProcessingRateLimitExceededException.php
 create mode 100644 app/code/Magento/Checkout/Api/PaymentProcessingRateLimiterInterface.php
 create mode 100644 app/code/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiter.php
 create mode 100644 app/code/Magento/Checkout/Model/PaymentCaptchaConfigProvider.php
 create mode 100644 app/code/Magento/Checkout/view/frontend/web/js/model/payment/place-order-hooks.js
 create mode 100644 app/code/Magento/Checkout/view/frontend/web/js/model/payment/set-payment-hooks.js
 create mode 100644 app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js
 create mode 100644 app/code/Magento/Checkout/view/frontend/web/js/view/checkout/setPaymentCaptcha.js
 create mode 100644 app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiterTest.php

diff --git a/app/code/Magento/Authorization/Model/CompositeUserContext.php b/app/code/Magento/Authorization/Model/CompositeUserContext.php
index 7678b7e639e13..9a6be4d96ef1c 100644
--- a/app/code/Magento/Authorization/Model/CompositeUserContext.php
+++ b/app/code/Magento/Authorization/Model/CompositeUserContext.php
@@ -56,7 +56,7 @@ protected function add(UserContextInterface $userContext)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getUserId()
     {
@@ -64,7 +64,7 @@ public function getUserId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getUserType()
     {
@@ -78,7 +78,7 @@ public function getUserType()
      */
     protected function getUserContext()
     {
-        if ($this->chosenUserContext === null) {
+        if (!$this->chosenUserContext) {
             /** @var UserContextInterface $userContext */
             foreach ($this->userContexts as $userContext) {
                 if ($userContext->getUserType() && $userContext->getUserId() !== null) {
diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
index 0bb46b53c42d3..cf6950ffe8205 100644
--- a/app/code/Magento/Captcha/Model/DefaultModel.php
+++ b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -7,7 +7,9 @@
 
 namespace Magento\Captcha\Model;
 
+use Magento\Authorization\Model\UserContextInterface;
 use Magento\Captcha\Helper\Data;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Math\Random;
 
 /**
@@ -93,12 +95,18 @@ class DefaultModel extends \Laminas\Captcha\Image implements \Magento\Captcha\Mo
      */
     private $randomMath;
 
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
     /**
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Captcha\Helper\Data $captchaData
      * @param ResourceModel\LogFactory $resLogFactory
      * @param string $formId
      * @param Random $randomMath
+     * @param UserContextInterface|null $userContext
      * @throws \Laminas\Captcha\Exception\ExtensionNotLoadedException
      */
     public function __construct(
@@ -106,14 +114,16 @@ public function __construct(
         \Magento\Captcha\Helper\Data $captchaData,
         \Magento\Captcha\Model\ResourceModel\LogFactory $resLogFactory,
         $formId,
-        Random $randomMath = null
+        Random $randomMath = null,
+        ?UserContextInterface $userContext = null
     ) {
         parent::__construct();
         $this->session = $session;
         $this->captchaData = $captchaData;
         $this->resLogFactory = $resLogFactory;
         $this->formId = $formId;
-        $this->randomMath = $randomMath ?? \Magento\Framework\App\ObjectManager::getInstance()->get(Random::class);
+        $this->randomMath = $randomMath ?? ObjectManager::getInstance()->get(Random::class);
+        $this->userContext = $userContext ?? ObjectManager::getInstance()->get(UserContextInterface::class);
     }
 
     /**
@@ -152,6 +162,7 @@ public function isRequired($login = null)
                 $this->formId,
                 $this->getTargetForms()
             )
+            || $this->userContext->getUserType() === UserContextInterface::USER_TYPE_INTEGRATION
         ) {
             return false;
         }
@@ -241,7 +252,7 @@ private function isOverLimitLoginAttempts($login)
      */
     private function isUserAuth()
     {
-        return $this->session->isLoggedIn();
+        return $this->session->isLoggedIn() || $this->userContext->getUserId();
     }
 
     /**
@@ -427,7 +438,7 @@ public function getWordLen()
             $to = self::DEFAULT_WORD_LENGTH_TO;
         }
 
-        return \Magento\Framework\Math\Random::getRandomNumber($from, $to);
+        return Random::getRandomNumber($from, $to);
     }
 
     /**
@@ -549,7 +560,7 @@ private function clearWord()
      */
     protected function randomSize()
     {
-        return \Magento\Framework\Math\Random::getRandomNumber(280, 300) / 100;
+        return Random::getRandomNumber(280, 300) / 100;
     }
 
     /**
diff --git a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
index d83abc7a6c7d1..059d395f6cf73 100644
--- a/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
+++ b/app/code/Magento/Captcha/Observer/CaptchaStringResolver.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Captcha\Observer;
 
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
 
 /**
  * Extract given captcha word.
@@ -22,12 +26,13 @@ class CaptchaStringResolver
      */
     public function resolve(RequestInterface $request, $formId)
     {
-        $captchaParams = $request->getPost(\Magento\Captcha\Helper\Data::INPUT_NAME_FIELD_VALUE);
+        $value = '';
+        $captchaParams = $request->getPost(CaptchaHelper::INPUT_NAME_FIELD_VALUE);
         if (!empty($captchaParams) && !empty($captchaParams[$formId])) {
             $value = $captchaParams[$formId];
-        } else {
-            //For Web APIs
-            $value = $request->getHeader('X-Captcha');
+        } elseif ($headerValue = $request->getHeader('X-Captcha')) {
+            //CAPTCHA was provided via header for this XHR/web API request.
+            $value = $headerValue;
         }
 
         return $value;
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
index a20ff898c222e..59399cde99ea8 100644
--- a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
+++ b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Captcha\Test\Unit\Model;
 
+use Magento\Authorization\Model\UserContextInterface;
 use Magento\Captcha\Block\Captcha\DefaultCaptcha;
 use Magento\Captcha\Helper\Data;
 use Magento\Captcha\Model\DefaultModel;
@@ -93,10 +94,15 @@ class DefaultTest extends TestCase
     protected $session;
 
     /**
-     * @var MockObject
+     * @var MockObject|LogFactory
      */
     protected $_resLogFactory;
 
+    /**
+     * @var UserContextInterface|MockObject
+     */
+    private $userContextMock;
+
     /**
      * Sets up the fixture, for example, opens a network connection.
      * This method is called before a test is executed.
@@ -139,11 +145,18 @@ protected function setUp(): void
             $this->_getResourceModelStub()
         );
 
+        $randomMock = $this->createMock(Random::class);
+        $randomMock->method('getRandomString')->willReturn('random-string');
+
+        $this->userContextMock = $this->getMockForAbstractClass(UserContextInterface::class);
+
         $this->_object = new DefaultModel(
             $this->session,
             $this->_getHelperStub(),
             $this->_resLogFactory,
-            'user_create'
+            'user_create',
+            $randomMock,
+            $this->userContextMock
         );
     }
 
@@ -163,6 +176,19 @@ public function testIsRequired()
         $this->assertTrue($this->_object->isRequired());
     }
 
+    /**
+     * Validate that CAPTCHA is disabled for integrations.
+     *
+     * @return void
+     */
+    public function testIsRequiredForIntegration(): void
+    {
+        $this->userContextMock->method('getUserType')->willReturn(UserContextInterface::USER_TYPE_INTEGRATION);
+        $this->userContextMock->method('getUserId')->willReturn(1);
+
+        $this->assertFalse($this->_object->isRequired());
+    }
+
     /**
      * @covers \Magento\Captcha\Model\DefaultModel::isCaseSensitive
      */
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index a6ee83d3f0924..3c3aa58c3fe2f 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -11,6 +11,7 @@
         "magento/module-checkout": "*",
         "magento/module-customer": "*",
         "magento/module-store": "*",
+        "magento/module-authorization": "*",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-db": "^2.8.2",
         "laminas/laminas-session": "^2.7.3"
diff --git a/app/code/Magento/Captcha/i18n/en_US.csv b/app/code/Magento/Captcha/i18n/en_US.csv
index 480107df8adfe..ac6a7cf9d57e7 100644
--- a/app/code/Magento/Captcha/i18n/en_US.csv
+++ b/app/code/Magento/Captcha/i18n/en_US.csv
@@ -9,6 +9,7 @@ Always,Always
 "Reload captcha","Reload captcha"
 "Please type the letters and numbers below","Please type the letters and numbers below"
 "Attention: Captcha is case sensitive.","Attention: Captcha is case sensitive."
+"Please provide CAPTCHA code and try again","Please provide CAPTCHA code and try again"
 CAPTCHA,CAPTCHA
 "Enable CAPTCHA in Admin","Enable CAPTCHA in Admin"
 Font,Font
diff --git a/app/code/Magento/Checkout/Api/Exception/PaymentProcessingRateLimitExceededException.php b/app/code/Magento/Checkout/Api/Exception/PaymentProcessingRateLimitExceededException.php
new file mode 100644
index 0000000000000..e398bf400391b
--- /dev/null
+++ b/app/code/Magento/Checkout/Api/Exception/PaymentProcessingRateLimitExceededException.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api\Exception;
+
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Thrown when too many payment processing requests have been initiated by a user.
+ */
+class PaymentProcessingRateLimitExceededException extends LocalizedException
+{
+
+}
diff --git a/app/code/Magento/Checkout/Api/PaymentProcessingRateLimiterInterface.php b/app/code/Magento/Checkout/Api/PaymentProcessingRateLimiterInterface.php
new file mode 100644
index 0000000000000..d81b79fc8e201
--- /dev/null
+++ b/app/code/Magento/Checkout/Api/PaymentProcessingRateLimiterInterface.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Api;
+
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+
+/**
+ * Limits number of times a user can initiate payment processing.
+ */
+interface PaymentProcessingRateLimiterInterface
+{
+    /**
+     * Limit an attempt to initiate a new payment processing.
+     *
+     * @return void
+     * @throws PaymentProcessingRateLimitExceededException
+     */
+    public function limit(): void;
+}
diff --git a/app/code/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiter.php b/app/code/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiter.php
new file mode 100644
index 0000000000000..6f71423acbcaa
--- /dev/null
+++ b/app/code/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiter.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model;
+
+use Magento\Authorization\Model\UserContextInterface;
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Captcha\Model\DefaultModel as Captcha;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Captcha\Observer\CaptchaStringResolver as CaptchaResolver;
+use Magento\Framework\App\RequestInterface;
+
+/**
+ * Utilize CAPTCHA as a rate-limiting mechanism.
+ */
+class CaptchaPaymentProcessingRateLimiter implements PaymentProcessingRateLimiterInterface
+{
+    public const CAPTCHA_FORM = 'payment_processing_request';
+
+    /**
+     * @var UserContextInterface
+     */
+    private $userContext;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var CaptchaResolver
+     */
+    private $captchaResolver;
+
+    /**
+     * CaptchaPaymentProcessingRateLimiter constructor.
+     *
+     * @param UserContextInterface $userContext
+     * @param CustomerRepositoryInterface $customerRepo
+     * @param CaptchaHelper $captchaHelper
+     * @param RequestInterface $request
+     * @param CaptchaResolver $captchaResolver
+     */
+    public function __construct(
+        UserContextInterface $userContext,
+        CustomerRepositoryInterface $customerRepo,
+        CaptchaHelper $captchaHelper,
+        RequestInterface $request,
+        CaptchaResolver $captchaResolver
+    ) {
+        $this->userContext = $userContext;
+        $this->customerRepo = $customerRepo;
+        $this->captchaHelper = $captchaHelper;
+        $this->request = $request;
+        $this->captchaResolver = $captchaResolver;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function limit(): void
+    {
+        if ($this->userContext->getUserType() !== UserContextInterface::USER_TYPE_GUEST
+            && $this->userContext->getUserType() !== UserContextInterface::USER_TYPE_CUSTOMER
+            && $this->userContext->getUserType() !== null
+        ) {
+            return;
+        }
+
+        $login = $this->retrieveLogin();
+        /** @var Captcha $captcha */
+        $captcha = $this->captchaHelper->getCaptcha(self::CAPTCHA_FORM);
+        /** @var PaymentProcessingRateLimitExceededException|null $exception */
+        $exception = null;
+        if ($captcha->isRequired($login)) {
+            $value = $this->captchaResolver->resolve($this->request, self::CAPTCHA_FORM);
+            if ($value && !$captcha->isCorrect($value)) {
+                $exception = new PaymentProcessingRateLimitExceededException(__('Incorrect CAPTCHA'));
+            } elseif (!$value) {
+                $exception = new PaymentProcessingRateLimitExceededException(
+                    __('Please provide CAPTCHA code and try again')
+                );
+            }
+        }
+
+        $captcha->logAttempt($login);
+        if ($exception) {
+            throw $exception;
+        }
+    }
+
+    /**
+     * Retrieve current user login.
+     *
+     * @return string|null
+     */
+    private function retrieveLogin(): ?string
+    {
+        $login = null;
+        if ($this->userContext->getUserId()) {
+            $login = $this->customerRepo->getById($this->userContext->getUserId())->getEmail();
+        }
+
+        return $login;
+    }
+}
diff --git a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
index 8b8d2602fbfc7..2b2824213df79 100644
--- a/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/GuestPaymentInformationManagement.php
@@ -7,8 +7,8 @@
 
 namespace Magento\Checkout\Model;
 
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
 use Magento\Framework\App\ObjectManager;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Quote\Model\Quote;
@@ -56,6 +56,11 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
      */
     private $logger;
 
+    /**
+     * @var PaymentProcessingRateLimiterInterface
+     */
+    private $paymentsRateLimiter;
+
     /**
      * @param \Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement
      * @param \Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement
@@ -63,6 +68,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
      * @param \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationManagement
      * @param \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory
      * @param CartRepositoryInterface $cartRepository
+     * @param PaymentProcessingRateLimiterInterface|null $paymentsRateLimiter
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -71,7 +77,8 @@ public function __construct(
         \Magento\Quote\Api\GuestCartManagementInterface $cartManagement,
         \Magento\Checkout\Api\PaymentInformationManagementInterface $paymentInformationManagement,
         \Magento\Quote\Model\QuoteIdMaskFactory $quoteIdMaskFactory,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        ?PaymentProcessingRateLimiterInterface $paymentsRateLimiter = null
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
@@ -79,6 +86,8 @@ public function __construct(
         $this->paymentInformationManagement = $paymentInformationManagement;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
         $this->cartRepository = $cartRepository;
+        $this->paymentsRateLimiter = $paymentsRateLimiter
+            ?? ObjectManager::getInstance()->get(PaymentProcessingRateLimiterInterface::class);
     }
 
     /**
@@ -121,6 +130,8 @@ public function savePaymentInformation(
         \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
         \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
     ) {
+        $this->paymentsRateLimiter->limit();
+
         $quoteIdMask = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id');
         /** @var Quote $quote */
         $quote = $this->cartRepository->getActive($quoteIdMask->getQuoteId());
diff --git a/app/code/Magento/Checkout/Model/PaymentCaptchaConfigProvider.php b/app/code/Magento/Checkout/Model/PaymentCaptchaConfigProvider.php
new file mode 100644
index 0000000000000..268e765571205
--- /dev/null
+++ b/app/code/Magento/Checkout/Model/PaymentCaptchaConfigProvider.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model;
+
+use Magento\Captcha\Helper\Data as Helper;
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Customer\Model\Session as CustomerSession;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Provides frontend with payments CAPTCHA configuration.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class PaymentCaptchaConfigProvider implements ConfigProviderInterface
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var Helper
+     */
+    private $captchaData;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param Helper $captchaData
+     * @param CustomerSession $customerSession
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        Helper $captchaData,
+        CustomerSession $customerSession
+    ) {
+        $this->storeManager = $storeManager;
+        $this->captchaData = $captchaData;
+        $this->customerSession = $customerSession;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getConfig()
+    {
+        /** @var Store $store */
+        $store = $this->storeManager->getStore();
+        /** @var DefaultModel $captchaModel */
+        $captchaModel = $this->captchaData->getCaptcha(CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM);
+        $login = null;
+        if ($this->customerSession->isLoggedIn()) {
+            $login = $this->customerSession->getCustomerData()->getEmail();
+        }
+        $required =  $captchaModel->isRequired($login);
+        if ($required) {
+            $captchaModel->generate();
+            $imageSrc = $captchaModel->getImgSrc();
+        } else {
+            $imageSrc = '';
+        }
+
+        return [
+            'captcha' => [
+                CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM => [
+                    'isCaseSensitive' => (bool)$captchaModel->isCaseSensitive(),
+                    'imageHeight' => $captchaModel->getHeight(),
+                    'imageSrc' => $imageSrc,
+                    'refreshUrl' => $store->getUrl('captcha/refresh', ['_secure' => $store->isCurrentlySecure()]),
+                    'isRequired' => $required,
+                    'timestamp' => time()
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
index 2f68aba5ec6ae..a6e448ecdb87e 100644
--- a/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
+++ b/app/code/Magento/Checkout/Model/PaymentInformationManagement.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Checkout\Model;
 
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 
 /**
@@ -51,12 +53,18 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
      */
     private $cartRepository;
 
+    /**
+     * @var PaymentProcessingRateLimiterInterface
+     */
+    private $paymentRateLimiter;
+
     /**
      * @param \Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement
      * @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
      * @param \Magento\Quote\Api\CartManagementInterface $cartManagement
      * @param PaymentDetailsFactory $paymentDetailsFactory
      * @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
+     * @param PaymentProcessingRateLimiterInterface|null $paymentRateLimiter
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -64,13 +72,16 @@ public function __construct(
         \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
         \Magento\Quote\Api\CartManagementInterface $cartManagement,
         \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory,
-        \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
+        \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository,
+        ?PaymentProcessingRateLimiterInterface $paymentRateLimiter = null
     ) {
         $this->billingAddressManagement = $billingAddressManagement;
         $this->paymentMethodManagement = $paymentMethodManagement;
         $this->cartManagement = $cartManagement;
         $this->paymentDetailsFactory = $paymentDetailsFactory;
         $this->cartTotalsRepository = $cartTotalsRepository;
+        $this->paymentRateLimiter = $paymentRateLimiter
+            ?? ObjectManager::getInstance()->get(PaymentProcessingRateLimiterInterface::class);
     }
 
     /**
@@ -110,6 +121,8 @@ public function savePaymentInformation(
         \Magento\Quote\Api\Data\PaymentInterface $paymentMethod,
         \Magento\Quote\Api\Data\AddressInterface $billingAddress = null
     ) {
+        $this->paymentRateLimiter->limit();
+
         if ($billingAddress) {
             /** @var \Magento\Quote\Api\CartRepositoryInterface $quoteRepository */
             $quoteRepository = $this->getCartRepository();
@@ -157,7 +170,7 @@ public function getPaymentInformation($cartId)
     private function getLogger()
     {
         if (!$this->logger) {
-            $this->logger = \Magento\Framework\App\ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
+            $this->logger = ObjectManager::getInstance()->get(\Psr\Log\LoggerInterface::class);
         }
         return $this->logger;
     }
@@ -171,7 +184,7 @@ private function getLogger()
     private function getCartRepository()
     {
         if (!$this->cartRepository) {
-            $this->cartRepository = \Magento\Framework\App\ObjectManager::getInstance()
+            $this->cartRepository = ObjectManager::getInstance()
                 ->get(\Magento\Quote\Api\CartRepositoryInterface::class);
         }
         return $this->cartRepository;
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
index f3edcfe8986f0..4a89443f02f6d 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/GuestPaymentInformationManagementTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Checkout\Test\Unit\Model;
 
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
 use Magento\Checkout\Model\GuestPaymentInformationManagement;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
@@ -67,6 +69,11 @@ class GuestPaymentInformationManagementTest extends TestCase
      */
     private $loggerMock;
 
+    /**
+     * @var PaymentProcessingRateLimiterInterface|MockObject
+     */
+    private $limiterMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -84,6 +91,7 @@ protected function setUp(): void
             ['create']
         );
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->limiterMock = $this->getMockForAbstractClass(PaymentProcessingRateLimiterInterface::class);
         $this->model = $objectManager->getObject(
             GuestPaymentInformationManagement::class,
             [
@@ -91,7 +99,8 @@ protected function setUp(): void
                 'paymentMethodManagement' => $this->paymentMethodManagementMock,
                 'cartManagement' => $this->cartManagementMock,
                 'cartRepository' => $this->cartRepositoryMock,
-                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock
+                'quoteIdMaskFactory' => $this->quoteIdMaskFactoryMock,
+                'paymentsRateLimiter' => $this->limiterMock
             ]
         );
         $objectManager->setBackwardCompatibleProperty($this->model, 'logger', $this->loggerMock);
@@ -99,22 +108,21 @@ protected function setUp(): void
 
     public function testSavePaymentInformationAndPlaceOrder()
     {
-        $cartId = 100;
         $orderId = 200;
-        $email = 'email@magento.com';
-        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
-        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
-        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
-
-        $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
-
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-        $this->cartManagementMock->expects($this->once())->method('placeOrder')->with($cartId)->willReturn($orderId);
+        $this->assertEquals($orderId, $this->placeOrder($orderId));
+    }
 
-        $this->assertEquals(
-            $orderId,
-            $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock)
-        );
+    /**
+     * Validate that "testSavePaymentInformationAndPlaceOrderLimited" calls are limited.
+     *
+     * @return void
+     */
+    public function testSavePaymentInformationAndPlaceOrderLimited(): void
+    {
+        $this->expectException(PaymentProcessingRateLimitExceededException::class);
+        $this->limiterMock->method('limit')
+            ->willThrowException(new PaymentProcessingRateLimitExceededException(__('Error')));
+        $this->placeOrder();
     }
 
     public function testSavePaymentInformationAndPlaceOrderException()
@@ -141,16 +149,21 @@ public function testSavePaymentInformationAndPlaceOrderException()
 
     public function testSavePaymentInformation()
     {
-        $cartId = 100;
-        $email = 'email@magento.com';
-        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
-        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
-        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
-        $billingAddressMock->expects($this->once())->method('setEmail')->with($email)->willReturnSelf();
+        $this->assertTrue($this->savePayment());
+    }
 
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+    /**
+     * Validate that this method is rate-limited.
+     *
+     * @return void
+     */
+    public function testSavePaymentInformationLimited(): void
+    {
+        $this->expectException(PaymentProcessingRateLimitExceededException::class);
+        $this->limiterMock->method('limit')
+            ->willThrowException(new PaymentProcessingRateLimitExceededException(__('Error')));
 
-        $this->assertTrue($this->model->savePaymentInformation($cartId, $email, $paymentMock, $billingAddressMock));
+        $this->savePayment();
     }
 
     public function testSavePaymentInformationWithoutBillingAddress()
@@ -246,31 +259,75 @@ private function getMockForAssignBillingAddress(
         $this->cartRepositoryMock->method('getActive')
             ->with($cartId)
             ->willReturn($quote);
-        $quote->expects($this->once())
+        $quote->expects($this->any())
             ->method('getBillingAddress')
             ->willReturn($quoteBillingAddress);
-        $quote->expects($this->once())
+        $quote->expects($this->any())
             ->method('getShippingAddress')
             ->willReturn($quoteShippingAddress);
-        $quoteBillingAddress->expects($this->once())
+        $quoteBillingAddress->expects($this->any())
             ->method('getId')
             ->willReturn($billingAddressId);
-        $quote->expects($this->once())
+        $quote->expects($this->any())
             ->method('removeAddress')
             ->with($billingAddressId);
-        $quote->expects($this->once())
+        $quote->expects($this->any())
             ->method('setBillingAddress')
             ->with($billingAddressMock);
         $quoteShippingAddress->expects($this->any())
             ->method('getShippingRateByCode')
             ->willReturn($shippingRate);
-        $quote->expects($this->once())
+        $quote->expects($this->any())
             ->method('setDataChanges')
             ->willReturnSelf();
         $quoteShippingAddress->method('getShippingMethod')
             ->willReturn('flatrate_flatrate');
-        $quoteShippingAddress->expects($this->once())
+        $quoteShippingAddress->expects($this->any())
             ->method('setLimitCarrier')
             ->with('flatrate');
     }
+
+    /**
+     * Place order.
+     *
+     * @param int $orderId
+     * @return mixed Method call result.
+     */
+    private function placeOrder(?int $orderId = 200)
+    {
+        $cartId = 100;
+        $email = 'email@magento.com';
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
+
+        $billingAddressMock->expects($this->any())->method('setEmail')->with($email)->willReturnSelf();
+
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
+        $this->cartManagementMock->expects($this->any())
+            ->method('placeOrder')
+            ->with($cartId)
+            ->willReturn($orderId);
+
+        return $this->model->savePaymentInformationAndPlaceOrder($cartId, $email, $paymentMock, $billingAddressMock);
+    }
+
+    /**
+     * Save payment information.
+     *
+     * @return mixed Call result.
+     */
+    private function savePayment()
+    {
+        $cartId = 100;
+        $email = 'email@magento.com';
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
+        $billingAddressMock->expects($this->any())->method('setEmail')->with($email)->willReturnSelf();
+
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
+
+        return $this->model->savePaymentInformation($cartId, $email, $paymentMock, $billingAddressMock);
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
index 75445f23aa887..294857765007e 100644
--- a/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Model/PaymentInformationManagementTest.php
@@ -7,6 +7,8 @@
 
 namespace Magento\Checkout\Test\Unit\Model;
 
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
 use Magento\Checkout\Model\PaymentInformationManagement;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Phrase;
@@ -59,6 +61,11 @@ class PaymentInformationManagementTest extends TestCase
      */
     private $cartRepositoryMock;
 
+    /**
+     * @var PaymentProcessingRateLimiterInterface|MockObject
+     */
+    private $rateLimiterMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -73,12 +80,14 @@ protected function setUp(): void
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->cartRepositoryMock = $this->getMockBuilder(CartRepositoryInterface::class)
             ->getMock();
+        $this->rateLimiterMock = $this->getMockForAbstractClass(PaymentProcessingRateLimiterInterface::class);
         $this->model = $objectManager->getObject(
             PaymentInformationManagement::class,
             [
                 'billingAddressManagement' => $this->billingAddressManagementMock,
                 'paymentMethodManagement' => $this->paymentMethodManagementMock,
-                'cartManagement' => $this->cartManagementMock
+                'cartManagement' => $this->cartManagementMock,
+                'paymentRateLimiter' => $this->rateLimiterMock
             ]
         );
         $objectManager->setBackwardCompatibleProperty($this->model, 'logger', $this->loggerMock);
@@ -87,21 +96,27 @@ protected function setUp(): void
 
     public function testSavePaymentInformationAndPlaceOrder()
     {
-        $cartId = 100;
         $orderId = 200;
-        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
-        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
-
-        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-        $this->cartManagementMock->expects($this->once())->method('placeOrder')->with($cartId)->willReturn($orderId);
-
         $this->assertEquals(
             $orderId,
-            $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock)
+            $this->placeOrder($orderId)
         );
     }
 
+    /**
+     * Valdiate that the method is rate-limited.
+     *
+     * @return void
+     */
+    public function testSavePaymentInformationAndPlaceOrderLimited(): void
+    {
+        $this->rateLimiterMock->method('limit')
+            ->willThrowException(new PaymentProcessingRateLimitExceededException(__('Error')));
+        $this->expectException(PaymentProcessingRateLimitExceededException::class);
+
+        $this->placeOrder();
+    }
+
     public function testSavePaymentInformationAndPlaceOrderException()
     {
         $this->expectException('Magento\Framework\Exception\CouldNotSaveException');
@@ -110,10 +125,10 @@ public function testSavePaymentInformationAndPlaceOrderException()
         $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
 
         $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
         $exception = new \Exception('DB exception');
-        $this->loggerMock->expects($this->once())->method('critical');
-        $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
+        $this->loggerMock->expects($this->any())->method('critical');
+        $this->cartManagementMock->expects($this->any())->method('placeOrder')->willThrowException($exception);
 
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
 
@@ -128,8 +143,8 @@ public function testSavePaymentInformationAndPlaceOrderIfBillingAddressNotExist(
         $orderId = 200;
         $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
 
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-        $this->cartManagementMock->expects($this->once())->method('placeOrder')->with($cartId)->willReturn($orderId);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
+        $this->cartManagementMock->expects($this->any())->method('placeOrder')->with($cartId)->willReturn($orderId);
 
         $this->assertEquals(
             $orderId,
@@ -139,14 +154,21 @@ public function testSavePaymentInformationAndPlaceOrderIfBillingAddressNotExist(
 
     public function testSavePaymentInformation()
     {
-        $cartId = 100;
-        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
-        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+        $this->assertTrue($this->savePayment());
+    }
 
-        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+    /**
+     * Validate that the method is rate-limited.
+     *
+     * @return void
+     */
+    public function testSavePaymentInformationLimited(): void
+    {
+        $this->rateLimiterMock->method('limit')
+            ->willThrowException(new PaymentProcessingRateLimitExceededException(__('Error')));
+        $this->expectException(PaymentProcessingRateLimitExceededException::class);
 
-        $this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock, $billingAddressMock));
+        $this->savePayment();
     }
 
     public function testSavePaymentInformationWithoutBillingAddress()
@@ -154,7 +176,7 @@ public function testSavePaymentInformationWithoutBillingAddress()
         $cartId = 100;
         $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
 
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
 
         $this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock));
     }
@@ -169,10 +191,10 @@ public function testSavePaymentInformationAndPlaceOrderWithLocolizedException()
 
         $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
 
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
         $phrase = new Phrase(__('DB exception'));
         $exception = new LocalizedException($phrase);
-        $this->cartManagementMock->expects($this->once())->method('placeOrder')->willThrowException($exception);
+        $this->cartManagementMock->expects($this->any())->method('placeOrder')->willThrowException($exception);
 
         $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
     }
@@ -197,8 +219,8 @@ public function testSavePaymentInformationAndPlaceOrderWithNewBillingAddress():
         $quoteBillingAddress->method('getId')->willReturn($quoteBillingAddressId);
         $this->cartRepositoryMock->method('getActive')->with($cartId)->willReturn($quoteMock);
 
-        $this->paymentMethodManagementMock->expects($this->once())->method('set')->with($cartId, $paymentMock);
-        $billingAddressMock->expects($this->once())->method('setCustomerId')->with($customerId);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
+        $billingAddressMock->expects($this->any())->method('setCustomerId')->with($customerId);
         $this->assertTrue($this->model->savePaymentInformation($cartId, $paymentMock, $billingAddressMock));
     }
 
@@ -220,14 +242,50 @@ private function getMockForAssignBillingAddress($cartId, $billingAddressMock)
             ->getMock();
         $this->cartRepositoryMock->expects($this->any())->method('getActive')->with($cartId)->willReturn($quoteMock);
         $quoteMock->method('getBillingAddress')->willReturn($quoteBillingAddress);
-        $quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($quoteShippingAddress);
-        $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
-        $quoteBillingAddress->expects($this->once())->method('getId')->willReturn($billingAddressId);
-        $quoteMock->expects($this->once())->method('removeAddress')->with($billingAddressId);
-        $quoteMock->expects($this->once())->method('setBillingAddress')->with($billingAddressMock);
-        $quoteMock->expects($this->once())->method('setDataChanges')->willReturnSelf();
+        $quoteMock->expects($this->any())->method('getShippingAddress')->willReturn($quoteShippingAddress);
+        $quoteBillingAddress->expects($this->any())->method('getId')->willReturn($billingAddressId);
+        $quoteBillingAddress->expects($this->any())->method('getId')->willReturn($billingAddressId);
+        $quoteMock->expects($this->any())->method('removeAddress')->with($billingAddressId);
+        $quoteMock->expects($this->any())->method('setBillingAddress')->with($billingAddressMock);
+        $quoteMock->expects($this->any())->method('setDataChanges')->willReturnSelf();
         $quoteShippingAddress->expects($this->any())->method('getShippingRateByCode')->willReturn($shippingRate);
         $quoteShippingAddress->expects($this->any())->method('getShippingMethod')->willReturn('flatrate_flatrate');
-        $quoteShippingAddress->expects($this->once())->method('setLimitCarrier')->with('flatrate')->willReturnSelf();
+        $quoteShippingAddress->expects($this->any())->method('setLimitCarrier')->with('flatrate')->willReturnSelf();
+    }
+
+    /**
+     * Save payment information.
+     *
+     * @return mixed
+     */
+    private function savePayment()
+    {
+        $cartId = 100;
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
+
+        return $this->model->savePaymentInformation($cartId, $paymentMock, $billingAddressMock);
+    }
+
+    /**
+     * Call `place order`.
+     *
+     * @param int|null $orderId
+     * @return mixed
+     */
+    private function placeOrder(?int $orderId = 200)
+    {
+        $cartId = 100;
+        $paymentMock = $this->getMockForAbstractClass(PaymentInterface::class);
+        $billingAddressMock = $this->getMockForAbstractClass(AddressInterface::class);
+
+        $this->getMockForAssignBillingAddress($cartId, $billingAddressMock);
+        $this->paymentMethodManagementMock->expects($this->any())->method('set')->with($cartId, $paymentMock);
+        $this->cartManagementMock->expects($this->any())->method('placeOrder')->with($cartId)->willReturn($orderId);
+
+        return $this->model->savePaymentInformationAndPlaceOrder($cartId, $paymentMock, $billingAddressMock);
     }
 }
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 2b4fce7dc011a..5f7b5425667e5 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -24,7 +24,8 @@
         "magento/module-tax": "*",
         "magento/module-theme": "*",
         "magento/module-ui": "*",
-        "magento/module-captcha": "*"
+        "magento/module-captcha": "*",
+        "magento/module-authorization": "*"
     },
     "suggest": {
         "magento/module-cookie": "*"
diff --git a/app/code/Magento/Checkout/etc/config.xml b/app/code/Magento/Checkout/etc/config.xml
index 4db5f5bdc01c9..eac0bd849da35 100644
--- a/app/code/Magento/Checkout/etc/config.xml
+++ b/app/code/Magento/Checkout/etc/config.xml
@@ -41,6 +41,9 @@
                     <sales_rule_coupon_request>
                         <label>Applying coupon code</label>
                     </sales_rule_coupon_request>
+                    <payment_processing_request>
+                        <label>Checkout/Placing Order</label>
+                    </payment_processing_request>
                 </areas>
             </frontend>
         </captcha>
@@ -48,6 +51,7 @@
             <captcha>
                 <shown_to_logged_in_user>
                     <sales_rule_coupon_request>1</sales_rule_coupon_request>
+                    <payment_processing_request>1</payment_processing_request>
                 </shown_to_logged_in_user>
             </captcha>
         </customer>
diff --git a/app/code/Magento/Checkout/etc/di.xml b/app/code/Magento/Checkout/etc/di.xml
index 4ebd594a28562..0c1d866dfc2fb 100644
--- a/app/code/Magento/Checkout/etc/di.xml
+++ b/app/code/Magento/Checkout/etc/di.xml
@@ -49,4 +49,6 @@
             </argument>
         </arguments>
     </type>
+    <preference for="Magento\Checkout\Api\PaymentProcessingRateLimiterInterface"
+                type="Magento\Checkout\Model\CaptchaPaymentProcessingRateLimiter" />
 </config>
diff --git a/app/code/Magento/Checkout/etc/frontend/di.xml b/app/code/Magento/Checkout/etc/frontend/di.xml
index 8f35fe9f37abf..1d50ec14c0bba 100644
--- a/app/code/Magento/Checkout/etc/frontend/di.xml
+++ b/app/code/Magento/Checkout/etc/frontend/di.xml
@@ -49,6 +49,7 @@
             <argument name="configProviders" xsi:type="array">
                 <item name="checkout_default_config_provider" xsi:type="object">Magento\Checkout\Model\DefaultConfigProvider</item>
                 <item name="checkout_summary_config_provider" xsi:type="object">Magento\Checkout\Model\Cart\CheckoutSummaryConfigProvider</item>
+                <item name="checkout_payment_provider" xsi:type="object">Magento\Checkout\Model\PaymentCaptchaConfigProvider</item>
             </argument>
         </arguments>
     </type>
@@ -99,4 +100,11 @@
     <type name="Magento\Quote\Model\Quote">
         <plugin name="clear_addresses_after_product_delete" type="Magento\Checkout\Plugin\Model\Quote\ResetQuoteAddresses"/>
     </type>
+    <type name="Magento\Captcha\CustomerData\Captcha">
+        <arguments>
+            <argument name="formIds" xsi:type="array">
+                <item name="payment_processing_request" xsi:type="string">payment_processing_request</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index ab058110fe66f..f087c04d1dfe3 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -287,6 +287,12 @@
                                                                     </item>
                                                                 </item>
                                                             </item>
+                                                            <item name="place-order-captcha" xsi:type="array">
+                                                                <item name="component" xsi:type="string">Magento_Checkout/js/view/checkout/placeOrderCaptcha</item>
+                                                                <item name="displayArea" xsi:type="string">place-order-captcha</item>
+                                                                <item name="formId" xsi:type="string">payment_processing_request</item>
+                                                                <item name="configSource" xsi:type="string">checkoutConfig</item>
+                                                            </item>
                                                             <item name="beforeMethods" xsi:type="array">
                                                                 <item name="component" xsi:type="string">uiComponent</item>
                                                                 <item name="displayArea" xsi:type="string">beforeMethods</item>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
index 9de8a93905c99..ae5b0914e83a6 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
@@ -14,8 +14,9 @@ define([
     'Magento_Customer/js/model/customer',
     'Magento_Checkout/js/action/get-totals',
     'Magento_Checkout/js/model/full-screen-loader',
-    'underscore'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader, _) {
+    'underscore',
+    'Magento_Checkout/js/model/payment/set-payment-hooks'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader, _, hooks) {
     'use strict';
 
     /**
@@ -37,7 +38,8 @@ define([
 
     return function (messageContainer, paymentData, skipBilling) {
         var serviceUrl,
-            payload;
+            payload,
+            headers = {};
 
         paymentData = filterTemplateData(paymentData);
         skipBilling = skipBilling || false;
@@ -64,8 +66,12 @@ define([
 
         fullScreenLoader.startLoader();
 
+        _.each(hooks.requestModifiers, function (modifier) {
+            modifier(headers, payload);
+        });
+
         return storage.post(
-            serviceUrl, JSON.stringify(payload)
+            serviceUrl, JSON.stringify(payload), true, 'application/json', headers
         ).fail(
             function (response) {
                 errorProcessor.process(response, messageContainer);
@@ -73,6 +79,9 @@ define([
         ).always(
             function () {
                 fullScreenLoader.stopLoader();
+                _.each(hooks.afterRequestListeners, function (listener) {
+                    listener();
+                });
             }
         );
     };
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/place-order-hooks.js b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/place-order-hooks.js
new file mode 100644
index 0000000000000..5cd31d85c9a29
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/place-order-hooks.js
@@ -0,0 +1,13 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        requestModifiers: [],
+        afterRequestListeners: []
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/payment/set-payment-hooks.js b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/set-payment-hooks.js
new file mode 100644
index 0000000000000..5cd31d85c9a29
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/payment/set-payment-hooks.js
@@ -0,0 +1,13 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([], function () {
+    'use strict';
+
+    return {
+        requestModifiers: [],
+        afterRequestListeners: []
+    };
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
index c07878fcaea92..701c31944939b 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/place-order.js
@@ -10,16 +10,23 @@ define(
         'mage/storage',
         'Magento_Checkout/js/model/error-processor',
         'Magento_Checkout/js/model/full-screen-loader',
-        'Magento_Customer/js/customer-data'
+        'Magento_Customer/js/customer-data',
+        'Magento_Checkout/js/model/payment/place-order-hooks',
+        'underscore'
     ],
-    function (storage, errorProcessor, fullScreenLoader, customerData) {
+    function (storage, errorProcessor, fullScreenLoader, customerData, hooks, _) {
         'use strict';
 
         return function (serviceUrl, payload, messageContainer) {
+            var headers = {};
+
             fullScreenLoader.startLoader();
+            _.each(hooks.requestModifiers, function (modifier) {
+                modifier(headers, payload);
+            });
 
             return storage.post(
-                serviceUrl, JSON.stringify(payload)
+                serviceUrl, JSON.stringify(payload), true, 'application/json', headers
             ).fail(
                 function (response) {
                     errorProcessor.process(response, messageContainer);
@@ -44,6 +51,9 @@ define(
             ).always(
                 function () {
                     fullScreenLoader.stopLoader();
+                    _.each(hooks.afterRequestListeners, function (listener) {
+                        listener();
+                    });
                 }
             );
         };
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js b/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js
new file mode 100644
index 0000000000000..d0e27ad8e0abb
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/placeOrderCaptcha.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Captcha/js/view/checkout/defaultCaptcha',
+    'Magento_Captcha/js/model/captchaList',
+    'underscore',
+    'Magento_Checkout/js/model/payment/place-order-hooks'
+],
+function (defaultCaptcha, captchaList, _, placeOrderHooks) {
+    'use strict';
+
+    return defaultCaptcha.extend({
+        /** @inheritdoc */
+        initialize: function () {
+            var self = this,
+                currentCaptcha;
+
+            this._super();
+            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+            if (currentCaptcha != null) {
+                currentCaptcha.setIsVisible(true);
+                this.setCurrentCaptcha(currentCaptcha);
+                placeOrderHooks.requestModifiers.push(function (headers) {
+                    if (self.isRequired()) {
+                        headers['X-Captcha'] = self.captchaValue()();
+                    }
+                });
+                placeOrderHooks.afterRequestListeners.push(function () {
+                    self.refresh();
+                });
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/setPaymentCaptcha.js b/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/setPaymentCaptcha.js
new file mode 100644
index 0000000000000..93f3bb8b2a45c
--- /dev/null
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/checkout/setPaymentCaptcha.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Captcha/js/view/checkout/defaultCaptcha',
+    'Magento_Captcha/js/model/captchaList',
+    'underscore',
+    'Magento_Checkout/js/model/payment/set-payment-hooks'
+],
+function (defaultCaptcha, captchaList, _, setPaymentHooks) {
+    'use strict';
+
+    return defaultCaptcha.extend({
+        /** @inheritdoc */
+        initialize: function () {
+            var self = this,
+                currentCaptcha;
+
+            this._super();
+            currentCaptcha = captchaList.getCaptchaByFormId(this.formId);
+
+            if (currentCaptcha != null) {
+                currentCaptcha.setIsVisible(true);
+                this.setCurrentCaptcha(currentCaptcha);
+                setPaymentHooks.requestModifiers.push(function (headers) {
+                    if (self.isRequired()) {
+                        headers['X-Captcha'] = self.captchaValue()();
+                    }
+                });
+                setPaymentHooks.afterRequestListeners.push(function () {
+                    self.refresh();
+                });
+            }
+        }
+    });
+});
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index a3e1a0f7aca90..1e3d3fed3876f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -21,6 +21,10 @@
                 <legend class="legend">
                     <span data-bind="i18n: 'Payment Information'"></span>
                 </legend><br />
+                <!-- ko foreach: getRegion('place-order-captcha') -->
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                <!-- /ko -->
+                <br />
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 1ea2dc2618778..812ada81fac9b 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Multishipping\Block\Checkout;
 
+use Magento\Captcha\Block\Captcha;
+use Magento\Checkout\Model\CaptchaPaymentProcessingRateLimiter;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Quote\Model\Quote\Address;
 use Magento\Checkout\Helper\Data as CheckoutHelper;
@@ -123,6 +125,20 @@ protected function _prepareLayout()
         $this->pageConfig->getTitle()->set(
             __('Review Order - %1', $this->pageConfig->getTitle()->getDefault())
         );
+        if (!$this->getChildBlock('captcha')) {
+            $this->addChild(
+                'captcha',
+                Captcha::class,
+                [
+                    'cacheable' => false,
+                    'after' => '-',
+                    'form_id' => CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM,
+                    'image_width' => 230,
+                    'image_height' => 230
+                ]
+            );
+        }
+
         return parent::_prepareLayout();
     }
 
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index f05a7f43b8118..b3333d828a094 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Multishipping\Controller\Checkout;
 
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Multishipping\Model\Checkout\Type\Multishipping\State;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
@@ -12,14 +15,15 @@
 use Magento\Framework\Session\SessionManagerInterface;
 
 /**
- * Class OverviewPost
+ * Placing orders.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class OverviewPost extends \Magento\Multishipping\Controller\Checkout
+class OverviewPost extends \Magento\Multishipping\Controller\Checkout implements HttpPostActionInterface
 {
     /**
      * @var \Magento\Framework\Data\Form\FormKey\Validator
+     * @deprecated Form key validation is handled on the framework level.
      */
     protected $formKeyValidator;
 
@@ -38,6 +42,11 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      */
     private $session;
 
+    /**
+     * @var PaymentProcessingRateLimiterInterface
+     */
+    private $paymentRateLimiter;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -47,6 +56,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator
      * @param SessionManagerInterface $session
+     * @param PaymentProcessingRateLimiterInterface|null $paymentRateLimiter
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -56,12 +66,15 @@ public function __construct(
         \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Checkout\Api\AgreementsValidatorInterface $agreementValidator,
-        SessionManagerInterface $session
+        SessionManagerInterface $session,
+        ?PaymentProcessingRateLimiterInterface $paymentRateLimiter = null
     ) {
         $this->formKeyValidator = $formKeyValidator;
         $this->logger = $logger;
         $this->agreementsValidator = $agreementValidator;
         $this->session = $session;
+        $this->paymentRateLimiter = $paymentRateLimiter
+            ?? ObjectManager::getInstance()->get(PaymentProcessingRateLimiterInterface::class);
 
         parent::__construct(
             $context,
@@ -79,15 +92,12 @@ public function __construct(
      */
     public function execute()
     {
-        if (!$this->formKeyValidator->validate($this->getRequest())) {
-            $this->_forward('backToAddresses');
-            return;
-        }
-        if (!$this->_validateMinimumAmount()) {
-            return;
-        }
-
         try {
+            $this->paymentRateLimiter->limit();
+            if (!$this->_validateMinimumAmount()) {
+                return;
+            }
+
             if (!$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) {
                 $this->messageManager->addError(
                     __('Please agree to all Terms and Conditions before placing the order.')
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 85f60985fe1b0..8834603562332 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -15,7 +15,8 @@
         "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-tax": "*",
-        "magento/module-theme": "*"
+        "magento/module-theme": "*",
+        "magento/module-captcha": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index 3b72679bfc34e..35032b874374d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -213,6 +213,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
         </div>
         <div class="actions-toolbar" id="review-buttons-container">
             <div class="primary">
+                <?= $block->getChildHtml('captcha') ?>
                 <button type="submit"
                         class="action primary submit"
                         id="review-button"><span><?= $block->escapeHtml(__('Place Order')); ?></span>
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
index 4deb794761efb..81a30216f0035 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -7,6 +7,9 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -18,7 +21,7 @@
 use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
 
 /**
- * Set payment method on cart
+ * Saves related payment method info for a cart.
  */
 class SetPaymentMethodOnCart
 {
@@ -37,19 +40,28 @@ class SetPaymentMethodOnCart
      */
     private $additionalDataProviderPool;
 
+    /**
+     * @var PaymentProcessingRateLimiterInterface
+     */
+    private $paymentRateLimiter;
+
     /**
      * @param PaymentMethodManagementInterface $paymentMethodManagement
      * @param PaymentInterfaceFactory $paymentFactory
      * @param AdditionalDataProviderPool $additionalDataProviderPool
+     * @param PaymentProcessingRateLimiterInterface|null $paymentRateLimiter
      */
     public function __construct(
         PaymentMethodManagementInterface $paymentMethodManagement,
         PaymentInterfaceFactory $paymentFactory,
-        AdditionalDataProviderPool $additionalDataProviderPool
+        AdditionalDataProviderPool $additionalDataProviderPool,
+        ?PaymentProcessingRateLimiterInterface $paymentRateLimiter = null
     ) {
         $this->paymentMethodManagement = $paymentMethodManagement;
         $this->paymentFactory = $paymentFactory;
         $this->additionalDataProviderPool = $additionalDataProviderPool;
+        $this->paymentRateLimiter = $paymentRateLimiter
+            ?? ObjectManager::getInstance()->get(PaymentProcessingRateLimiterInterface::class);
     }
 
     /**
@@ -62,6 +74,12 @@ public function __construct(
      */
     public function execute(Quote $cart, array $paymentData): void
     {
+        try {
+            $this->paymentRateLimiter->limit();
+        } catch (PaymentProcessingRateLimitExceededException $exception) {
+            throw new GraphQlInputException(__($exception->getMessage()), $exception);
+        }
+
         if (!isset($paymentData['code']) || empty($paymentData['code'])) {
             throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
         }
diff --git a/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php b/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php
new file mode 100644
index 0000000000000..281e1233d8bbe
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Test\Unit\Model\Cart;
+
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\SetPaymentMethodOnCart;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class SetPaymentMethodOnCartTest extends TestCase
+{
+    /**
+     * @var SetPaymentMethodOnCart
+     */
+    private $model;
+
+    /**
+     * @var PaymentProcessingRateLimiterInterface|MockObject
+     */
+    private $rateLimiterMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $objectManager = new ObjectManager($this);
+        $this->rateLimiterMock = $this->getMockForAbstractClass(PaymentProcessingRateLimiterInterface::class);
+        $this->model = $objectManager->getObject(
+            SetPaymentMethodOnCart::class,
+            ['paymentRateLimiter' => $this->rateLimiterMock]
+        );
+    }
+
+    /**
+     * Verify that the method is rate-limited.
+     *
+     * @return void
+     */
+    public function testLimited(): void
+    {
+        $this->rateLimiterMock->method('limit')
+            ->willThrowException(new PaymentProcessingRateLimitExceededException(__($message = 'Error')));
+        $this->expectException(GraphQlInputException::class);
+        $this->expectExceptionMessage($message);
+
+        $this->model->execute($this->createMock(Quote::class), []);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiterTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiterTest.php
new file mode 100644
index 0000000000000..2a7b3c29223be
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/CaptchaPaymentProcessingRateLimiterTest.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Checkout\Model;
+
+use Magento\Captcha\Model\DefaultModel;
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\Captcha\Helper\Data as CaptchaHelper;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\TestFramework\ObjectManager;
+use Magento\Customer\Model\Session as CustomerSession;
+
+/**
+ * Test CAPTCHA-based rate limiter.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoAppIsolation enabled
+ * @magentoAppArea frontend
+ */
+class CaptchaPaymentProcessingRateLimiterTest extends TestCase
+{
+    /**
+     * @var CaptchaPaymentProcessingRateLimiter
+     */
+    private $model;
+
+    /**
+     * @var CaptchaHelper
+     */
+    private $captchaHelper;
+
+    /**
+     * @var HttpRequest;
+     */
+    private $request;
+
+    /**
+     * @var CustomerSession
+     */
+    private $customerSession;
+
+    /**
+     * @var CustomerRepositoryInterface
+     */
+    private $customerRepo;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        /** @var ObjectManager $objectManager */
+        $objectManager = Bootstrap::getObjectManager();
+        $this->request = $objectManager->get(RequestInterface::class);
+        $this->request->getServer()->set('REMOTE_ADDR', '127.0.0.1');
+        $objectManager->removeSharedInstance(RemoteAddress::class);
+        $this->captchaHelper = $objectManager->get(CaptchaHelper::class);
+        $this->customerSession = $objectManager->get(CustomerSession::class);
+        $this->customerRepo = $objectManager->get(CustomerRepositoryInterface::class);
+        $this->model = $objectManager->get(CaptchaPaymentProcessingRateLimiter::class);
+    }
+
+    /**
+     * Verify that limits work for logged-in customers.
+     *
+     * @return void
+     *
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     *
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/forms payment_processing_request
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 2
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_ip 10
+     */
+    public function testLoggedInLimits(): void
+    {
+        //Logging in
+        $customer = $this->customerRepo->get('customer@example.com');
+        $this->customerSession->loginById($customer->getId());
+
+        $this->model->limit();
+        $this->model->limit();
+        try {
+            $this->model->limit();
+            $limited = false;
+        } catch (PaymentProcessingRateLimitExceededException $exception) {
+            $limited = true;
+        }
+        $this->assertTrue($limited);
+    }
+
+    /**
+     * Verify that limits work for guest.
+     *
+     * @return void
+     *
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/forms payment_processing_request
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 10
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_ip 2
+     */
+    public function testGuestLimits(): void
+    {
+        $this->model->limit();
+        $this->model->limit();
+        try {
+            $this->model->limit();
+            $limited = false;
+        } catch (PaymentProcessingRateLimitExceededException $exception) {
+            $limited = true;
+        }
+        $this->assertTrue($limited);
+    }
+
+    /**
+     * Verify that CAPTCHA is validated.
+     *
+     * @return void
+     *
+     * @magentoConfigFixture default_store customer/captcha/enable 1
+     * @magentoConfigFixture default_store customer/captcha/forms payment_processing_request
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_login 10
+     * @magentoConfigFixture default_store customer/captcha/failed_attempts_ip 2
+     */
+    public function testCaptchaValidation(): void
+    {
+        $this->model->limit();
+        $this->model->limit();
+        try {
+            $this->model->limit();
+            $limited = false;
+        } catch (PaymentProcessingRateLimitExceededException $exception) {
+            $limited = true;
+        }
+        //CAPTCHA is required
+        $this->assertTrue($limited);
+
+        //Providing CAPTCHA value
+        /** @var DefaultModel $captcha */
+        $captcha = $this->captchaHelper->getCaptcha(CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM);
+        $captcha->generate();
+        $this->request->setPostValue(
+            'captcha',
+            [CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM => $captcha->getWord()]
+        );
+        $this->model->limit();
+        //Providing CAPTCHA value in a header
+        /** @var DefaultModel $captcha */
+        $captcha = $this->captchaHelper->getCaptcha(CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM);
+        $captcha->generate();
+        $this->request->setPostValue(
+            'captcha',
+            [CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM => '']
+        );
+        $this->request->getHeaders()->addHeaderLine('X-Captcha', $captcha->getWord());
+        $this->model->limit();
+
+        //Providing invalid CAPTCHA value.
+        $this->request->setPostValue(
+            'captcha',
+            [CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM => 'invalid']
+        );
+        $this->request->getHeaders()->removeHeader($this->request->getHeaders()->get('X-Captcha'));
+        try {
+            $this->model->limit();
+            $limited = false;
+        } catch (PaymentProcessingRateLimitExceededException $exception) {
+            $limited = true;
+        }
+        //CAPTCHA was validated
+        $this->assertTrue($limited);
+    }
+}
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js
index 66f7731415c05..3a31672848d5c 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js
@@ -78,7 +78,8 @@ define([
 
             setPaymentInformation(messageContainer, paymentData, false);
             expect(mocks['Magento_Checkout/js/model/full-screen-loader'].startLoader).toHaveBeenCalled();
-            expect(mocks['mage/storage'].post).toHaveBeenCalledWith(serviceUrl, JSON.stringify(payload));
+            expect(mocks['mage/storage'].post)
+                .toHaveBeenCalledWith(serviceUrl, JSON.stringify(payload), true, 'application/json', {});
             expect(mocks['Magento_Checkout/js/model/full-screen-loader'].stopLoader).toHaveBeenCalled();
         });
     });
diff --git a/lib/web/mage/storage.js b/lib/web/mage/storage.js
index 1e136aa78477b..ba7cb6a8795cf 100644
--- a/lib/web/mage/storage.js
+++ b/lib/web/mage/storage.js
@@ -12,9 +12,11 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
          * @param {String} url
          * @param {Boolean} global
          * @param {String} contentType
+         * @param {Object} headers
          * @returns {Deferred}
          */
-        get: function (url, global, contentType) {
+        get: function (url, global, contentType, headers) {
+            headers = headers || {};
             global = global === undefined ? true : global;
             contentType = contentType || 'application/json';
 
@@ -22,7 +24,8 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
                 url: urlBuilder.build(url),
                 type: 'GET',
                 global: global,
-                contentType: contentType
+                contentType: contentType,
+                headers: headers
             });
         },
 
@@ -32,9 +35,11 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
          * @param {String} data
          * @param {Boolean} global
          * @param {String} contentType
+         * @param {Object} headers
          * @returns {Deferred}
          */
-        post: function (url, data, global, contentType) {
+        post: function (url, data, global, contentType, headers) {
+            headers = headers || {};
             global = global === undefined ? true : global;
             contentType = contentType || 'application/json';
 
@@ -43,7 +48,8 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
                 type: 'POST',
                 data: data,
                 global: global,
-                contentType: contentType
+                contentType: contentType,
+                headers: headers
             });
         },
 
@@ -53,11 +59,13 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
          * @param {String} data
          * @param {Boolean} global
          * @param {String} contentType
+         * @param {Object} headers
          * @returns {Deferred}
          */
         put: function (url, data, global, contentType, headers) {
             var ajaxSettings = {};
 
+            headers = headers || {};
             global = global === undefined ? true : global;
             contentType = contentType || 'application/json';
             ajaxSettings.url = urlBuilder.build(url);
@@ -65,10 +73,7 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
             ajaxSettings.data = data;
             ajaxSettings.global = global;
             ajaxSettings.contentType = contentType;
-
-            if (headers) {
-                ajaxSettings.headers = headers;
-            }
+            ajaxSettings.headers = headers;
 
             return $.ajax(ajaxSettings);
         },
@@ -78,9 +83,11 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
          * @param {String} url
          * @param {Boolean} global
          * @param {String} contentType
+         * @param {Object} headers
          * @returns {Deferred}
          */
-        delete: function (url, global, contentType) {
+        delete: function (url, global, contentType, headers) {
+            headers = headers || {};
             global = global === undefined ? true : global;
             contentType = contentType || 'application/json';
 
@@ -88,7 +95,8 @@ define(['jquery', 'mage/url'], function ($, urlBuilder) {
                 url: urlBuilder.build(url),
                 type: 'DELETE',
                 global: global,
-                contentType: contentType
+                contentType: contentType,
+                headers: headers
             });
         }
     };

From 52f08f116e5f884305bef596c9c9573dd2ea9a98 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 7 Aug 2020 14:47:41 -0500
Subject: [PATCH 110/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../Resolver/Order/Item/Links.php             | 80 ++++++++++++++++---
 1 file changed, 67 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php b/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
index 7fd1f2e3079be..1bde9c3fbf3bb 100644
--- a/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
@@ -12,8 +12,13 @@
 use Magento\DownloadableGraphQl\Model\ConvertLinksToArray;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Sales\Api\Data\InvoiceItemInterface;
+use Magento\Sales\Api\Data\OrderItemInterface;
+use Magento\Sales\Api\Data\ShipmentItemInterface;
 use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -32,16 +37,34 @@ class Links implements ResolverInterface
      */
     private $linkCollectionFactory;
 
+    /**
+     * Serializer
+     *
+     * @var Json
+     */
+    private $serializer;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
     /**
      * @param ConvertLinksToArray $convertLinksToArray
      * @param CollectionFactory $linkCollectionFactory
+     * @param ValueFactory $valueFactory
+     * @param Json $serializer
      */
     public function __construct(
         ConvertLinksToArray $convertLinksToArray,
-        CollectionFactory $linkCollectionFactory
+        CollectionFactory $linkCollectionFactory,
+        ValueFactory $valueFactory,
+        Json $serializer
     ) {
         $this->convertLinksToArray = $convertLinksToArray;
         $this->linkCollectionFactory = $linkCollectionFactory;
+        $this->valueFactory = $valueFactory;
+        $this->serializer = $serializer;
     }
 
     /**
@@ -54,23 +77,54 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['model'])) {
-            throw new LocalizedException(__('"model" value should be specified'));
-        }
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
 
-        /** @var OrderItem $orderItem */
-        $orderItem = $value['model'];
+        return $this->valueFactory->create(function () use ($value, $store) {
+            if (!isset($value['model'])) {
+                throw new LocalizedException(__('"model" value should be specified'));
+            }
+
+            if ($value['model'] instanceof OrderItemInterface) {
+                /** @var OrderItemInterface $item */
+                $item = $value['model'];
+                return $this->formatLinksData($item, $value, $store);
+            }
+            if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
+                /** @var InvoiceItemInterface|ShipmentItemInterface $item */
+                $item = $value['model'];
+                // Have to pass down order and item to map to avoid re-fetching all data
+                return $this->formatLinksData($item->getOrderItem(), $value, $store);
+            }
+            return null;
+        });
+    }
 
-        $orderLinks = $orderItem->getProductOptionByCode('links');
+    /**
+     * Format values from order links item
+     *
+     * @param OrderItemInterface $item
+     * @param array $formattedItem
+     * @param StoreInterface $store
+     * @return array
+     */
+    private function formatLinksData(
+        OrderItemInterface $item,
+        array $formattedItem,
+        StoreInterface $store
+    ): array {
+        $linksData = [];
+        if ($item->getProductType() === 'downloadable') {
+            $orderLinks = $item->getProductOptionByCode('links') ?? [];
 
-        /** @var Collection */
-        $linksCollection = $this->linkCollectionFactory->create();
-        $linksCollection->addTitleToResult($store->getStoreId())
-            ->addPriceToResult($store->getWebsiteId())
-            ->addFieldToFilter('main_table.link_id', ['in' => $orderLinks]);
+            /** @var Collection */
+            $linksCollection = $this->linkCollectionFactory->create();
+            $linksCollection->addTitleToResult($store->getId())
+                ->addPriceToResult($store->getWebsiteId())
+                ->addFieldToFilter('main_table.link_id', ['in' => $orderLinks]);
 
-        return $this->convertLinksToArray->execute($linksCollection->getItems());
+            $linksData = $this->convertLinksToArray->execute($linksCollection->getItems());
+        }
+        return $linksData;
     }
 }

From 27d10e350a30adf0be515e1422bb5b154285781e Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 7 Aug 2020 17:01:28 -0500
Subject: [PATCH 111/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../Resolver/Order/Item/Links.php               | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php b/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
index 1bde9c3fbf3bb..a578e98e02727 100644
--- a/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
+++ b/app/code/Magento/DownloadableGraphQl/Resolver/Order/Item/Links.php
@@ -16,10 +16,10 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Sales\Api\Data\CreditmemoItemInterface;
 use Magento\Sales\Api\Data\InvoiceItemInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\Data\ShipmentItemInterface;
-use Magento\Sales\Model\Order\Item as OrderItem;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -86,15 +86,12 @@ public function resolve(
             }
 
             if ($value['model'] instanceof OrderItemInterface) {
-                /** @var OrderItemInterface $item */
+                return $this->formatLinksData($value['model'], $store);
+            } elseif ($value['model'] instanceof InvoiceItemInterface
+                || $value['model'] instanceof CreditmemoItemInterface
+                || $value['model'] instanceof ShipmentItemInterface) {
                 $item = $value['model'];
-                return $this->formatLinksData($item, $value, $store);
-            }
-            if ($value['model'] instanceof InvoiceItemInterface || $value['model'] instanceof ShipmentItemInterface) {
-                /** @var InvoiceItemInterface|ShipmentItemInterface $item */
-                $item = $value['model'];
-                // Have to pass down order and item to map to avoid re-fetching all data
-                return $this->formatLinksData($item->getOrderItem(), $value, $store);
+                return $this->formatLinksData($item->getOrderItem(), $store);
             }
             return null;
         });
@@ -104,13 +101,11 @@ public function resolve(
      * Format values from order links item
      *
      * @param OrderItemInterface $item
-     * @param array $formattedItem
      * @param StoreInterface $store
      * @return array
      */
     private function formatLinksData(
         OrderItemInterface $item,
-        array $formattedItem,
         StoreInterface $store
     ): array {
         $linksData = [];

From 9cb9d1a94a014175f427aa71cba0650be69ede3f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Sat, 8 Aug 2020 20:44:18 -0500
Subject: [PATCH 112/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index f89559f2c4464..ad1e14dd2a938 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -136,7 +136,7 @@ private function getCustomerOrderQuery($orderNumber): array
                amount_including_tax{value}
                amount_excluding_tax{value}
                total_amount{value}
-               discounts{amount{value} label}
+               discounts{amount{value}}
                taxes {amount{value} title rate}
              }
              discounts {amount{value currency} label}

From 1763d9c92433a923b59721f397528825ce964b76 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Mon, 10 Aug 2020 12:06:22 +0300
Subject: [PATCH 113/671] MC-35254: Customer group is automatically changed
 when editing customer on customer grid is assigned to the company

---
 .../Observer/AfterAddressSaveObserver.php     |  1 +
 .../Adminhtml/Index/InlineEditTest.php        | 59 +++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index 41311abee5da8..bbea0ce9dc052 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -127,6 +127,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         if (!$this->_customerAddress->isVatValidationEnabled($customer->getStore())
             || $this->_coreRegistry->registry(self::VIV_PROCESSED_FLAG)
             || !$this->_canProcessAddress($customerAddress)
+            || $customerAddress->getShouldIgnoreValidation()
         ) {
             return;
         }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/InlineEditTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/InlineEditTest.php
index 3edfe1eab8aa5..1b8965711d77d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/InlineEditTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/InlineEditTest.php
@@ -7,12 +7,15 @@
 
 namespace Magento\Customer\Controller\Adminhtml\Index;
 
+use Magento\Customer\Api\AddressRepositoryInterface;
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Observer\AfterAddressSaveObserver;
 use Magento\Eav\Model\AttributeRepository;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -23,6 +26,7 @@
  *
  * @magentoAppArea adminhtml
  * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class InlineEditTest extends AbstractBackendController
 {
@@ -41,6 +45,12 @@ class InlineEditTest extends AbstractBackendController
     /** @var AttributeRepository */
     private $attributeRepository;
 
+    /** @var AddressRepositoryInterface */
+    private $addressRepository;
+
+    /** @var Registry */
+    private $coreRegistry;
+
     /**
      * @inheritdoc
      */
@@ -53,6 +63,8 @@ protected function setUp(): void
         $this->json = $this->objectManager->get(SerializerInterface::class);
         $this->websiteRepository = $this->objectManager->get(WebsiteRepositoryInterface::class);
         $this->attributeRepository = $this->objectManager->get(AttributeRepository::class);
+        $this->addressRepository = $this->objectManager->get(AddressRepositoryInterface::class);
+        $this->coreRegistry = Bootstrap::getObjectManager()->get(Registry::class);
     }
 
     /**
@@ -121,6 +133,53 @@ public function inlineEditParametersDataProvider(): array
         ];
     }
 
+    /**
+     * Customer group should not change after saving customer via customer grid because of disabled address validation
+     *
+     * @magentoConfigFixture current_store customer/create_account/auto_group_assign 1
+     * @magentoConfigFixture current_store customer/create_account/viv_invalid_group 2
+     * @magentoDataFixture Magento/Customer/_files/customer_one_address.php
+     *
+     * @return void
+     */
+    public function testInlineEditActionWithAddress(): void
+    {
+        $customer = $this->getCustomer();
+        $params = [
+            'items' => [
+                $customer->getId() => []
+            ],
+            'isAjax' => true,
+        ];
+        $actual = $this->performInlineEditRequest($params);
+        $updatedCustomer = $this->customerRepository->get('customer_one_address@test.com');
+        $this->assertEmpty($actual['messages']);
+        $this->assertFalse($actual['error']);
+        $this->assertEquals(
+            $customer->getGroupId(),
+            $updatedCustomer->getGroupId(),
+            'Customer group was changed!'
+        );
+    }
+
+    /**
+     * Change customer address with setting country from EU and setting VAT number
+     *
+     * @return CustomerInterface
+     */
+    private function getCustomer(): CustomerInterface
+    {
+        $customer = $this->customerRepository->get('customer_one_address@test.com');
+        $address = $this->addressRepository->getById((int)$customer->getDefaultShipping());
+        $address->setVatId(12345);
+        $address->setCountryId('DE');
+        $address->setRegionId(0);
+        $this->addressRepository->save($address);
+        $this->coreRegistry->unregister(AfterAddressSaveObserver::VIV_PROCESSED_FLAG);
+        //return customer after address repository save
+        return $this->customerRepository->get('customer_one_address@test.com');
+    }
+
     /**
      * Perform inline edit request.
      *

From e45c10ab8e62a3c69d6e233a6ded058a9c114b96 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 10 Aug 2020 12:25:58 +0300
Subject: [PATCH 114/671] MC-33150: Inconsistent address field labels on
 checkout and address book

---
 .../Customer/view/frontend/templates/address/edit.phtml    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 7f09361e4d505..5f7016b6b0ac3 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -58,6 +58,13 @@ $viewModel = $block->getViewModel();
         <div class="field street required">
             <label for="street_1" class="label"><span><?= /* @noEscape */ $_street ?></span></label>
             <div class="control">
+                <div class="field primary">
+                    <label for="street_1" class="label">
+                        <span>
+                            <?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') . ': Line 1' ?>
+                        </span>
+                    </label>
+                </div>
                 <input type="text"
                        name="street[]"
                        value="<?= $escaper->escapeHtmlAttr($block->getStreetLine(1)) ?>"

From 445bccb7d83a435ac97f54fecd85aa625372c071 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 10 Aug 2020 12:45:27 +0300
Subject: [PATCH 115/671] MC-35888: Confirmation email when creating shipment
 using REST is missing customer and shipment data

---
 .../Order/Shipment/Sender/EmailSender.php     | 80 ++++++++++-------
 .../Order/Shipment/Sender/EmailSenderTest.php | 87 +++++++++++++++++--
 2 files changed, 130 insertions(+), 37 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index fe68555d9f7c7..534bb127db067 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -5,9 +5,21 @@
  */
 namespace Magento\Sales\Model\Order\Shipment\Sender;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Payment\Helper\Data;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Model\Order\Address\Renderer;
+use Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
+use Magento\Sales\Model\Order\Email\Container\Template;
 use Magento\Sales\Model\Order\Email\Sender;
+use Magento\Sales\Model\Order\Email\SenderBuilderFactory;
 use Magento\Sales\Model\Order\Shipment\SenderInterface;
 use Magento\Framework\DataObject;
+use Magento\Sales\Model\ResourceModel\Order\Shipment;
+use Psr\Log\LoggerInterface;
 
 /**
  * Email notification sender for Shipment.
@@ -17,46 +29,46 @@
 class EmailSender extends Sender implements SenderInterface
 {
     /**
-     * @var \Magento\Payment\Helper\Data
+     * @var Data
      */
     private $paymentHelper;
 
     /**
-     * @var \Magento\Sales\Model\ResourceModel\Order\Shipment
+     * @var Shipment
      */
     private $shipmentResource;
 
     /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     * @var ScopeConfigInterface
      */
     private $globalConfig;
 
     /**
-     * @var \Magento\Framework\Event\ManagerInterface
+     * @var ManagerInterface
      */
     private $eventManager;
 
     /**
-     * @param \Magento\Sales\Model\Order\Email\Container\Template $templateContainer
-     * @param \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity $identityContainer
-     * @param \Magento\Sales\Model\Order\Email\SenderBuilderFactory $senderBuilderFactory
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
-     * @param \Magento\Payment\Helper\Data $paymentHelper
-     * @param \Magento\Sales\Model\ResourceModel\Order\Shipment $shipmentResource
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
+     * @param Template $templateContainer
+     * @param ShipmentIdentity $identityContainer
+     * @param SenderBuilderFactory $senderBuilderFactory
+     * @param LoggerInterface $logger
+     * @param Renderer $addressRenderer
+     * @param Data $paymentHelper
+     * @param Shipment $shipmentResource
+     * @param ScopeConfigInterface $globalConfig
+     * @param ManagerInterface $eventManager
      */
     public function __construct(
-        \Magento\Sales\Model\Order\Email\Container\Template $templateContainer,
-        \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity $identityContainer,
-        \Magento\Sales\Model\Order\Email\SenderBuilderFactory $senderBuilderFactory,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
-        \Magento\Payment\Helper\Data $paymentHelper,
-        \Magento\Sales\Model\ResourceModel\Order\Shipment $shipmentResource,
-        \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
-        \Magento\Framework\Event\ManagerInterface $eventManager
+        Template $templateContainer,
+        ShipmentIdentity $identityContainer,
+        SenderBuilderFactory $senderBuilderFactory,
+        LoggerInterface $logger,
+        Renderer $addressRenderer,
+        Data $paymentHelper,
+        Shipment $shipmentResource,
+        ScopeConfigInterface $globalConfig,
+        ManagerInterface $eventManager
     ) {
         parent::__construct(
             $templateContainer,
@@ -83,18 +95,18 @@ public function __construct(
      * Otherwise, email will be sent later during running of
      * corresponding cron job.
      *
-     * @param \Magento\Sales\Api\Data\OrderInterface $order
-     * @param \Magento\Sales\Api\Data\ShipmentInterface $shipment
-     * @param \Magento\Sales\Api\Data\ShipmentCommentCreationInterface|null $comment
+     * @param OrderInterface $order
+     * @param ShipmentInterface $shipment
+     * @param ShipmentCommentCreationInterface|null $comment
      * @param bool $forceSyncMode
      *
      * @return bool
      * @throws \Exception
      */
     public function send(
-        \Magento\Sales\Api\Data\OrderInterface $order,
-        \Magento\Sales\Api\Data\ShipmentInterface $shipment,
-        \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
+        OrderInterface $order,
+        ShipmentInterface $shipment,
+        ShipmentCommentCreationInterface $comment = null,
         $forceSyncMode = false
     ) {
         $shipment->setSendEmail($this->identityContainer->isEnabled());
@@ -112,7 +124,13 @@ public function send(
                 'payment_html' => $this->getPaymentHtml($order),
                 'store' => $order->getStore(),
                 'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
-                'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
+                'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
             $transportObject = new DataObject($transport);
 
@@ -147,12 +165,12 @@ public function send(
     /**
      * Returns payment info block as HTML.
      *
-     * @param \Magento\Sales\Api\Data\OrderInterface $order
+     * @param OrderInterface $order
      *
      * @return string
      * @throws \Exception
      */
-    private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
+    private function getPaymentHtml(OrderInterface $order)
     {
         return $this->paymentHelper->getInfoBlockHtml(
             $order->getPayment(),
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
index 81ed71ae7bb67..b170a72d691ea 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Shipment/Sender/EmailSenderTest.php
@@ -259,20 +259,37 @@ protected function setUp(): void
      * @param bool $forceSyncMode
      * @param bool $isComment
      * @param bool $emailSendingResult
+     * @param array $orderData
      *
      * @dataProvider sendDataProvider
      *
      * @return void
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @throws \Exception
      */
-    public function testSend($configValue, $forceSyncMode, $isComment, $emailSendingResult)
+    public function testSend($configValue, $forceSyncMode, $isComment, $emailSendingResult, $orderData)
     {
         $this->globalConfigMock->expects($this->once())
             ->method('getValue')
             ->with('sales_email/general/async_sending')
             ->willReturn($configValue);
 
+        $this->orderMock->expects($this->any())
+            ->method('getId')
+            ->willReturn($orderData['order_id']);
+        $this->orderMock->expects($this->any())
+            ->method('getCustomerName')
+            ->willReturn($orderData['customer_name']);
+        $this->orderMock->expects($this->any())
+            ->method('getIsNotVirtual')
+            ->willReturn($orderData['is_not_virtual']);
+        $this->orderMock->expects($this->any())
+            ->method('getEmailCustomerNote')
+            ->willReturn($orderData['email_customer_note']);
+        $this->orderMock->expects($this->any())
+            ->method('getFrontendStatusLabel')
+            ->willReturn($orderData['frontend_status_label']);
         if (!$isComment) {
             $this->commentMock = null;
         }
@@ -296,6 +313,12 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
                 'store' => $this->storeMock,
                 'formattedShippingAddress' => 'Formatted address',
                 'formattedBillingAddress' => 'Formatted address',
+                'order_data' => [
+                    'customer_name' => $orderData['customer_name'],
+                    'is_not_virtual' => $orderData['is_not_virtual'],
+                    'email_customer_note' => $orderData['email_customer_note'],
+                    'frontend_status_label' => $orderData['frontend_status_label']
+                ]
             ];
             $transport = new DataObject($transport);
 
@@ -388,15 +411,67 @@ public function testSend($configValue, $forceSyncMode, $isComment, $emailSending
 
     /**
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function sendDataProvider()
     {
         return [
-            'Successful sync sending with comment' => [0, false, true, true],
-            'Successful sync sending without comment' => [0, false, false, true],
-            'Failed sync sending with comment' => [0, false, true, false],
-            'Successful forced sync sending with comment' => [1, true, true, true],
-            'Async sending' => [1, false, false, false],
+            'Successful sync sending with comment' => [
+                0, false, true, true,
+                [
+                    'order_id' => 1,
+                    'shipment_id' => 1,
+                    'customer_name' => 'test customer',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => 1,
+                    'frontend_status_label' => 'email_sent'
+                ]
+            ],
+            'Successful sync sending without comment' => [
+                0, false, false, true,
+                [
+                    'order_id' => 2,
+                    'shipment_id' => 2,
+                    'customer_name' => 'test customer 1',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => 1,
+                    'frontend_status_label' => 'email_sent'
+                ]
+            ],
+            'Failed sync sending with comment' => [
+                0, false, true, false,
+                [
+                    'order_id' => 3,
+                    'shipment_id' => 3,
+                    'customer_name' => 'test customer 2',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => 1,
+                    'frontend_status_label' => 'send_email'
+                ]
+            ],
+            'Successful forced sync sending with comment' => [
+                1, true, true, true,
+                [
+                    'order_id' => 4,
+                    'shipment_id' => 4,
+                    'customer_name' => 'test customer 3',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => 1,
+                    'frontend_status_label' => 'email_sent'
+                ]
+            ],
+            'Async sending' => [
+                1, false, false, false,
+                [
+                    'order_id' => 5,
+                    'shipment_id' => 5,
+                    'customer_name' => 'test customer 4',
+                    'is_not_virtual' => true,
+                    'email_customer_note' => 1,
+                    'frontend_status_label' => 'send_email'
+                ]
+            ],
         ];
     }
 }

From dd555b4ef32007ac92024fcbb25abcf7a8bf245e Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Mon, 10 Aug 2020 13:05:09 +0300
Subject: [PATCH 116/671] MC-35838: Image and image role discrepancies when
 creating and updating item via A REST api rquests

---
 .../Model/Product/Gallery/CreateHandler.php   | 134 ++++++---
 .../Model/ResourceModel/Product/Gallery.php   |  14 +-
 .../Api/ProductRepositoryInterfaceTest.php    | 263 +++++++++++++++---
 .../Product/Gallery/UpdateHandlerTest.php     |  15 +
 4 files changed, 351 insertions(+), 75 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
index 225a3a4c44a9b..8bcd0e2521498 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -8,10 +8,12 @@
 namespace Magento\Catalog\Model\Product\Gallery;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\Operation\ExtensionInterface;
 use Magento\MediaStorage\Model\File\Uploader as FileUploader;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -89,6 +91,15 @@ class CreateHandler implements ExtensionInterface
      */
     private $storeManager;
 
+    /**
+     * @var string[]
+     */
+    private $mediaAttributesWithLabels = [
+        'image',
+        'small_image',
+        'thumbnail'
+    ];
+
     /**
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
@@ -190,27 +201,8 @@ public function execute($product, $arguments = [])
             $value['duplicate'] = $duplicate;
         }
 
-        /* @var $mediaAttribute \Magento\Catalog\Api\Data\ProductAttributeInterface */
-        foreach ($this->getMediaAttributeCodes() as $mediaAttrCode) {
-            $attrData = $product->getData($mediaAttrCode);
-            if (empty($attrData) && empty($clearImages) && empty($newImages) && empty($existImages)) {
-                continue;
-            }
-            $this->processMediaAttribute(
-                $product,
-                $mediaAttrCode,
-                $clearImages,
-                $newImages
-            );
-            if (in_array($mediaAttrCode, ['image', 'small_image', 'thumbnail'])) {
-                $this->processMediaAttributeLabel(
-                    $product,
-                    $mediaAttrCode,
-                    $clearImages,
-                    $newImages,
-                    $existImages
-                );
-            }
+        if (!empty($value['images'])) {
+            $this->processMediaAttributes($product, $existImages, $newImages, $clearImages);
         }
 
         $product->setData($attrCode, $value);
@@ -492,30 +484,39 @@ private function getMediaAttributeCodes()
     /**
      * Process media attribute
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @param string $mediaAttrCode
      * @param array $clearImages
      * @param array $newImages
      */
     private function processMediaAttribute(
-        \Magento\Catalog\Model\Product $product,
-        $mediaAttrCode,
+        Product $product,
+        string $mediaAttrCode,
         array $clearImages,
         array $newImages
-    ) {
-        $attrData = $product->getData($mediaAttrCode);
-        if (in_array($attrData, $clearImages)) {
-            $product->setData($mediaAttrCode, 'no_selection');
-        }
-
-        if (in_array($attrData, array_keys($newImages))) {
-            $product->setData($mediaAttrCode, $newImages[$attrData]['new_file']);
-        }
-        if (!empty($product->getData($mediaAttrCode))) {
+    ): void {
+        $storeId = $product->isObjectNew() ? Store::DEFAULT_STORE_ID : (int) $product->getStoreId();
+        /***
+         * Attributes values are saved as default value in single store mode
+         * @see \Magento\Catalog\Model\ResourceModel\AbstractResource::_saveAttributeValue
+         */
+        if ($storeId === Store::DEFAULT_STORE_ID
+            || $this->storeManager->hasSingleStore()
+            || $this->getMediaAttributeStoreValue($product, $mediaAttrCode, $storeId) !== null
+        ) {
+            $value = $product->getData($mediaAttrCode);
+            $newValue = $value;
+            if (in_array($value, $clearImages)) {
+                $newValue = 'no_selection';
+            }
+            if (in_array($value, array_keys($newImages))) {
+                $newValue = $newImages[$value]['new_file'];
+            }
+            $product->setData($mediaAttrCode, $newValue);
             $product->addAttributeUpdate(
                 $mediaAttrCode,
-                $product->getData($mediaAttrCode),
-                $product->getStoreId()
+                $newValue,
+                $storeId
             );
         }
     }
@@ -523,19 +524,19 @@ private function processMediaAttribute(
     /**
      * Process media attribute label
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @param string $mediaAttrCode
      * @param array $clearImages
      * @param array $newImages
      * @param array $existImages
      */
     private function processMediaAttributeLabel(
-        \Magento\Catalog\Model\Product $product,
-        $mediaAttrCode,
+        Product $product,
+        string $mediaAttrCode,
         array $clearImages,
         array $newImages,
         array $existImages
-    ) {
+    ): void {
         $resetLabel = false;
         $attrData = $product->getData($mediaAttrCode);
         if (in_array($attrData, $clearImages)) {
@@ -607,4 +608,57 @@ private function canRemoveImage(ProductInterface $product, string $imageFile) :b
 
         return $canRemoveImage;
     }
+
+    /**
+     * Get media attribute value for store view
+     *
+     * @param Product $product
+     * @param string $attributeCode
+     * @param int|null $storeId
+     * @return string|null
+     */
+    private function getMediaAttributeStoreValue(Product $product, string $attributeCode, int $storeId = null): ?string
+    {
+        $gallery = $this->getImagesForAllStores($product);
+        $storeId = $storeId === null ? (int) $product->getStoreId() : $storeId;
+        foreach ($gallery as $image) {
+            if ($image['attribute_code'] === $attributeCode && ((int)$image['store_id']) === $storeId) {
+                return $image['filepath'];
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Update media attributes
+     *
+     * @param Product $product
+     * @param array $existImages
+     * @param array $newImages
+     * @param array $clearImages
+     */
+    private function processMediaAttributes(
+        Product $product,
+        array $existImages,
+        array $newImages,
+        array $clearImages
+    ): void {
+        foreach ($this->getMediaAttributeCodes() as $mediaAttrCode) {
+            $this->processMediaAttribute(
+                $product,
+                $mediaAttrCode,
+                $clearImages,
+                $newImages
+            );
+            if (in_array($mediaAttrCode, $this->mediaAttributesWithLabels)) {
+                $this->processMediaAttributeLabel(
+                    $product,
+                    $mediaAttrCode,
+                    $clearImages,
+                    $newImages,
+                    $existImages
+                );
+            }
+        }
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
index a9741cd8e1ec7..a654608c1c2d9 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Gallery.php
@@ -6,6 +6,8 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Catalog\Model\Product\Media\Config;
+use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\Store;
 
 /**
@@ -31,22 +33,30 @@ class Gallery extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      * @since 101.0.0
      */
     protected $metadata;
+    /**
+     * @var Config|null
+     */
+    private $mediaConfig;
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      * @param string $connectionName
+     * @param Config|null $mediaConfig
+     * @throws \Exception
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool,
-        $connectionName = null
+        $connectionName = null,
+        ?Config $mediaConfig = null
     ) {
         $this->metadata = $metadataPool->getMetadata(
             \Magento\Catalog\Api\Data\ProductInterface::class
         );
 
         parent::__construct($context, $connectionName);
+        $this->mediaConfig = $mediaConfig ?? ObjectManager::getInstance()->get(Config::class);
     }
 
     /**
@@ -490,7 +500,7 @@ public function getProductImages($product, $storeIds)
             $storeIds
         )->where(
             'attribute_code IN (?)',
-            ['small_image', 'thumbnail', 'image']
+            $this->mediaConfig->getMediaAttributeCodes()
         );
 
         return $this->getConnection()->fetchAll($select);
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
index 1fcfe79f39478..5e2b2f89ba97b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -12,6 +12,7 @@
 use Magento\Authorization\Model\Rules;
 use Magento\Authorization\Model\RulesFactory;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Downloadable\Api\DomainManagerInterface;
 use Magento\Downloadable\Model\Link;
@@ -23,7 +24,9 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 use Magento\Integration\Api\AdminTokenServiceInterface;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreRepository;
 use Magento\Store\Model\Website;
 use Magento\Store\Model\WebsiteRepository;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -34,6 +37,7 @@
  *
  * @magentoAppIsolation enabled
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class ProductRepositoryInterfaceTest extends WebapiAbstract
 {
@@ -77,6 +81,10 @@ class ProductRepositoryInterfaceTest extends WebapiAbstract
      * @var AdminTokenServiceInterface
      */
     private $adminTokens;
+    /**
+     * @var array
+     */
+    private $fixtureProducts = [];
 
     /**
      * @inheritDoc
@@ -98,6 +106,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
+        $this->deleteFixtureProducts();
         parent::tearDown();
 
         $objectManager = Bootstrap::getObjectManager();
@@ -685,14 +694,15 @@ public function testProductOptions()
      */
     public function testProductWithMediaGallery()
     {
-        $testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
-        // @codingStandardsIgnoreLine
-        $encodedImage = base64_encode(file_get_contents($testImagePath));
+        $encodedImage = $this->getTestImage();
         //create a product with media gallery
         $filename1 = 'tiny1' . time() . '.jpg';
         $filename2 = 'tiny2' . time() . '.jpeg';
         $productData = $this->getSimpleProductData();
-        $productData['media_gallery_entries'] = $this->getMediaGalleryData($filename1, $encodedImage, $filename2);
+        $productData['media_gallery_entries'] = [
+            $this->getMediaGalleryData($filename1, $encodedImage, 1, 'tiny1', true),
+            $this->getMediaGalleryData($filename2, $encodedImage, 2, 'tiny2', false),
+        ];
         $response = $this->saveProduct($productData);
         $this->assertArrayHasKey('media_gallery_entries', $response);
         $mediaGalleryEntries = $response['media_gallery_entries'];
@@ -1595,38 +1605,33 @@ public function testUpdateProductCategoryLinksUnassign()
     /**
      * Get media gallery data
      *
-     * @param $filename1
-     * @param $encodedImage
-     * @param $filename2
+     * @param string $filename
+     * @param string $encodedImage
+     * @param int $position
+     * @param string $label
+     * @param bool $disabled
+     * @param array $types
      * @return array
      */
-    private function getMediaGalleryData($filename1, $encodedImage, $filename2)
-    {
+    private function getMediaGalleryData(
+        string $filename,
+        string $encodedImage,
+        int $position,
+        string $label,
+        bool $disabled = false,
+        array $types = []
+    ): array {
         return [
-            [
-                'position' => 1,
-                'media_type' => 'image',
-                'disabled' => true,
-                'label' => 'tiny1',
-                'types' => [],
-                'content' => [
-                    'type' => 'image/jpeg',
-                    'name' => $filename1,
-                    'base64_encoded_data' => $encodedImage,
-                ]
-            ],
-            [
-                'position' => 2,
-                'media_type' => 'image',
-                'disabled' => false,
-                'label' => 'tiny2',
-                'types' => [],
-                'content' => [
-                    'type' => 'image/jpeg',
-                    'name' => $filename2,
-                    'base64_encoded_data' => $encodedImage,
-                ]
-            ],
+            'position' => $position,
+            'media_type' => 'image',
+            'disabled' => $disabled,
+            'label' => $label,
+            'types' => $types,
+            'content' => [
+                'type' => 'image/jpeg',
+                'name' => $filename,
+                'base64_encoded_data' => $encodedImage,
+            ]
         ];
     }
 
@@ -1901,4 +1906,196 @@ public function testSaveDesign(): void
         //We don't have permissions to do that.
         $this->assertEquals('Not allowed to edit the product\'s design attributes', $exceptionMessage);
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store.php
+     */
+    public function testImageRolesWithMultipleStores()
+    {
+        $this->_markTestAsRestOnly(
+            'Test skipped due to known issue with SOAP. NULL value is cast to corresponding attribute type.'
+        );
+        $productData = $this->getSimpleProductData();
+        $sku = $productData[ProductInterface::SKU];
+        $defaultScope = Store::DEFAULT_STORE_ID;
+        $defaultWebsiteId = $this->loadWebsiteByCode('base')->getId();
+        $defaultStoreId = $this->loadStoreByCode('default')->getId();
+        $secondStoreId = $this->loadStoreByCode('fixture_second_store')->getId();
+        $encodedImage = $this->getTestImage();
+        $imageRoles = ['image', 'small_image', 'thumbnail'];
+        $img1 = uniqid('/t/e/test_image1_') . '.jpg';
+        $img2 = uniqid('/t/e/test_image2_') . '.jpg';
+        $productData['media_gallery_entries'] = [
+            $this->getMediaGalleryData(basename($img1), $encodedImage, 1, 'front', false, ['image']),
+            $this->getMediaGalleryData(basename($img2), $encodedImage, 2, 'back', false, ['small_image', 'thumbnail']),
+        ];
+        $productData[ProductInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids'] = [
+            $defaultWebsiteId
+        ];
+        $response = $this->saveProduct($productData, 'all');
+        if (isset($response['id'])) {
+            $this->fixtureProducts[] = $sku;
+        }
+        $imageRolesPerStore = $this->getProductStoreImageRoles(
+            $sku,
+            [$defaultScope, $defaultStoreId, $secondStoreId],
+            $imageRoles
+        );
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultScope]['image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['small_image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['thumbnail']);
+        $this->assertArrayNotHasKey($defaultStoreId, $imageRolesPerStore);
+        $this->assertArrayNotHasKey($secondStoreId, $imageRolesPerStore);
+        /**
+         * Override image roles for default store
+         */
+        $storeProductData = $response;
+        $storeProductData['media_gallery_entries'][0]['types'] = ['image', 'small_image', 'thumbnail'];
+        $storeProductData['media_gallery_entries'][1]['types'] = [];
+        $this->saveProduct($storeProductData, 'default');
+        $imageRolesPerStore = $this->getProductStoreImageRoles(
+            $sku,
+            [$defaultScope, $defaultStoreId, $secondStoreId],
+            $imageRoles
+        );
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultScope]['image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['small_image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['thumbnail']);
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultStoreId]['image']);
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultStoreId]['small_image']);
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultStoreId]['thumbnail']);
+        $this->assertArrayNotHasKey($secondStoreId, $imageRolesPerStore);
+        /**
+         * Inherit image roles from default scope
+         */
+        $customAttributes = $this->convertCustomAttributesToAssociativeArray($response['custom_attributes']);
+        $customAttributes['image'] = null;
+        $customAttributes['small_image'] = null;
+        $customAttributes['thumbnail'] = null;
+        $customAttributes = $this->convertAssociativeArrayToCustomAttributes($customAttributes);
+        $storeProductData = $response;
+        $storeProductData['media_gallery_entries'] = null;
+        $storeProductData['custom_attributes'] = $customAttributes;
+        $this->saveProduct($storeProductData, 'default');
+        $imageRolesPerStore = $this->getProductStoreImageRoles(
+            $sku,
+            [$defaultScope, $defaultStoreId, $secondStoreId],
+            $imageRoles
+        );
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultScope]['image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['small_image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['thumbnail']);
+        $this->assertArrayNotHasKey($defaultStoreId, $imageRolesPerStore);
+        $this->assertArrayNotHasKey($secondStoreId, $imageRolesPerStore);
+    }
+
+    /**
+     * Test that updating product image with same image name will result in incremented image name
+     */
+    public function testUpdateProductWithMediaGallery(): void
+    {
+        $productData = $this->getSimpleProductData();
+        $sku = $productData[ProductInterface::SKU];
+        $defaultScope = Store::DEFAULT_STORE_ID;
+        $defaultWebsiteId = $this->loadWebsiteByCode('base')->getId();
+        $encodedImage = $this->getTestImage();
+        $imageRoles = ['image', 'small_image', 'thumbnail'];
+        $img1 = uniqid('/t/e/test_image1_') . '.jpg';
+        $img2 = uniqid('/t/e/test_image2_') . '.jpg';
+        $productData['media_gallery_entries'] = [
+            $this->getMediaGalleryData(basename($img1), $encodedImage, 1, 'front', false, ['image']),
+            $this->getMediaGalleryData(basename($img2), $encodedImage, 2, 'back', false, ['small_image', 'thumbnail']),
+        ];
+        $productData[ProductInterface::EXTENSION_ATTRIBUTES_KEY]['website_ids'] = [
+            $defaultWebsiteId
+        ];
+        $response = $this->saveProduct($productData, 'all');
+        if (isset($response['id'])) {
+            $this->fixtureProducts[] = $sku;
+        }
+        $imageRolesPerStore = $this->getProductStoreImageRoles($sku, [$defaultScope], $imageRoles);
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultScope]['image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['small_image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['thumbnail']);
+        $this->saveProduct($productData, 'all');
+        $imageRolesPerStore = $this->getProductStoreImageRoles($sku, [$defaultScope], $imageRoles);
+        $img1 = substr_replace($img1, '_1', -4, 0);
+        $img2 = substr_replace($img2, '_1', -4, 0);
+        $this->assertEquals($img1, $imageRolesPerStore[$defaultScope]['image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['small_image']);
+        $this->assertEquals($img2, $imageRolesPerStore[$defaultScope]['thumbnail']);
+    }
+
+    /**
+     * @return string
+     */
+    private function getTestImage(): string
+    {
+        $testImagePath = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . 'test_image.jpg';
+        // @codingStandardsIgnoreLine
+        return base64_encode(file_get_contents($testImagePath));
+    }
+
+    /**
+     * @return void
+     */
+    private function deleteFixtureProducts(): void
+    {
+        foreach ($this->fixtureProducts as $sku) {
+            $this->deleteProduct($sku);
+        }
+        $this->fixtureProducts = [];
+    }
+
+    /**
+     * @param string $code
+     * @return StoreInterface
+     */
+    private function loadStoreByCode(string $code): StoreInterface
+    {
+        try {
+            $store = Bootstrap::getObjectManager()->get(StoreRepository::class)->get($code);
+        } catch (NoSuchEntityException $e) {
+            $store = null;
+            $this->fail("Couldn`t load store: {$code}");
+        }
+        return $store;
+    }
+
+    /**
+     * @param string $sku
+     * @param int|null $storeId
+     * @return ProductInterface
+     */
+    private function getProductModel(string $sku, int $storeId = null): ProductInterface
+    {
+        try {
+            $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+            $product = $productRepository->get($sku, false, $storeId, true);
+        } catch (NoSuchEntityException $e) {
+            $product = null;
+            $this->fail("Couldn`t load product: {$sku}");
+        }
+        return $product;
+    }
+
+    /**
+     * @param string $sku
+     * @param array $stores
+     * @param array $roles
+     * @return array
+     */
+    private function getProductStoreImageRoles(string $sku, array $stores, array $roles = []): array
+    {
+        /** @var Gallery $galleryResource */
+        $galleryResource = Bootstrap::getObjectManager()->get(Gallery::class);
+        $productModel = $this->getProductModel($sku);
+        $imageRolesPerStore = [];
+        foreach ($galleryResource->getProductImages($productModel, $stores) as $role) {
+            if (empty($roles) || in_array($role['attribute_code'], $roles)) {
+                $imageRolesPerStore[$role['store_id']][$role['attribute_code']] = $role['filepath'];
+            }
+        }
+        return $imageRolesPerStore;
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index f9d235493297f..31cfb173b5b3d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -78,6 +78,10 @@ class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
      * @var int
      */
     private $mediaAttributeId;
+    /**
+     * @var \Magento\Eav\Model\ResourceModel\UpdateHandler
+     */
+    private $eavUpdateHandler;
 
     /**
      * @inheritdoc
@@ -96,6 +100,8 @@ protected function setUp(): void
         $this->mediaDirectory = $this->objectManager->get(Filesystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->mediaDirectory->writeFile($this->fileName, 'Test');
+        $this->updateHandler = $this->objectManager->create(UpdateHandler::class);
+        $this->eavUpdateHandler = $this->objectManager->create(\Magento\Eav\Model\ResourceModel\UpdateHandler::class);
     }
 
     /**
@@ -185,6 +191,15 @@ public function testExecuteWithTwoImagesAndDifferentRolesOnStoreView(array $role
         $secondStoreId = (int)$this->storeRepository->get('fixture_second_store')->getId();
         $imageRoles = ['image', 'small_image', 'thumbnail', 'swatch_image'];
         $product = $this->getProduct($secondStoreId);
+        $entityIdField = $product->getResource()->getLinkField();
+        $entityData = [];
+        $entityData['store_id'] = $product->getStoreId();
+        $entityData[$entityIdField] = $product->getData($entityIdField);
+        $entityData = array_merge($entityData, $roles);
+        $this->eavUpdateHandler->execute(
+            \Magento\Catalog\Api\Data\ProductInterface::class,
+            $entityData
+        );
         $product->addData($roles);
         $this->updateHandler->execute($product);
 

From 2c660c78d4989a8fe8cb771f1dfa6c7926484415 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Mon, 10 Aug 2020 14:48:00 +0300
Subject: [PATCH 117/671] MC-35838: Image and image role discrepancies when
 creating and updating item via A REST api rquests

---
 .../Magento/Catalog/Api/ProductRepositoryInterfaceTest.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
index 5e2b2f89ba97b..1b18949b0ac5b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php
@@ -223,6 +223,7 @@ private function loadWebsiteByCode($websiteCode)
         try {
             $website = $websiteRepository->get($websiteCode);
         } catch (NoSuchEntityException $e) {
+            $website = null;
             $this->fail("Couldn`t load website: {$websiteCode}");
         }
 

From a1a4f802da33a96e7e1c078a1c206d60e42c0a3e Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Mon, 10 Aug 2020 08:25:19 -0500
Subject: [PATCH 118/671] MC-32659: Order Details by Order Number with
 additional different product types

- Added test for invoices on downloadable product type
---
 ...rieveOrdersWithDownloadableProductTest.php | 53 +++++++++++++++++--
 ...stomer_order_with_downloadable_product.php |  3 ++
 ...rder_with_invoice_downloadable_product.php | 38 +++++++++++++
 ..._invoice_downloadable_product_rollback.php |  9 ++++
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product_rollback.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index ad1e14dd2a938..53fa9bd922965 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -16,7 +16,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class RetrieveOrdersTest
+ * Class RetrieveOrdersTest for DownloadableProduct
  */
 class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
 {
@@ -44,6 +44,7 @@ protected function setUp():void
 
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/order_with_customer_and_downloadable_product.php
+     * @magentoApiDataFixture Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
      */
     public function testGetCustomerOrdersDownloadableProduct()
     {
@@ -76,12 +77,36 @@ public function testGetCustomerOrdersDownloadableProduct()
                 ]
             ];
         $this->assertResponseFields($expectedDownloadableLinksData, $downloadableLinksFromResponse);
+        // invoices assertions
+        $customerOrderItemsInvoicesResponse  = $response[0]['invoices'][0];
+        $this->assertNotEmpty($customerOrderItemsInvoicesResponse);
+        $this->assertNotEmpty($customerOrderItemsInvoicesResponse['number']);
+        $customerOrderItemsInvoicesItemsResponse = $customerOrderItemsInvoicesResponse['items'][0];
+        $this->assertEquals('Downloadable Product', $customerOrderItemsInvoicesItemsResponse['product_name']);
+        $this->assertEquals(10, $customerOrderItemsInvoicesItemsResponse['product_sale_price']['value']);
+        $this->assertEquals(1, $customerOrderItemsInvoicesItemsResponse['quantity_invoiced']);
+        $downloadableItemInTheInvoice = $customerOrderItemsInvoicesItemsResponse['downloadable_links'];
+        $this->assertNotEmpty($downloadableItemInTheInvoice);
+
+        $downloadableProduct = $this->productRepository->get('downloadable-product');
+        /** @var LinkInterface $downloadableProductLinks */
+        $downloadableProductLinks = $downloadableProduct->getExtensionAttributes()->getDownloadableProductLinks();
+        $linkId = $downloadableProductLinks[0]->getId();
+        $expectedDownloadableLinksData =
+            [
+                [
+                    'title' =>'Downloadable Product Link',
+                    'sort_order' => 1,
+                    'uid'=> base64_encode("downloadable/{$linkId}")
+                ]
+            ];
+        $this->assertResponseFields($expectedDownloadableLinksData, $downloadableItemInTheInvoice);
     }
 
     /**
      * @magentoApiDataFixture Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
      */
-    public function testGetCustomerOrdersDownloadableWithmultiplelinks()
+    public function testGetCustomerOrdersDownloadableWithMultipleLinks()
     {
     }
 
@@ -124,7 +149,7 @@ private function getCustomerOrderQuery($orderNumber): array
               quantity_ordered
           }
          }
-           total {
+         total {
              base_grand_total{value currency}
              grand_total{value currency}
              subtotal {value currency }
@@ -141,10 +166,30 @@ private function getCustomerOrderQuery($orderNumber): array
              }
              discounts {amount{value currency} label}
            }
+        invoices {
+              number
+              items {
+              	product_name
+                product_sale_price{value currency}
+                quantity_invoiced
+                ... on DownloadableInvoiceItem {
+                   downloadable_links
+                  {
+                   sort_order
+                   title
+                   uid
+                  }
+                  id
+                  product_name
+                  product_sale_price{value}
+                  quantity_invoiced
+                  }
+                }
          }
        }
      }
-   }
+    }
+}
 QUERY;
         $currentEmail = 'customer@example.com';
         $currentPassword = 'password';
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_downloadable_product.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_downloadable_product.php
index 74c52d4642a77..c9abb31dd547c 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_downloadable_product.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_downloadable_product.php
@@ -43,8 +43,11 @@
 
 $orderItem->setProductId(1)
     ->setProductType(\Magento\Downloadable\Model\Product\Type::TYPE_DOWNLOADABLE)
+    ->setName('Downloadable Product')
     ->setProductOptions(['links' => [$link->getId()]])
     ->setBasePrice(100)
+    ->setPrice(10)
+    ->setSku('downloadable-product')
     ->setQtyOrdered(1);
 
 $order = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Sales\Model\Order::class);
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
new file mode 100644
index 0000000000000..a31f1562c327e
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\DB\Transaction;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\InvoiceManagementInterface;
+use Magento\Sales\Model\Order\Payment;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
+
+$payment = $objectManager->create(Payment::class);
+$payment->setMethod('checkmo');
+$order->setPayment($payment);
+$order->save();
+
+$orderService = ObjectManager::getInstance()->create(
+    InvoiceManagementInterface::class
+);
+
+/** @var InvoiceManagementInterface $orderService */
+$orderService = $objectManager->create(
+    InvoiceManagementInterface::class
+);
+$invoice = $orderService->prepareInvoice($order);
+$invoice->register();
+$order = $invoice->getOrder();
+$order->setIsInProcess(true);
+$transactionSave = $objectManager
+    ->create(Transaction::class);
+$transactionSave->addObject($invoice)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product_rollback.php
new file mode 100644
index 0000000000000..aba4c3c972955
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');

From e56ac979f59eb13fb66467152b30013533b56a16 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 10 Aug 2020 16:51:39 +0300
Subject: [PATCH 119/671] magento/magento2-login-as-customer#150: Opt-in/out -
 acl text fix.

---
 ...CustomerLoginFromCustomerPageManualChooseActionGroup.xml | 2 +-
 .../Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml     | 2 +-
 .../AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml  | 2 +-
 .../Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml | 2 +-
 .../Block/Adminhtml/ConfirmationPopup.php                   | 2 +-
 .../Controller/Adminhtml/Login/Login.php                    | 6 +++---
 .../Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
index 8db34a05252ee..44ef227a34257 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
@@ -20,7 +20,7 @@
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
-        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store View" stepKey="seeModal"/>
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store" stepKey="seeModal"/>
          <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
         <selectOption selector="{{AdminLoginAsCustomerConfirmationModalSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index 42d53113e20f4..5d447f665a275 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -11,7 +11,7 @@
     <test name="AdminLoginAsCustomerAutoDetectionTest">
         <annotations>
             <features value="Login as Customer"/>
-            <stories value="Select Store View based on 'Store View To Login In' setting"/>
+            <stories value="Select Store based on 'Store View To Login In' setting"/>
             <title
                 value="Admin user directly login into customer account with store View To Login In = Auto detection"/>
             <description
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
index 27aee2061f204..bd61b359f5bf6 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
@@ -11,7 +11,7 @@
     <test name="AdminLoginAsCustomerManualChooseStoreCodeInUrlTest" extends="AdminLoginAsCustomerManualChooseTest">
         <annotations>
             <features value="Login as Customer"/>
-            <stories value="Select Store View based on 'Store View To Login In' setting"/>
+            <stories value="Select Store based on 'Store View To Login In' setting"/>
             <title
                 value="Admin user directly login into customer account with store View To Login In = Manual Choose when store code is added to url"/>
             <description
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index acae07d1cda11..b343e4c289658 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -11,7 +11,7 @@
     <test name="AdminLoginAsCustomerManualChooseTest">
         <annotations>
             <features value="Login as Customer"/>
-            <stories value="Select Store View based on 'Store View To Login In' setting"/>
+            <stories value="Select Store based on 'Store View To Login In' setting"/>
             <title
                 value="Admin user directly login into customer account with store View To Login In = Manual Choose"/>
             <description
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
index 792fdcd073588..2498fa31c5e91 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
@@ -65,7 +65,7 @@ public function getJsLayout()
         $showStoreViewOptions = $this->config->isStoreManualChoiceEnabled();
 
         $layout['components']['lac-confirmation-popup']['title'] = $showStoreViewOptions
-            ? __('Login as Customer: Select Store View')
+            ? __('Login as Customer: Select Store')
             : __('You are about to Login as Customer');
         $layout['components']['lac-confirmation-popup']['content'] =
             __('Actions taken while in "Login as Customer" will affect actual customer data.');
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 947ee68d000ad..e80c3700349df 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -94,7 +94,7 @@ class Login extends Action implements HttpGetActionInterface
      * @var ManageStoreCookie
      */
     private $manageStoreCookie;
-  
+
     /**
      * @var SetLoggedAsCustomerCustomerIdInterface
      */
@@ -133,7 +133,7 @@ public function __construct(
         DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
         Url $url,
         ?Share $share = null,
-        ?ManageStoreCookie $manageStoreCookie = null
+        ?ManageStoreCookie $manageStoreCookie = null,
         ?SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId = null,
         ?IsLoginAsCustomerEnabledForCustomerInterface $isLoginAsCustomerEnabled = null
     ) {
@@ -191,7 +191,7 @@ public function execute(): ResultInterface
         if ($this->config->isStoreManualChoiceEnabled()) {
             $storeId = (int)$this->_request->getParam('store_id');
             if (empty($storeId)) {
-                $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
+                $this->messageManager->addNoticeMessage(__('Please select a Store to login in.'));
                 return $resultRedirect->setPath('customer/index/edit', ['id' => $customerId]);
             }
         } elseif ($this->share->isGlobalScope()) {
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml b/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml
index 580f478f32780..fb8d990e5bab2 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml
+++ b/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml
@@ -23,7 +23,7 @@
                     <source_model>Magento\LoginAsCustomerAdminUi\Model\Config\Source\StoreViewLogin</source_model>
                     <comment><![CDATA[
                             Use the "Manual Selection" option on a multi-website setup that has "Share Customer Accounts" enabled globally.
-                            If set to "Manual Selection", the "Login as Customer" admin can select a store view after logging in.
+                            If set to "Manual Selection", the "Login as Customer" admin can select a Store after logging in.
                         ]]></comment>
                 </field>
             </group>

From 5d65a1594ce5d9b9186506724e8be7ece61fb65a Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 10 Aug 2020 10:18:51 -0500
Subject: [PATCH 120/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 ...th_customer_and_downloadable_product_with_multiple_links.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
index b80fa4fc93704..a8cf0a509e0e0 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
@@ -54,7 +54,7 @@
         ['type' => 'free', 'fraudulent' => false]
     );
 /** @var ProductInterface $product */
-$product = $productRepository->get('downloadable-product');
+$product = $productRepository->get('downloadable-product-with-purchased-separately-links');
 /** @var LinkInterface $links */
 $links = $product->getExtensionAttributes()->getDownloadableProductLinks();
 $link = reset($links);

From 7ccfe2b60171bd68e2b3fbff78ea26ee2af18df7 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Mon, 10 Aug 2020 12:01:57 -0500
Subject: [PATCH 121/671] MC-35987: Order related types not namespaced properly
 on schema

---
 .../Model/OrderItem/OptionsProcessor.php         |  6 +++---
 .../Magento/SalesGraphQl/etc/schema.graphqls     | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php b/app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php
index 83b7e0cc46d96..2f386a3f05ec7 100644
--- a/app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php
+++ b/app/code/Magento/SalesGraphQl/Model/OrderItem/OptionsProcessor.php
@@ -49,12 +49,12 @@ private function processOptions(array $options): array
             if (isset($option['option_type'])) {
                 if (in_array($option['option_type'], ['field', 'area', 'file', 'date', 'date_time', 'time'])) {
                     $selectedOptions[] = [
-                        'id' => $option['label'],
+                        'label' => $option['label'],
                         'value' => $option['print_value'] ?? $option['value'],
                     ];
                 } elseif (in_array($option['option_type'], ['drop_down', 'radio', 'checkbox', 'multiple'])) {
                     $enteredOptions[] = [
-                        'id' => $option['label'],
+                        'label' => $option['label'],
                         'value' => $option['print_value'] ?? $option['value'],
                     ];
                 }
@@ -74,7 +74,7 @@ private function processAttributesInfo(array $attributesInfo): array
         $selectedOptions = [];
         foreach ($attributesInfo ?? [] as $option) {
             $selectedOptions[] = [
-                'id' => $option['label'],
+                'label' => $option['label'],
                 'value' => $option['print_value'] ?? $option['value'],
             ];
         }
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
index 8b9d58e48d4b1..3544acd1564d0 100644
--- a/app/code/Magento/SalesGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -48,12 +48,12 @@ type CustomerOrder @doc(description: "Contains details about each of the custome
     invoices: [Invoice]! @doc(description: "A list of invoices for the order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Invoices")
     shipments: [OrderShipment] @doc(description: "A list of shipments for the order") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Shipments")
     credit_memos: [CreditMemo] @doc(description: "A list of credit memos") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemos")
-    payment_methods: [PaymentMethod] @doc(description: "Payment details for the order")
+    payment_methods: [OrderPaymentMethod] @doc(description: "Payment details for the order")
     shipping_address: OrderAddress @doc(description: "The shipping address for the order")
     billing_address: OrderAddress @doc(description: "The billing address for the order")
     carrier: String @doc(description: "The shipping carrier for the order delivery") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CustomerOrders\\Carrier")
     shipping_method: String @doc(description: "The delivery method for the order")
-    comments: [CommentItem] @doc(description: "Comments about the order")
+    comments: [SalesCommentItem] @doc(description: "Comments about the order")
     increment_id: String @deprecated(reason: "Use the id attribute instead")
     order_number: String! @deprecated(reason: "Use the number attribute instead")
     created_at: String @deprecated(reason: "Use the order_date attribute instead")
@@ -101,7 +101,7 @@ type OrderItem implements OrderItemInterface {
 }
 
 type OrderItemOption @doc(description: "Represents order item options like selected or entered") {
-    id: String! @doc(description: "The name of the option")
+    label: String! @doc(description: "The name of the option")
     value: String! @doc(description: "The value of the option")
 }
 
@@ -127,7 +127,7 @@ type Invoice @doc(description: "Invoice details") {
     number: String! @doc(description: "Sequential invoice number")
     total: InvoiceTotal @doc(description: "Invoice total amount details") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Invoice\\InvoiceTotal")
     items: [InvoiceItemInterface] @doc(description: "Invoiced product details") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Invoice\\InvoiceItems")
-    comments: [CommentItem] @doc(description: "Comments on the invoice")
+    comments: [SalesCommentItem] @doc(description: "Comments on the invoice")
 }
 
 interface InvoiceItemInterface @doc(description: "Invoice item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\InvoiceItem")  {
@@ -171,10 +171,10 @@ type OrderShipment @doc(description: "Order shipment details") {
     number: String! @doc(description: "The sequential credit shipment number")
     tracking: [ShipmentTracking] @doc(description: "Contains shipment tracking details") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Shipment\\ShipmentTracking")
     items: [ShipmentItemInterface] @doc(description: "Contains items included in the shipment") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\Shipment\\ShipmentItems")
-    comments: [CommentItem] @doc(description: "Comments added to the shipment")
+    comments: [SalesCommentItem] @doc(description: "Comments added to the shipment")
 }
 
-type CommentItem @doc(description: "Comment item details") {
+type SalesCommentItem @doc(description: "Comment item details") {
     timestamp: String! @doc(description: "The timestamp of the comment")
     message: String! @doc(description: "The text of the message")
 }
@@ -197,7 +197,7 @@ type ShipmentTracking @doc(description: "Order shipment tracking details") {
     number: String @doc(description: "The tracking number of the order shipment")
 }
 
-type PaymentMethod @doc(description: "Contains details about the payment method used to pay for the order") {
+type OrderPaymentMethod @doc(description: "Contains details about the payment method used to pay for the order") {
     name: String! @doc(description: "The label that describes the payment method")
     type: String! @doc(description: "The payment method code that indicates how the order was paid for")
     additional_data: [KeyValue] @doc(description:  "Additional data per payment method type")
@@ -208,7 +208,7 @@ type CreditMemo @doc(description: "Credit memo details") {
     number: String! @doc(description: "The sequential credit memo number")
     items: [CreditMemoItemInterface] @doc(description: "An array containing details about refunded items") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemo\\CreditMemoItems")
     total: CreditMemoTotal @doc(description: "Contains details about the total refunded amount") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemo\\CreditMemoTotal")
-    comments: [CommentItem] @doc(description: "Comments on the credit memo") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemo\\CreditMemoComments")
+    comments: [SalesCommentItem] @doc(description: "Comments on the credit memo") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\CreditMemo\\CreditMemoComments")
 }
 
 interface CreditMemoItemInterface @doc(description: "Credit memo item details") @typeResolver(class: "Magento\\SalesGraphQl\\Model\\TypeResolver\\CreditMemoItem") {

From 112b62696431e35bb14953b15b35af311e64789b Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 10 Aug 2020 13:56:54 -0500
Subject: [PATCH 122/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 ...ustomer_and_downloadable_product_with_multiple_links.php | 6 ++++--
 ...nd_downloadable_product_with_multiple_links_rollback.php | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
index a8cf0a509e0e0..dd048b976afb0 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
@@ -21,8 +21,10 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php');
-Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php');
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Customer/_files/customer.php');
 
 $addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
 $objectManager = Bootstrap::getObjectManager();
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
index a15aa0cf57dbb..668eb36aa4526 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
@@ -12,8 +12,10 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php');
-Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php');
+Resolver::getInstance()
+    ->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Registry $registry */

From caadaa1c44c60bda6e8d2b9ea75ab2d77095975a Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 10 Aug 2020 14:18:53 -0500
Subject: [PATCH 123/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 app/code/Magento/DownloadableGraphQl/composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index 36f06b7ba8284..d03a5953506e5 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -10,11 +10,11 @@
         "magento/module-quote": "*",
         "magento/module-sales": "*",
         "magento/module-quote-graph-ql": "*",
-        "magento/module-sales-graph-ql": "*",
         "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-sales-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",

From 36ade1b7688af04d53e1a8a58017232256a799ef Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Mon, 10 Aug 2020 14:53:48 -0500
Subject: [PATCH 124/671] MC-35013: SKU search in Advanced Search page doesn't
 work

---
 app/code/Magento/CatalogSearch/Model/Advanced.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index b498cb09e34fa..20b68c815526d 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -361,6 +361,8 @@ protected function addSearchCriteria($attribute, $value)
      */
     protected function getPreparedSearchCriteria($attribute, $value)
     {
+        $from = null;
+        $to = null;
         if (is_array($value)) {
             if (isset($value['from']) && isset($value['to'])) {
                 if (!empty($value['from']) || !empty($value['to'])) {

From e04a84fe6060c6f90de69c4b01cf434adf57de0f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 10 Aug 2020 17:25:47 -0500
Subject: [PATCH 125/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 ..._downloadable_product_with_multiple_links_rollback.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
index 668eb36aa4526..4a28435ceb2d2 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links_rollback.php
@@ -12,10 +12,10 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()
-    ->requireDataFixture('Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php');
-Resolver::getInstance()
-    ->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links_rollback.php'
+);
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
 
 $objectManager = Bootstrap::getObjectManager();
 /** @var Registry $registry */

From 8703fd401a4bdebe874361cc0d2d0eb9b2f5bc7a Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 10 Aug 2020 19:58:37 -0500
Subject: [PATCH 126/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../DownloadableGraphQl/etc/schema.graphqls   |  4 ++--
 ...rieveOrdersWithDownloadableProductTest.php | 19 +++++++++----------
 ...rder_with_invoice_downloadable_product.php |  5 +----
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
index 451e135325720..cd3bd000248bc 100644
--- a/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/DownloadableGraphQl/etc/schema.graphqls
@@ -53,7 +53,7 @@ type DownloadableProductLinks @doc(description: "DownloadableProductLinks define
     link_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
     sample_type: DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get the downloadable sample")
     sample_file: String @deprecated(reason: "`sample_url` serves to get the downloadable sample")
-    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid")
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {
@@ -80,5 +80,5 @@ type DownloadableCreditMemoItem implements CreditMemoItemInterface {
 type DownloadableItemsLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
     title: String @doc(description: "The display name of the link")
     sort_order: Int @doc(description: "A number indicating the sort order")
-    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid") # A Base64 string that encodes option details.
+    uid: ID! @doc(description: "A string that encodes option details.") @resolver(class: "Magento\\DownloadableGraphQl\\Resolver\\Product\\DownloadableLinksValueUid")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index 53fa9bd922965..57d3913dd2d11 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -16,7 +16,7 @@
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 /**
- * Class RetrieveOrdersTest for DownloadableProduct
+ * Tests downloadable product fields in Orders, Invoices, CreditMemo and Shipments
  */
 class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
 {
@@ -34,7 +34,6 @@ class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
 
     protected function setUp():void
     {
-        parent::setUp();
         $objectManager = Bootstrap::getObjectManager();
         $this->customerAuthenticationHeader = $objectManager->get(GetCustomerAuthenticationHeader::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
@@ -49,8 +48,8 @@ protected function setUp():void
     public function testGetCustomerOrdersDownloadableProduct()
     {
         $orderNumber = '100000001';
-        $response = $this->getCustomerOrderQuery($orderNumber);
-        $customerOrderItemsInResponse = $response[0]['items'];
+        $customerOrders = $this->getCustomersOrderQuery($orderNumber);
+        $customerOrderItemsInResponse = $customerOrders[0]['items'];
 
         $this->assertNotEmpty($customerOrderItemsInResponse);
         $downloadableItemInTheOrder = $customerOrderItemsInResponse[0];
@@ -78,15 +77,15 @@ public function testGetCustomerOrdersDownloadableProduct()
             ];
         $this->assertResponseFields($expectedDownloadableLinksData, $downloadableLinksFromResponse);
         // invoices assertions
-        $customerOrderItemsInvoicesResponse  = $response[0]['invoices'][0];
+        $customerOrderItemsInvoicesResponse  = $customerOrders[0]['invoices'][0];
         $this->assertNotEmpty($customerOrderItemsInvoicesResponse);
         $this->assertNotEmpty($customerOrderItemsInvoicesResponse['number']);
         $customerOrderItemsInvoicesItemsResponse = $customerOrderItemsInvoicesResponse['items'][0];
         $this->assertEquals('Downloadable Product', $customerOrderItemsInvoicesItemsResponse['product_name']);
         $this->assertEquals(10, $customerOrderItemsInvoicesItemsResponse['product_sale_price']['value']);
         $this->assertEquals(1, $customerOrderItemsInvoicesItemsResponse['quantity_invoiced']);
-        $downloadableItemInTheInvoice = $customerOrderItemsInvoicesItemsResponse['downloadable_links'];
-        $this->assertNotEmpty($downloadableItemInTheInvoice);
+        $downloadableItemLinks = $customerOrderItemsInvoicesItemsResponse['downloadable_links'];
+        $this->assertNotEmpty($downloadableItemLinks);
 
         $downloadableProduct = $this->productRepository->get('downloadable-product');
         /** @var LinkInterface $downloadableProductLinks */
@@ -100,7 +99,7 @@ public function testGetCustomerOrdersDownloadableProduct()
                     'uid'=> base64_encode("downloadable/{$linkId}")
                 ]
             ];
-        $this->assertResponseFields($expectedDownloadableLinksData, $downloadableItemInTheInvoice);
+        $this->assertResponseFields($expectedDownloadableLinksData, $downloadableItemLinks);
     }
 
     /**
@@ -111,12 +110,12 @@ public function testGetCustomerOrdersDownloadableWithMultipleLinks()
     }
 
     /**
-     * Get customer order query
+     * Get customer order query with invoices
      *
      * @param string $orderNumber
      * @return array
      */
-    private function getCustomerOrderQuery($orderNumber): array
+    private function getCustomersOrderQuery($orderNumber): array
     {
         $query =
             <<<QUERY
diff --git a/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
index a31f1562c327e..5dea9a6c40754 100644
--- a/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
+++ b/dev/tests/integration/testsuite/Magento/Downloadable/_files/customer_order_with_invoice_downloadable_product.php
@@ -12,6 +12,7 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 
+/** @var ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();
 /** @var \Magento\Sales\Model\Order $order */
 $order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
@@ -21,10 +22,6 @@
 $order->setPayment($payment);
 $order->save();
 
-$orderService = ObjectManager::getInstance()->create(
-    InvoiceManagementInterface::class
-);
-
 /** @var InvoiceManagementInterface $orderService */
 $orderService = $objectManager->create(
     InvoiceManagementInterface::class

From d52f7245cd247c350b9e09e79c7a6286f9f685c3 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Mon, 10 Aug 2020 21:37:07 -0500
Subject: [PATCH 127/671] MC-32659: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- added creditmemo for downloadable product
---
 .../CustomerPlaceOrderWithDownloadable.php    | 417 ++++++++++++++++++
 ...rieveOrdersWithDownloadableProductTest.php | 248 ++++++++++-
 2 files changed, 663 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
new file mode 100644
index 0000000000000..7003983ae6f1e
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
@@ -0,0 +1,417 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Sales\Fixtures;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Downloadable\Api\Data\LinkInterface;
+use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\TestFramework\TestCase\GraphQl\Client;
+
+class CustomerPlaceOrderWithDownloadable
+{
+    /**
+     * @var Client
+     */
+    private $gqlClient;
+
+    /**
+     * @var CustomerTokenServiceInterface
+     */
+    private $tokenService;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var string
+     */
+    private $authHeader;
+
+    /**
+     * @var string
+     */
+    private $cartId;
+
+    /**
+     * @var array
+     */
+    private $customerLogin;
+
+    /**
+     * @param Client $gqlClient
+     * @param CustomerTokenServiceInterface $tokenService
+     * @param ProductRepositoryInterface $productRepository
+     */
+    public function __construct(
+        Client $gqlClient,
+        CustomerTokenServiceInterface $tokenService,
+        ProductRepositoryInterface $productRepository
+    ) {
+        $this->gqlClient = $gqlClient;
+        $this->tokenService = $tokenService;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * Place order for a bundled product
+     *
+     * @param array $customerLogin
+     * @param array $productData
+     * @return array
+     */
+    public function placeOrderWithDownloadableProduct(array $customerLogin, array $productData): array
+    {
+        $this->customerLogin = $customerLogin;
+        $this->createCustomerCart();
+        $this->addDownloadableProduct($productData);
+        $this->setBillingAddress();
+  //      $shippingMethod = $this->setShippingAddress();
+  //      $paymentMethod = $this->setShippingMethod($shippingMethod);
+        $paymentMethodCode ='checkmo';
+        $this->setPaymentMethod($paymentMethodCode);
+        return $this->doPlaceOrder();
+    }
+
+    /**
+     * Make GraphQl POST request
+     *
+     * @param string $query
+     * @param array $additionalHeaders
+     * @return array
+     */
+    private function makeRequest(string $query, array $additionalHeaders = []): array
+    {
+        $headers = array_merge([$this->getAuthHeader()], $additionalHeaders);
+        return $this->gqlClient->post($query, [], '', $headers);
+    }
+
+    /**
+     * Get header for authenticated requests
+     *
+     * @return string
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getAuthHeader(): string
+    {
+        if (empty($this->authHeader)) {
+            $customerToken = $this->tokenService
+                ->createCustomerAccessToken($this->customerLogin['email'], $this->customerLogin['password']);
+            $this->authHeader = "Authorization: Bearer {$customerToken}";
+        }
+        return $this->authHeader;
+    }
+
+    /**
+     * Get cart id
+     *
+     * @return string
+     */
+    private function getCartId(): string
+    {
+        if (empty($this->cartId)) {
+            $this->cartId = $this->createCustomerCart();
+        }
+        return $this->cartId;
+    }
+
+    /**
+     * Create empty cart for the customer
+     *
+     * @return array
+     */
+    private function createCustomerCart(): string
+    {
+        //Create empty cart
+        $createEmptyCart = <<<QUERY
+mutation {
+  createEmptyCart
+}
+QUERY;
+        $result = $this->makeRequest($createEmptyCart);
+        return $result['createEmptyCart'];
+    }
+
+    /**
+     * Add a bundle product to the cart
+     *
+     * @param array $productData
+     * @return array
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    private function addBundleProduct(array $productData)
+    {
+        $productSku = $productData['sku'];
+        $qty = $productData['quantity'] ?? 1;
+        /** @var Product $bundleProduct */
+        $bundleProduct = $this->productRepository->get($productSku);
+        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
+        $typeInstance = $bundleProduct->getTypeInstance();
+        $optionId1 = (int)$typeInstance->getOptionsCollection($bundleProduct)->getFirstItem()->getId();
+        $optionId2 = (int)$typeInstance->getOptionsCollection($bundleProduct)->getLastItem()->getId();
+        $selectionId1 = (int)$typeInstance->getSelectionsCollection([$optionId1], $bundleProduct)
+            ->getFirstItem()
+            ->getSelectionId();
+        $selectionId2 = (int)$typeInstance->getSelectionsCollection([$optionId2], $bundleProduct)
+            ->getLastItem()
+            ->getSelectionId();
+
+        $addProduct = <<<QUERY
+mutation {
+  addBundleProductsToCart(input:{
+    cart_id:"{$this->getCartId()}"
+    cart_items:[
+      {
+        data:{
+          sku:"{$productSku}"
+          quantity:{$qty}
+        }
+        bundle_options:[
+          {
+            id:{$optionId1}
+            quantity:1
+            value:["{$selectionId1}"]
+          }
+          {
+            id:$optionId2
+            quantity:2
+            value:["{$selectionId2}"]
+          }
+        ]
+      }
+    ]
+  }) {
+    cart {
+      items {quantity product {sku}}
+      }
+    }
+}
+QUERY;
+        return $this->makeRequest($addProduct);
+    }
+
+    private function addDownloadableProduct(array $productData)
+    {
+        $productSku = $productData['sku'];
+        $qty = $productData['quantity'] ?? 1;
+        /** @var Product $downloadableProduct */
+        $downloadableProduct = $this->productRepository->get($productSku);
+        /** @var LinkInterface $downloadableProductLinks */
+        $downloadableProductLinks = $downloadableProduct->getExtensionAttributes()->getDownloadableProductLinks();
+        $linkId = $downloadableProductLinks[0]->getId();
+
+        $addProduct = <<<QUERY
+mutation {
+    addDownloadableProductsToCart(
+        input: {
+            cart_id: "{$this->getCartId()}",
+            cart_items: [
+                {
+                    data: {
+                        quantity: {$qty},
+                        sku: "{$productSku}"
+                    },
+                    downloadable_product_links: [
+                        {
+          	                link_id: {$linkId}
+                        }
+                    ]
+                }
+            ]
+        }
+    ) {
+        cart {
+            items {
+                quantity
+                ... on DownloadableCartItem {
+                    links {
+                        title
+                        link_type
+                        price
+                    }
+                }
+            }
+        }
+    }
+}
+QUERY;
+        return $this->makeRequest($addProduct);
+    }
+
+    /**
+     * Set the billing address on the cart
+     *
+     * @return array
+     */
+    private function setBillingAddress(): array
+    {
+        $setBillingAddress = <<<QUERY
+mutation {
+  setBillingAddressOnCart(
+    input: {
+      cart_id: "{$this->getCartId()}"
+      billing_address: {
+         address: {
+          firstname: "John"
+          lastname: "Smith"
+          company: "Test company"
+          street: ["test street 1", "test street 2"]
+          city: "Texas City"
+          postcode: "78717"
+          telephone: "5123456677"
+          region: "TX"
+          country_code: "US"
+         }
+      }
+    }
+  ) {
+    cart {
+      billing_address {
+        __typename
+      }
+    }
+  }
+}
+QUERY;
+        return $this->makeRequest($setBillingAddress);
+    }
+
+    /**
+     * Set the shipping address on the cart and return an available shipping method
+     *
+     * @return array
+     */
+    private function setShippingAddress(): array
+    {
+        $setShippingAddress = <<<QUERY
+mutation {
+  setShippingAddressesOnCart(
+    input: {
+      cart_id: "{$this->getCartId()}"
+      shipping_addresses: [
+        {
+          address: {
+            firstname: "test shipFirst"
+            lastname: "test shipLast"
+            company: "test company"
+            street: ["test street 1", "test street 2"]
+            city: "Montgomery"
+            region: "AL"
+            postcode: "36013"
+            country_code: "US"
+            telephone: "3347665522"
+          }
+        }
+      ]
+    }
+  ) {
+    cart {
+      shipping_addresses {
+        available_shipping_methods {
+          carrier_code
+          method_code
+          amount {value}
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $result = $this->makeRequest($setShippingAddress);
+        $shippingMethod = $result['setShippingAddressesOnCart']
+        ['cart']['shipping_addresses'][0]['available_shipping_methods'][0];
+        return $shippingMethod;
+    }
+
+    /**
+     * Set the shipping method on the cart and return an available payment method
+     *
+     * @param array $shippingMethod
+     * @return array
+     */
+    private function setShippingMethod(array $shippingMethod): array
+    {
+        $setShippingMethod = <<<QUERY
+mutation {
+  setShippingMethodsOnCart(input:  {
+    cart_id: "{$this->getCartId()}",
+    shipping_methods: [
+      {
+         carrier_code: "{$shippingMethod['carrier_code']}"
+         method_code: "{$shippingMethod['method_code']}"
+      }
+    ]
+  }) {
+    cart {
+      available_payment_methods {
+        code
+        title
+      }
+    }
+  }
+}
+QUERY;
+        $result = $this->makeRequest($setShippingMethod);
+        $paymentMethod = $result['setShippingMethodsOnCart']['cart']['available_payment_methods'][0];
+        return $paymentMethod;
+    }
+
+    /**
+     * Set the payment method on the cart
+     *
+     * @param string $paymentMethodCode
+     * @return array
+     */
+    private function setPaymentMethod(string $paymentMethodCode): array
+    {
+        $setPaymentMethod = <<<QUERY
+mutation {
+  setPaymentMethodOnCart(
+    input: {
+      cart_id: "{$this->getCartId()}"
+      payment_method: {
+        code: "{$paymentMethodCode}"
+      }
+    }
+  ) {
+    cart {
+      selected_payment_method {
+        code
+      }
+    }
+  }
+}
+QUERY;
+        return $this->makeRequest($setPaymentMethod);
+    }
+
+    /**
+     * Place the order
+     *
+     * @return array
+     */
+    private function doPlaceOrder(): array
+    {
+        $placeOrder = <<<QUERY
+mutation {
+  placeOrder(
+    input: {
+      cart_id: "{$this->getCartId()}"
+    }
+  ) {
+    order {
+      order_number
+    }
+  }
+}
+QUERY;
+        return $this->makeRequest($placeOrder);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index 53fa9bd922965..33589582b0ed7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -11,7 +11,14 @@
 use Magento\Downloadable\Api\Data\LinkInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\GraphQl\GetCustomerAuthenticationHeader;
+use Magento\GraphQl\Sales\Fixtures\CustomerPlaceOrderWithDownloadable;
+use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\CreditmemoFactory;
+use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
+use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection;
+use Magento\Sales\Model\Service\CreditmemoService;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -32,6 +39,15 @@ class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
     /** @var ProductRepositoryInterface */
     private $productRepository;
 
+    /** @var CreditmemoService */
+    private $creditMemoService;
+
+    /** @var Order */
+    private $order;
+
+    /** @var CreditmemoFactory */
+    private $creditMemoFactory;
+
     protected function setUp():void
     {
         parent::setUp();
@@ -40,6 +56,15 @@ protected function setUp():void
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
         $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
         $this->productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        $this->order = $objectManager->create(Order::class);
+        $this->creditMemoService = $objectManager->get(CreditmemoService::class);
+        $this->creditMemoFactory = $objectManager->get(CreditmemoFactory::class);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->cleanUpCreditMemos();
+        $this->deleteOrder();
     }
 
     /**
@@ -104,12 +129,129 @@ public function testGetCustomerOrdersDownloadableProduct()
     }
 
     /**
-     * @magentoApiDataFixture Magento/Downloadable/_files/order_with_customer_and_downloadable_product_with_multiple_links.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_purchased_separately_links.php
      */
-    public function testGetCustomerOrdersDownloadableWithMultipleLinks()
+    public function testGetCustomerOrdersAndCreditMemoDownloadable()
     {
+        //Place order with downloadable product
+        $qty = 1;
+        $downloadableSku = 'downloadable-product-with-purchased-separately-links';
+        /** @var CustomerPlaceOrderWithDownloadable $downloadableProductOrderFixture */
+        $downloadableProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrderWithDownloadable::class);
+        $orderResponse = $downloadableProductOrderFixture->placeOrderWithDownloadableProduct(
+            ['email' => 'customer@example.com', 'password' => 'password'],
+            ['sku' => $downloadableSku, 'quantity' => $qty]
+        );
+        $orderNumber = $orderResponse['placeOrder']['order']['order_number'];
+        //End place order with downloadable product
+
+        // prepare invoice
+        $this->prepareInvoice($orderNumber, 1);
+        $order = $this->order->loadByIncrementId($orderNumber);
+        /** @var Order\Item $orderItem */
+        $orderItem = current($order->getAllItems());
+        $orderItem->setQtyRefunded(1);
+        $order->addItem($orderItem);
+        $order->save();
+        // Create a credit memo
+        $creditMemo = $this->creditMemoFactory->createByOrder($order, $order->getData());
+        $creditMemo->setOrder($order);
+        $creditMemo->setState(1);
+
+        $creditMemo->setSubtotal(12);
+        $creditMemo->setBaseSubTotal(12);
+        $creditMemo->setBaseGrandTotal(12);
+        $creditMemo->setGrandTotal(12);
+        $creditMemo->setAdjustment(-2.00);
+        $creditMemo->addComment("Test comment for downloadable refund", false, true);
+        $creditMemo->save();
+        /** @var \Magento\Sales\Model\Order\Creditmemo\Item $creditMemoItems */
+  //      $creditMemoItems = $creditMemo->getItemByOrderId($order->getId());
+//        $creditMemoItems->setCreditmemo($creditMemo);
+//        $creditMemoItems->setOrderItemId($orderItem->getId());
+ //       $creditMemoItems->setQty(1);
+ //       $creditMemoItems->save();
+
+        $this->creditMemoService->refund($creditMemo, true);
+        $response = $this->getCustomerOrderWithCreditMemoQuery();
+        $expectedCreditMemoData = [
+            [
+                'comments' => [
+                    ['message' => 'Test comment for downloadable refund']
+                ],
+                
+                'total' => [
+                    'subtotal' => [
+                        'value' => 12
+                    ],
+                    'grand_total' => [
+                        'value' => 12,
+                        'currency' => 'USD'
+                    ],
+                    'base_grand_total' => [
+                        'value' => 12,
+                        'currency' => 'USD'
+                    ],
+                    'total_shipping' => [
+                        'value' => 0
+                    ],
+                    'total_tax' => [
+                        'value' => 0
+                    ],
+                    'shipping_handling' => [
+                        'amount_including_tax' => [
+                            'value' => 0
+                        ],
+                        'amount_excluding_tax' => [
+                            'value' => 0
+                        ],
+                        'total_amount' => [
+                            'value' => 0
+                        ],
+                        'taxes' => []
+
+                    ],
+                    'adjustment' => [
+                        'value' => 2
+                    ]
+                ]
+            ]
+        ];
+        $firstOrderItem = current($response['customer']['orders']['items'] ?? []);
+        $this->assertArrayHasKey('credit_memos', $firstOrderItem);
+
+        $creditMemos = $firstOrderItem['credit_memos'];
+        $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
+
+
     }
 
+    /**
+     * Prepare invoice for the order
+     *
+     * @param string $orderNumber
+     * @param int|null $qty
+     */
+    private function prepareInvoice(string $orderNumber, int $qty = null)
+    {
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = Bootstrap::getObjectManager()
+            ->create(\Magento\Sales\Model\Order::class)->loadByIncrementId($orderNumber);
+        $orderItem = current($order->getItems());
+        $orderService = Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Api\InvoiceManagementInterface::class
+        );
+        $invoice = $orderService->prepareInvoice($order, [$orderItem->getId() => $qty]);
+        $invoice->register();
+        $order = $invoice->getOrder();
+        $order->setIsInProcess(true);
+        $transactionSave = Bootstrap::getObjectManager()
+            ->create(\Magento\Framework\DB\Transaction::class);
+        $transactionSave->addObject($invoice)->addObject($order)->save();
+    }
+
+
     /**
      * Get customer order query
      *
@@ -206,4 +348,106 @@ private function getCustomerOrderQuery($orderNumber): array
         $customerOrderItemsInResponse = $response['customer']['orders']['items'];
         return $customerOrderItemsInResponse;
     }
+
+    /**
+     *  Get CustomerOrder with credit memo details
+     *
+     * @return array
+     */
+    private function getCustomerOrderWithCreditMemoQuery(): array
+    {
+        $query =
+            <<<QUERY
+query {
+  customer {
+    orders {
+        items {
+            credit_memos {
+                comments {
+                    message
+                }
+
+                total {
+                    subtotal {
+                        value
+                    }
+                    base_grand_total  {
+                        value
+                        currency
+                    }
+                    grand_total {
+                        value
+                        currency
+                    }
+                    total_shipping {
+                        value
+                    }
+                    total_tax {
+                        value
+                    }
+                    shipping_handling {
+                         amount_including_tax{value}
+                         amount_excluding_tax{value}
+                         total_amount{value}
+                         taxes {amount{value} title rate}
+
+                    }
+                    adjustment {
+                        value
+                    }
+                }
+            }
+        }
+    }
+  }
+}
+QUERY;
+
+        $currentEmail = 'customer@example.com';
+        $currentPassword = 'password';
+        $response = $this->graphQlQuery(
+            $query,
+            [],
+            '',
+            $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
+        );
+        return $response;
+    }
+
+    /**
+     * @return void
+     */
+    private function deleteOrder(): void
+    {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+
+        /** @var $order \Magento\Sales\Model\Order */
+        $orderCollection = Bootstrap::getObjectManager()->create(OrderCollection::class);
+        foreach ($orderCollection as $order) {
+            $this->orderRepository->delete($order);
+        }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+    }
+
+    /**
+     * @return void
+     */
+    private function cleanUpCreditMemos(): void
+    {
+        /** @var \Magento\Framework\Registry $registry */
+        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', true);
+        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
+        $creditmemoCollection = Bootstrap::getObjectManager()->create(Collection::class);
+        foreach ($creditmemoCollection as $creditmemo) {
+            $creditmemoRepository->delete($creditmemo);
+        }
+        $registry->unregister('isSecureArea');
+        $registry->register('isSecureArea', false);
+    }
 }

From 1c5bcc0af7eb981600b970a470d1fe4cbee05c7f Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Mon, 10 Aug 2020 21:40:36 -0500
Subject: [PATCH 128/671] MC-32659: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- added creditmemo for downloadable product
---
 .../GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index 33589582b0ed7..a605d06e934bd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -180,7 +180,7 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
                 'comments' => [
                     ['message' => 'Test comment for downloadable refund']
                 ],
-                
+
                 'total' => [
                     'subtotal' => [
                         'value' => 12

From 61a92c2775cfbaed9e8e3993f039aa885f6b4fe9 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 11 Aug 2020 11:05:20 +0300
Subject: [PATCH 129/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - add disabled Store Groups.

---
 .../Block/Adminhtml/ConfirmationPopup.php         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
index 2498fa31c5e91..538ef3111fe43 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
@@ -10,7 +10,8 @@
 use Magento\Backend\Block\Template;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\LoginAsCustomerApi\Api\ConfigInterface;
-use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup\Options as StoreOptions;
+use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup\Options;
+use Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
 
 /**
  * Login confirmation pop-up
@@ -35,24 +36,32 @@ class ConfirmationPopup extends Template
      */
     private $json;
 
+    /**
+     * @var Options
+     */
+    private $options;
+
     /**
      * @param Template\Context $context
      * @param StoreOptions $storeOptions
      * @param ConfigInterface $config
      * @param Json $json
      * @param array $data
+     * @param Options|null $options
      */
     public function __construct(
         Template\Context $context,
         StoreOptions $storeOptions,
         ConfigInterface $config,
         Json $json,
-        array $data = []
+        array $data = [],
+        ?Options $options = null
     ) {
         parent::__construct($context, $data);
         $this->storeOptions = $storeOptions;
         $this->config = $config;
         $this->json = $json;
+        $this->options = $options;
     }
 
     /**
@@ -72,7 +81,7 @@ public function getJsLayout()
 
         $layout['components']['lac-confirmation-popup']['showStoreViewOptions'] = $showStoreViewOptions;
         $layout['components']['lac-confirmation-popup']['storeViewOptions'] = $showStoreViewOptions
-            ? $this->storeOptions->toOptionArray()
+            ? $this->options->toOptionArray()
             : [];
 
         return $this->json->serialize($layout);

From 513c9cb9626c630c3398cccf0a5fbbfc1d2706f1 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 11 Aug 2020 11:28:45 +0300
Subject: [PATCH 130/671] MC-33150: Inconsistent address field labels on
 checkout and address book

---
 .../Customer/view/frontend/templates/address/edit.phtml       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 5f7016b6b0ac3..a4a500b7d1b37 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -61,7 +61,7 @@ $viewModel = $block->getViewModel();
                 <div class="field primary">
                     <label for="street_1" class="label">
                         <span>
-                            <?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('street') . ': Line 1' ?>
+                            <?= $escaper->escapeHtml(__('Street Address: Line %1', 1)) ?>
                         </span>
                     </label>
                 </div>
@@ -75,7 +75,7 @@ $viewModel = $block->getViewModel();
                     <?php for ($_i = 1, $_n = $viewModel->addressGetStreetLines(); $_i < $_n; $_i++): ?>
                         <div class="field additional">
                             <label class="label" for="street_<?= /* @noEscape */ $_i + 1 ?>">
-                                <span><?= $escaper->escapeHtml(__('Street Address %1', $_i + 1)) ?></span>
+                                <span><?= $escaper->escapeHtml(__('Street Address: Line %1', $_i + 1)) ?></span>
                             </label>
                             <div class="control">
                                 <input type="text" name="street[]"

From 7328f32d249845bde1507a61f2a2a663c162d044 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Tue, 11 Aug 2020 17:36:27 +0300
Subject: [PATCH 131/671] MC-35254: Customer group is automatically changed
 when editing customer on customer grid is assigned to the company

---
 app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index bbea0ce9dc052..7dbaaf5cf181c 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -25,6 +25,7 @@
 /**
  * Customer Observer Model
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class AfterAddressSaveObserver implements ObserverInterface
 {

From cdf0d2810672430393204e9a7ab9e6be448bcbcf Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 11 Aug 2020 11:03:22 -0500
Subject: [PATCH 132/671] MC-32659: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- CR comments
---
 ...trieveOrdersWithDownloadableProductTest.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index fd199ab28acde..847a2067da989 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -48,9 +48,10 @@ class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
     /** @var CreditmemoFactory */
     private $creditMemoFactory;
 
+    private $creditmemoItemFactory;
+
     protected function setUp():void
     {
-        parent::setUp();
         $objectManager = Bootstrap::getObjectManager();
         $this->customerAuthenticationHeader = $objectManager->get(GetCustomerAuthenticationHeader::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
@@ -59,6 +60,7 @@ protected function setUp():void
         $this->order = $objectManager->create(Order::class);
         $this->creditMemoService = $objectManager->get(CreditmemoService::class);
         $this->creditMemoFactory = $objectManager->get(CreditmemoFactory::class);
+        $this->creditmemoItemFactory = $objectManager->create(\Magento\Sales\Model\Order\Creditmemo\ItemFactory::class);
     }
 
     protected function tearDown(): void
@@ -158,7 +160,6 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
         $creditMemo = $this->creditMemoFactory->createByOrder($order, $order->getData());
         $creditMemo->setOrder($order);
         $creditMemo->setState(1);
-
         $creditMemo->setSubtotal(12);
         $creditMemo->setBaseSubTotal(12);
         $creditMemo->setBaseGrandTotal(12);
@@ -166,13 +167,6 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
         $creditMemo->setAdjustment(-2.00);
         $creditMemo->addComment("Test comment for downloadable refund", false, true);
         $creditMemo->save();
-        /** @var \Magento\Sales\Model\Order\Creditmemo\Item $creditMemoItems */
-  //      $creditMemoItems = $creditMemo->getItemByOrderId($order->getId());
-//        $creditMemoItems->setCreditmemo($creditMemo);
-//        $creditMemoItems->setOrderItemId($orderItem->getId());
- //       $creditMemoItems->setQty(1);
- //       $creditMemoItems->save();
-
         $this->creditMemoService->refund($creditMemo, true);
         $response = $this->getCustomerOrderWithCreditMemoQuery();
         $expectedCreditMemoData = [
@@ -223,8 +217,6 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
 
         $creditMemos = $firstOrderItem['credit_memos'];
         $this->assertResponseFields($creditMemos, $expectedCreditMemoData);
-
-
     }
 
     /**
@@ -363,9 +355,7 @@ private function getCustomerOrderWithCreditMemoQuery(): array
     orders {
         items {
             credit_memos {
-                comments {
-                    message
-                }
+                comments { message}
 
                 total {
                     subtotal {

From b6dc9737949c941e651a501d4e31f9dad52dd69a Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Tue, 11 Aug 2020 19:50:46 +0300
Subject: [PATCH 133/671] =?UTF-8?q?MC-35313:=20=E2=80=9CAdd=20selections?=
 =?UTF-8?q?=20to=20my=20cart=E2=80=9D=20button=20does=20not=20work?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminCustomerShoppingCartProductItemSection.xml              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml
index 40fc23b6c72c1..eedfe47b7775c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml
@@ -14,5 +14,6 @@
         <element name="firstProductCheckbox" type="checkbox" selector="//*[@id='source_products_table']/tbody/tr[1]//*[@name='source_products']"/>
         <element name="addSelectionsToMyCartButton" type="button" selector="//*[@id='products_search']/div[1]//*[text()='Add selections to my cart']"/>
         <element name="addedProductName" type="text" selector="//*[@id='order-items_grid']//*[text()='{{var}}']" parameterized="true"/>
+        <element name="addedProductQty" type="input" selector="//*[@id='order-items_grid']//*[text()='{{var}}']//..//..//*[@class='col-qty']//input" parameterized="true"/>
     </section>
 </sections>

From 26193cbc9c393683eded0574bd11a6bded596d46 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 11 Aug 2020 11:58:04 -0500
Subject: [PATCH 134/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 ...rieveOrdersWithDownloadableProductTest.php | 87 +++++++++++--------
 1 file changed, 52 insertions(+), 35 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index 847a2067da989..c1b913732e97a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -17,10 +17,14 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\CreditmemoFactory;
 use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
-use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection;
+use Magento\Sales\Model\ResourceModel\Order\Creditmemo\Collection as CreditmemoCollection;
 use Magento\Sales\Model\Service\CreditmemoService;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Sales\Model\Order\Creditmemo\ItemFactory;
+use Magento\Framework\Registry;
+use Magento\Framework\DB\Transaction;
+use Magento\Sales\Api\InvoiceManagementInterface;
 
 /**
  * Tests downloadable product fields in Orders, Invoices, CreditMemo and Shipments
@@ -48,8 +52,30 @@ class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
     /** @var CreditmemoFactory */
     private $creditMemoFactory;
 
+    /** @var ItemFactory  */
     private $creditmemoItemFactory;
 
+    /** @var CustomerPlaceOrderWithDownloadable  */
+    private $customerPlaceOrderWithDownloadable;
+
+    /** @var InvoiceManagementInterface  */
+    private $invoiceManagement;
+
+    /** @var OrderCollection  */
+    private $orderCollection;
+
+    /** @var CreditmemoRepositoryInterface  */
+    private $creditmemoRepository;
+
+    /** @var CreditmemoCollection  */
+    private $creditmemoCollection;
+
+    /** @var Registry  */
+    private $registry;
+
+    /** @var Transaction  */
+    private $transaction;
+
     protected function setUp():void
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -60,7 +86,14 @@ protected function setUp():void
         $this->order = $objectManager->create(Order::class);
         $this->creditMemoService = $objectManager->get(CreditmemoService::class);
         $this->creditMemoFactory = $objectManager->get(CreditmemoFactory::class);
-        $this->creditmemoItemFactory = $objectManager->create(\Magento\Sales\Model\Order\Creditmemo\ItemFactory::class);
+        $this->creditmemoItemFactory = $objectManager->create(ItemFactory::class);
+        $this->customerPlaceOrderWithDownloadable = $objectManager->create(CustomerPlaceOrderWithDownloadable::class);
+        $this->invoiceManagement = $objectManager->create(InvoiceManagementInterface::class);
+        $this->orderCollection = $objectManager->create(OrderCollection::class);
+        $this->creditmemoRepository = $objectManager->get(CreditmemoRepositoryInterface::class);
+        $this->creditmemoCollection = $objectManager->create(CreditmemoCollection::class);
+        $this->registry = $objectManager->get(Registry::class);
+        $this->transaction = $objectManager->create(Transaction::class);
     }
 
     protected function tearDown(): void
@@ -139,9 +172,7 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
         //Place order with downloadable product
         $qty = 1;
         $downloadableSku = 'downloadable-product-with-purchased-separately-links';
-        /** @var CustomerPlaceOrderWithDownloadable $downloadableProductOrderFixture */
-        $downloadableProductOrderFixture = Bootstrap::getObjectManager()->create(CustomerPlaceOrderWithDownloadable::class);
-        $orderResponse = $downloadableProductOrderFixture->placeOrderWithDownloadableProduct(
+        $orderResponse = $this->customerPlaceOrderWithDownloadable->placeOrderWithDownloadableProduct(
             ['email' => 'customer@example.com', 'password' => 'password'],
             ['sku' => $downloadableSku, 'quantity' => $qty]
         );
@@ -227,20 +258,14 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
      */
     private function prepareInvoice(string $orderNumber, int $qty = null)
     {
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = Bootstrap::getObjectManager()
-            ->create(\Magento\Sales\Model\Order::class)->loadByIncrementId($orderNumber);
+        /** @var Order $order */
+        $order = $this->order->loadByIncrementId($orderNumber);
         $orderItem = current($order->getItems());
-        $orderService = Bootstrap::getObjectManager()->create(
-            \Magento\Sales\Api\InvoiceManagementInterface::class
-        );
-        $invoice = $orderService->prepareInvoice($order, [$orderItem->getId() => $qty]);
+        $invoice = $this->invoiceManagement->prepareInvoice($order, [$orderItem->getId() => $qty]);
         $invoice->register();
         $order = $invoice->getOrder();
         $order->setIsInProcess(true);
-        $transactionSave = Bootstrap::getObjectManager()
-            ->create(\Magento\Framework\DB\Transaction::class);
-        $transactionSave->addObject($invoice)->addObject($order)->save();
+        $this->transaction->addObject($invoice)->addObject($order)->save();
     }
 
 
@@ -409,18 +434,14 @@ private function getCustomerOrderWithCreditMemoQuery(): array
      */
     private function deleteOrder(): void
     {
-        /** @var \Magento\Framework\Registry $registry */
-        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', true);
-
-        /** @var $order \Magento\Sales\Model\Order */
-        $orderCollection = Bootstrap::getObjectManager()->create(OrderCollection::class);
-        foreach ($orderCollection as $order) {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        foreach ($this->orderCollection as $order) {
             $this->orderRepository->delete($order);
         }
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', false);
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
     }
 
     /**
@@ -428,16 +449,12 @@ private function deleteOrder(): void
      */
     private function cleanUpCreditMemos(): void
     {
-        /** @var \Magento\Framework\Registry $registry */
-        $registry = Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', true);
-        $creditmemoRepository = Bootstrap::getObjectManager()->get(CreditmemoRepositoryInterface::class);
-        $creditmemoCollection = Bootstrap::getObjectManager()->create(Collection::class);
-        foreach ($creditmemoCollection as $creditmemo) {
-            $creditmemoRepository->delete($creditmemo);
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        foreach ($this->creditmemoCollection as $creditmemo) {
+            $this->creditmemoRepository->delete($creditmemo);
         }
-        $registry->unregister('isSecureArea');
-        $registry->register('isSecureArea', false);
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
     }
 }

From a40101e1fea767b0e14e38c1655b735a54459519 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 11 Aug 2020 13:40:45 -0500
Subject: [PATCH 135/671] MC-32659: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- remove commented code
---
 .../CustomerPlaceOrderWithDownloadable.php    | 135 +-----------------
 1 file changed, 1 insertion(+), 134 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
index 7003983ae6f1e..7d061abf17925 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
@@ -73,8 +73,6 @@ public function placeOrderWithDownloadableProduct(array $customerLogin, array $p
         $this->createCustomerCart();
         $this->addDownloadableProduct($productData);
         $this->setBillingAddress();
-  //      $shippingMethod = $this->setShippingAddress();
-  //      $paymentMethod = $this->setShippingMethod($shippingMethod);
         $paymentMethodCode ='checkmo';
         $this->setPaymentMethod($paymentMethodCode);
         return $this->doPlaceOrder();
@@ -140,63 +138,12 @@ private function createCustomerCart(): string
     }
 
     /**
-     * Add a bundle product to the cart
+     * Add downloadable product with link to the cart
      *
      * @param array $productData
      * @return array
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
-    private function addBundleProduct(array $productData)
-    {
-        $productSku = $productData['sku'];
-        $qty = $productData['quantity'] ?? 1;
-        /** @var Product $bundleProduct */
-        $bundleProduct = $this->productRepository->get($productSku);
-        /** @var \Magento\Bundle\Model\Product\Type $typeInstance */
-        $typeInstance = $bundleProduct->getTypeInstance();
-        $optionId1 = (int)$typeInstance->getOptionsCollection($bundleProduct)->getFirstItem()->getId();
-        $optionId2 = (int)$typeInstance->getOptionsCollection($bundleProduct)->getLastItem()->getId();
-        $selectionId1 = (int)$typeInstance->getSelectionsCollection([$optionId1], $bundleProduct)
-            ->getFirstItem()
-            ->getSelectionId();
-        $selectionId2 = (int)$typeInstance->getSelectionsCollection([$optionId2], $bundleProduct)
-            ->getLastItem()
-            ->getSelectionId();
-
-        $addProduct = <<<QUERY
-mutation {
-  addBundleProductsToCart(input:{
-    cart_id:"{$this->getCartId()}"
-    cart_items:[
-      {
-        data:{
-          sku:"{$productSku}"
-          quantity:{$qty}
-        }
-        bundle_options:[
-          {
-            id:{$optionId1}
-            quantity:1
-            value:["{$selectionId1}"]
-          }
-          {
-            id:$optionId2
-            quantity:2
-            value:["{$selectionId2}"]
-          }
-        ]
-      }
-    ]
-  }) {
-    cart {
-      items {quantity product {sku}}
-      }
-    }
-}
-QUERY;
-        return $this->makeRequest($addProduct);
-    }
-
     private function addDownloadableProduct(array $productData)
     {
         $productSku = $productData['sku'];
@@ -283,86 +230,6 @@ private function setBillingAddress(): array
         return $this->makeRequest($setBillingAddress);
     }
 
-    /**
-     * Set the shipping address on the cart and return an available shipping method
-     *
-     * @return array
-     */
-    private function setShippingAddress(): array
-    {
-        $setShippingAddress = <<<QUERY
-mutation {
-  setShippingAddressesOnCart(
-    input: {
-      cart_id: "{$this->getCartId()}"
-      shipping_addresses: [
-        {
-          address: {
-            firstname: "test shipFirst"
-            lastname: "test shipLast"
-            company: "test company"
-            street: ["test street 1", "test street 2"]
-            city: "Montgomery"
-            region: "AL"
-            postcode: "36013"
-            country_code: "US"
-            telephone: "3347665522"
-          }
-        }
-      ]
-    }
-  ) {
-    cart {
-      shipping_addresses {
-        available_shipping_methods {
-          carrier_code
-          method_code
-          amount {value}
-        }
-      }
-    }
-  }
-}
-QUERY;
-        $result = $this->makeRequest($setShippingAddress);
-        $shippingMethod = $result['setShippingAddressesOnCart']
-        ['cart']['shipping_addresses'][0]['available_shipping_methods'][0];
-        return $shippingMethod;
-    }
-
-    /**
-     * Set the shipping method on the cart and return an available payment method
-     *
-     * @param array $shippingMethod
-     * @return array
-     */
-    private function setShippingMethod(array $shippingMethod): array
-    {
-        $setShippingMethod = <<<QUERY
-mutation {
-  setShippingMethodsOnCart(input:  {
-    cart_id: "{$this->getCartId()}",
-    shipping_methods: [
-      {
-         carrier_code: "{$shippingMethod['carrier_code']}"
-         method_code: "{$shippingMethod['method_code']}"
-      }
-    ]
-  }) {
-    cart {
-      available_payment_methods {
-        code
-        title
-      }
-    }
-  }
-}
-QUERY;
-        $result = $this->makeRequest($setShippingMethod);
-        $paymentMethod = $result['setShippingMethodsOnCart']['cart']['available_payment_methods'][0];
-        return $paymentMethod;
-    }
-
     /**
      * Set the payment method on the cart
      *

From b1ed64f56c7909eeb203a406ef7623a7ff18b9da Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 11 Aug 2020 13:52:51 -0500
Subject: [PATCH 136/671] MC-20639: MyAccount :: Order Details :: Refund
 (creditMemo) Details by Order Number

- CR comments
---
 .../Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php       | 2 +-
 .../GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
index 7d061abf17925..4355662abe9ff 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/Fixtures/CustomerPlaceOrderWithDownloadable.php
@@ -61,7 +61,7 @@ public function __construct(
     }
 
     /**
-     * Place order for a bundled product
+     * Place order for a downloadable product
      *
      * @param array $customerLogin
      * @param array $productData
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index c1b913732e97a..dac77143444a9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -268,7 +268,6 @@ private function prepareInvoice(string $orderNumber, int $qty = null)
         $this->transaction->addObject($invoice)->addObject($order)->save();
     }
 
-
     /**
      * Get customer order query with invoices
      *

From 269aac1a129ff07c74e685e13a8fe2018491d1e6 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Tue, 11 Aug 2020 14:31:32 -0500
Subject: [PATCH 137/671] MC-32659: MyAccount :: Order Details :: Order Details
 by Order Number with additional different product types

- added downloadable creditmemo item fragment coverage
---
 ...rieveOrdersWithDownloadableProductTest.php | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index dac77143444a9..96f5fd393a1bd 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -182,11 +182,6 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
         // prepare invoice
         $this->prepareInvoice($orderNumber, 1);
         $order = $this->order->loadByIncrementId($orderNumber);
-        /** @var Order\Item $orderItem */
-        $orderItem = current($order->getAllItems());
-        $orderItem->setQtyRefunded(1);
-        $order->addItem($orderItem);
-        $order->save();
         // Create a credit memo
         $creditMemo = $this->creditMemoFactory->createByOrder($order, $order->getData());
         $creditMemo->setOrder($order);
@@ -200,11 +195,29 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
         $creditMemo->save();
         $this->creditMemoService->refund($creditMemo, true);
         $response = $this->getCustomerOrderWithCreditMemoQuery();
+        $downloadableProduct = $this->productRepository->get('downloadable-product-with-purchased-separately-links');
+        /** @var LinkInterface $downloadableProductLinks */
+        $downloadableProductLinks = $downloadableProduct->getExtensionAttributes()->getDownloadableProductLinks();
+        $linkId = $downloadableProductLinks[0]->getId();
         $expectedCreditMemoData = [
             [
                 'comments' => [
                     ['message' => 'Test comment for downloadable refund']
                 ],
+                'items' => [
+                    [
+                      'product_name'=> 'Downloadable Product (Links can be purchased separately)',
+                      'product_sku' => 'downloadable-product-with-purchased-separately-links',
+                       'product_sale_price' => ['value' => 12],
+                    'discounts' => [],
+                    'quantity_refunded' => 1,
+                    'downloadable_links' => [
+                      [
+                      'uid'=> base64_encode("downloadable/{$linkId}"),
+                      'title' => 'Downloadable Product Link 1']
+                      ]
+                   ]
+                ],
 
                 'total' => [
                     'subtotal' => [
@@ -380,7 +393,23 @@ private function getCustomerOrderWithCreditMemoQuery(): array
         items {
             credit_memos {
                 comments { message}
-
+                items {
+                    product_name
+                    product_sku
+                    product_sale_price {value }
+                    discounts { amount{value currency} label }
+                    quantity_refunded
+                     ... on DownloadableCreditMemoItem
+                  {
+                    product_name
+                    discounts{amount{value}}
+                    downloadable_links{
+                      uid
+                      title
+                    }
+                    quantity_refunded
+                  }
+                }
                 total {
                     subtotal {
                         value

From 3d69b132c603dbb0d04f3e8911b0b2a1416aed0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Tue, 11 Aug 2020 21:51:16 +0200
Subject: [PATCH 138/671] Update
 app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml

Co-authored-by: Gabriel da Gama <gabriel@gabrielgama.com.br>
---
 .../view/frontend/layout/catalogsearch_result_index.xml     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
index 1f597a9ce1e3a..b36a7cc2347af 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
@@ -15,11 +15,9 @@
             </referenceBlock>
         </referenceContainer>
         <referenceBlock name="wishlist_page_head_components">
-            <block
-                class="Magento\Wishlist\Block\AddToWishlist"
+            <block class="Magento\Wishlist\Block\AddToWishlist"
                 name="catalogsearch.wishlist_addto"
-                template="Magento_Wishlist::addto.phtml"
-            >
+                template="Magento_Wishlist::addto.phtml">
                 <arguments>
                     <argument name="is_product_list" xsi:type="boolean">true</argument>
                     <argument name="product_list_block" xsi:type="string">search_result_list</argument>

From 75a5f2523643e89aa9226d92551021924c75e44f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Tue, 11 Aug 2020 21:51:28 +0200
Subject: [PATCH 139/671] Update
 app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml

Co-authored-by: Gabriel da Gama <gabriel@gabrielgama.com.br>
---
 .../Wishlist/view/frontend/layout/catalog_category_view.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
index 8b784cfd31783..c305b7c489d59 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
@@ -21,11 +21,9 @@
                        template="Magento_Wishlist::catalog/product/list/addto/wishlist.phtml"/>
             </referenceBlock>
             <referenceContainer name="category.product.list.additional">
-                <block
-                    class="Magento\Wishlist\Block\AddToWishlist"
+                <block class="Magento\Wishlist\Block\AddToWishlist"
                     name="category.product.list.additional.wishlist_addto"
-                    template="Magento_Wishlist::addto.phtml"
-                >
+                    template="Magento_Wishlist::addto.phtml">
                     <arguments>
                         <argument name="is_product_list" xsi:type="boolean">true</argument>
                     </arguments>

From 3577ab16fe9293ef897210a5a37f81badc09129b Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 11 Aug 2020 18:26:51 -0500
Subject: [PATCH 140/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 ...rieveOrdersWithDownloadableProductTest.php | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index 96f5fd393a1bd..f812b8d94ae1a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -28,6 +28,7 @@
 
 /**
  * Tests downloadable product fields in Orders, Invoices, CreditMemo and Shipments
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RetrieveOrdersWithDownloadableProductTest extends GraphQlAbstract
 {
@@ -206,19 +207,18 @@ public function testGetCustomerOrdersAndCreditMemoDownloadable()
                 ],
                 'items' => [
                     [
-                      'product_name'=> 'Downloadable Product (Links can be purchased separately)',
-                      'product_sku' => 'downloadable-product-with-purchased-separately-links',
-                       'product_sale_price' => ['value' => 12],
-                    'discounts' => [],
-                    'quantity_refunded' => 1,
-                    'downloadable_links' => [
-                      [
-                      'uid'=> base64_encode("downloadable/{$linkId}"),
-                      'title' => 'Downloadable Product Link 1']
-                      ]
-                   ]
+                        'product_name'=> 'Downloadable Product (Links can be purchased separately)',
+                        'product_sku' => 'downloadable-product-with-purchased-separately-links',
+                        'product_sale_price' => ['value' => 12],
+                        'discounts' => [],
+                        'quantity_refunded' => 1,
+                        'downloadable_links' => [
+                            [
+                                'uid'=> base64_encode("downloadable/{$linkId}"),
+                                'title' => 'Downloadable Product Link 1']
+                        ]
+                    ]
                 ],
-
                 'total' => [
                     'subtotal' => [
                         'value' => 12

From 9d8667e9dc1e95f418b0a41627b86f6c7b5d26d8 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Wed, 12 Aug 2020 11:35:37 +0300
Subject: [PATCH 141/671] MC-35893: Wrong 'Time of day to send data' field
 rendering

---
 lib/internal/Magento/Framework/Data/Form/Element/Time.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Time.php b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
index 53d72d704483c..713c3460262c0 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Time.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Time.php
@@ -115,7 +115,7 @@ public function getElementHtml()
             [],
             <<<style
                 .select80wide {
-                    width: 80px;
+                    width: 80px !important;
                 }
 style
             ,

From cdd8560ceef9304c59492d24391e225dd04c5476 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Wed, 12 Aug 2020 11:38:44 +0300
Subject: [PATCH 142/671] =?UTF-8?q?MC-35345:=20=E2=80=9CExport=20Tax=20Rat?=
 =?UTF-8?q?es=E2=80=9D=20button=20does=20not=20work=20properly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adminhtml/templates/importExport.phtml    |  2 +-
 .../Block/Adminhtml/Rate/ImportExportTest.php | 62 ++++++++++++++-----
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index 79d833771768d..35b2ce454d3c1 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -74,7 +74,7 @@ script;
             <div class="fieldset admin__field">
                 <span class="admin__field-label"><span><?= $block->escapeHtml(__('Export Tax Rates')) ?></span></span>
                 <div class="admin__field-control">
-                    <?= $block->getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
+                    <?= $block->getButtonHtml(__('Export Tax Rates'), "export_form.submit()") ?>
                 </div>
             </div>
         <?php if ($block->getUseContainer()):?>
diff --git a/dev/tests/integration/testsuite/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportTest.php b/dev/tests/integration/testsuite/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportTest.php
index 314d69aa0f0b7..955f15856953e 100644
--- a/dev/tests/integration/testsuite/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportTest.php
+++ b/dev/tests/integration/testsuite/Magento/TaxImportExport/Block/Adminhtml/Rate/ImportExportTest.php
@@ -3,40 +3,74 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\TaxImportExport\Block\Adminhtml\Rate;
 
-class ImportExportTest extends \PHPUnit\Framework\TestCase
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests for Tax Rate Import/Export form.
+ *
+ * @magentoAppArea adminhtml
+ */
+class ImportExportTest extends TestCase
 {
     /**
-     * @var \Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport
+     * @var ObjectManagerInterface
      */
-    protected $_block = null;
+    private $objectManager;
 
+    /**
+     * @var ImportExport
+     */
+    protected $block = null;
+
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
-        \Magento\TestFramework\Helper\Bootstrap::getInstance()
-            ->loadArea(\Magento\Backend\App\Area\FrontNameResolver::AREA_CODE);
-        $this->_block = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        )->createBlock(\Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->block = $this->objectManager->get(LayoutInterface::class)->createBlock(ImportExport::class);
     }
 
+    /**
+     * @inheritdoc
+     */
     protected function tearDown(): void
     {
-        $this->_block = null;
+        $this->block = null;
     }
 
-    public function testCreateBlock()
+    /**
+     * @return void
+     */
+    public function testCreateBlock(): void
     {
-        $this->assertInstanceOf(\Magento\TaxImportExport\Block\Adminhtml\Rate\ImportExport::class, $this->_block);
+        $this->assertInstanceOf(ImportExport::class, $this->block);
     }
 
-    public function testFormExists()
+    /**
+     * @return void
+     */
+    public function testFormExists(): void
     {
-        $html = $this->_block->toHtml();
-
+        $html = $this->block->toHtml();
         $this->assertStringContainsString('<form id="import-form"', $html);
+        $this->assertStringContainsString('<form id="export_form"', $html);
+    }
 
+    /**
+     * @return void
+     */
+    public function testExportFormButtonOnClick(): void
+    {
+        $html = $this->block->toHtml();
         $this->assertStringContainsString('<form id="export_form"', $html);
+        $this->assertStringContainsString('export_form.submit();', $html);
     }
 }

From 6a170bba98446d23f9857bca270b2d39f0d2576c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 12 Aug 2020 22:42:51 +0300
Subject: [PATCH 143/671] MC-35458: Config fields changes

---
 .../Block/System/Config/Form/Fieldset.php     | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
index 7fa0fbfa44b0a..0e918c23857ac 100644
--- a/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
+++ b/app/code/Magento/Config/Block/System/Config/Form/Fieldset.php
@@ -96,6 +96,8 @@ protected function _getChildrenElementsHtml(AbstractElement $element)
                     . '<td colspan="4">' . $field->toHtml() . '</td></tr>';
             } else {
                 $elements .= $field->toHtml();
+                $styleTag = $this->addVisibilityTag($field);
+                $elements .= $styleTag;
             }
         }
 
@@ -168,11 +170,13 @@ protected function _getFrontendClass($element)
      */
     protected function _getHeaderTitleHtml($element)
     {
+        $styleTag = $this->addVisibilityTag($element);
         return '<a id="' .
             $element->getHtmlId() .
             '-head" href="#' .
             $element->getHtmlId() .
             '-link">' . $element->getLegend() . '</a>' .
+            $styleTag .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
                 'event.preventDefault();' .
@@ -270,10 +274,70 @@ protected function _isCollapseState($element)
             return true;
         }
 
+        if ($this->isCollapseStateByDependentField($element)) {
+            return false;
+        }
+
         $extra = $this->_authSession->getUser()->getExtra();
+
         if (isset($extra['configState'][$element->getId()])) {
             return $extra['configState'][$element->getId()];
         }
         return $this->isCollapsedDefault;
     }
+
+    /**
+     * Check if element should be collapsed by dependent field value.
+     *
+     * @param AbstractElement $element
+     * @return bool
+     */
+    private function isCollapseStateByDependentField(AbstractElement $element): bool
+    {
+        if (!empty($element->getGroup()['depends']['fields'])) {
+            foreach ($element->getGroup()['depends']['fields'] as $dependFieldData) {
+                if (is_array($dependFieldData) && isset($dependFieldData['value'], $dependFieldData['id'])) {
+                    $fieldSetForm = $this->getForm();
+                    $dependentFieldConfigValue = $this->_scopeConfig->getValue(
+                        $dependFieldData['id'],
+                        $fieldSetForm->getScope(),
+                        $fieldSetForm->getScopeCode()
+                    );
+
+                    if ($dependFieldData['value'] !== $dependentFieldConfigValue) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * If element or it's parent depends on other element we hide it during page load.
+     *
+     * @param AbstractElement $field
+     * @return string
+     */
+    private function addVisibilityTag(AbstractElement $field): string
+    {
+        $elementId = '';
+        $styleTag = '';
+
+        if (!empty($field->getFieldConfig()['depends']['fields'])) {
+            $elementId = '#row_' . $field->getHtmlId();
+        } elseif (!empty($field->getGroup()['depends']['fields'])) {
+            $elementId = '#' . $field->getHtmlId() . '-head';
+        }
+
+        if (!empty($elementId)) {
+            $styleTag .= $this->secureRenderer->renderStyleAsTag(
+                'display: none;',
+                $elementId
+            );
+        }
+
+        return $styleTag;
+    }
 }

From dfd46a1436dc5a42c6d24655a3db26b5c96e7017 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 12 Aug 2020 22:45:38 +0300
Subject: [PATCH 144/671] MC-34254: If disable module PageBuilder then in the
 product page, page white

---
 .../Magento/Cms/Controller/PageTest.php       | 68 ++++++++++++++-----
 .../Magento/Cms/Fixtures/page_list.php        | 18 ++++-
 .../Cms/Fixtures/page_list_rollback.php       | 13 +++-
 .../Magento/Framework/View/Page/Builder.php   | 23 ++++++-
 .../View/Test/Unit/Page/BuilderTest.php       | 13 +++-
 5 files changed, 109 insertions(+), 26 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
index d58aa4e049b78..4d9178f1a0659 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php
@@ -4,29 +4,36 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Test class for \Magento\Cms\Controller\Page.
- */
 namespace Magento\Cms\Controller;
 
 use Magento\Cms\Api\GetPageByIdentifierInterface;
+use Magento\Cms\Model\Page\CustomLayoutManagerInterface;
 use Magento\Framework\View\LayoutInterface;
-use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Cms\Model\CustomLayoutManager;
+use Magento\TestFramework\TestCase\AbstractController;
 
-class PageTest extends \Magento\TestFramework\TestCase\AbstractController
+/**
+ * Test for \Magento\Cms\Controller\Page\View class.
+ */
+class PageTest extends AbstractController
 {
+    /**
+     * @var GetPageByIdentifierInterface
+     */
+    private $pageRetriever;
+
     /**
      * @inheritDoc
      */
     protected function setUp(): void
     {
-        Bootstrap::getObjectManager()->configure([
+        parent::setUp();
+        $this->_objectManager->configure([
             'preferences' => [
-                \Magento\Cms\Model\Page\CustomLayoutManagerInterface::class =>
-                    \Magento\TestFramework\Cms\Model\CustomLayoutManager::class
+                CustomLayoutManagerInterface::class => CustomLayoutManager::class,
             ]
         ]);
-        parent::setUp();
+        $this->pageRetriever = $this->_objectManager->get(GetPageByIdentifierInterface::class);
     }
 
     public function testViewAction()
@@ -51,9 +58,7 @@ public function testViewRedirectWithTrailingSlash()
     public function testAddBreadcrumbs()
     {
         $this->dispatch('/enable-cookies');
-        $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        );
+        $layout = $this->_objectManager->get(LayoutInterface::class);
         $breadcrumbsBlock = $layout->getBlock('breadcrumbs');
         $this->assertStringContainsString($breadcrumbsBlock->toHtml(), $this->getResponse()->getBody());
     }
@@ -90,12 +95,10 @@ public static function cmsPageWithSystemRouteFixture()
      */
     public function testCustomHandles(): void
     {
-        /** @var GetPageByIdentifierInterface $pageFinder */
-        $pageFinder = Bootstrap::getObjectManager()->get(GetPageByIdentifierInterface::class);
-        $page = $pageFinder->execute('test_custom_layout_page_3', 0);
-        $this->dispatch('/cms/page/view/page_id/' .$page->getId());
+        $page = $this->pageRetriever->execute('test_custom_layout_page_3', 0);
+        $this->dispatch('/cms/page/view/page_id/' . $page->getId());
         /** @var LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $layout = $this->_objectManager->get(LayoutInterface::class);
         $handles = $layout->getUpdate()->getHandles();
         $this->assertContains('cms_page_view_selectable_test_custom_layout_page_3_test_selected', $handles);
     }
@@ -111,8 +114,37 @@ public function testHomePageCustomHandles(): void
     {
         $this->dispatch('/');
         /** @var LayoutInterface $layout */
-        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $layout = $this->_objectManager->get(LayoutInterface::class);
         $handles = $layout->getUpdate()->getHandles();
         $this->assertContains('cms_page_view_selectable_home_page_custom_layout', $handles);
     }
+
+    /**
+     * Tests page renders even with unavailable custom page layout.
+     *
+     * @magentoDataFixture Magento/Cms/Fixtures/page_list.php
+     * @dataProvider pageLayoutDataProvider
+     * @param string $pageIdentifier
+     * @return void
+     */
+    public function testPageWithCustomLayout(string $pageIdentifier): void
+    {
+        $page = $this->pageRetriever->execute($pageIdentifier, 0);
+        $this->dispatch('/cms/page/view/page_id/' . $page->getId());
+        $this->assertStringContainsString(
+            '<main id="maincontent" class="page-main">',
+            $this->getResponse()->getBody()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function pageLayoutDataProvider(): array
+    {
+        return [
+            'Page with 1column layout' => ['page-with-1column-layout'],
+            'Page with unavailable layout' => ['page-with-unavailable-layout']
+        ];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
index ae431f5c4cf1a..2fa0bf3a5bc13 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list.php
@@ -14,15 +14,27 @@
 $data = [
     [
         'title' => 'simplePage',
-        'is_active' => 1
+        'is_active' => 1,
     ],
     [
         'title' => 'simplePage01',
-        'is_active' => 1
+        'is_active' => 1,
     ],
     [
         'title' => '01simplePage',
-        'is_active' => 1
+        'is_active' => 1,
+    ],
+    [
+        'title' => 'Page with 1column layout',
+        'is_active' => 1,
+        'content' => '<h1>Test Page Content</h1>',
+        'page_layout' => '1column',
+    ],
+    [
+        'title' => 'Page with unavailable layout',
+        'content' => '<h1>Test Page Content</h1>',
+        'is_active' => 1,
+        'page_layout' => 'unavailable-layout',
     ],
 ];
 
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
index 261cdba589653..00bec67bcfefc 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Fixtures/page_list_rollback.php
@@ -16,7 +16,18 @@
 
 /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
 $searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
-$searchCriteria = $searchCriteriaBuilder->addFilter('title', ['simplePage', 'simplePage01', '01simplePage'], 'in')
+$searchCriteria = $searchCriteriaBuilder
+    ->addFilter(
+        'title',
+        [
+            'simplePage',
+            'simplePage01',
+            '01simplePage',
+            'Page with 1column layout',
+            'Page with unavailable layout',
+        ],
+        'in'
+    )
     ->create();
 $result = $pageRepository->getList($searchCriteria);
 
diff --git a/lib/internal/Magento/Framework/View/Page/Builder.php b/lib/internal/Magento/Framework/View/Page/Builder.php
index 66cc3f588a9a0..846ffd119dabd 100644
--- a/lib/internal/Magento/Framework/View/Page/Builder.php
+++ b/lib/internal/Magento/Framework/View/Page/Builder.php
@@ -6,11 +6,13 @@
 namespace Magento\Framework\View\Page;
 
 use Magento\Framework\App;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Event;
 use Magento\Framework\View;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 
 /**
- * Class Builder
+ * Page Layout Builder
  */
 class Builder extends View\Layout\Builder
 {
@@ -24,23 +26,31 @@ class Builder extends View\Layout\Builder
      */
     protected $pageLayoutReader;
 
+    /**
+     * @var BuilderInterface|mixed
+     */
+    private $pageLayoutBuilder;
+
     /**
      * @param View\LayoutInterface $layout
      * @param App\Request\Http $request
      * @param Event\ManagerInterface $eventManager
      * @param Config $pageConfig
      * @param Layout\Reader $pageLayoutReader
+     * @param BuilderInterface|null $pageLayoutBuilder
      */
     public function __construct(
         View\LayoutInterface $layout,
         App\Request\Http $request,
         Event\ManagerInterface $eventManager,
         Config $pageConfig,
-        Layout\Reader $pageLayoutReader
+        Layout\Reader $pageLayoutReader,
+        ?BuilderInterface $pageLayoutBuilder = null
     ) {
         parent::__construct($layout, $request, $eventManager);
         $this->pageConfig = $pageConfig;
         $this->pageLayoutReader = $pageLayoutReader;
+        $this->pageLayoutBuilder = $pageLayoutBuilder ?? ObjectManager::getInstance()->get(BuilderInterface::class);
         $this->pageConfig->setBuilder($this);
     }
 
@@ -57,6 +67,7 @@ protected function generateLayoutBlocks()
 
     /**
      * Read page layout and write structure to ReadContext
+     *
      * @return void
      */
     protected function readPageLayout()
@@ -69,10 +80,16 @@ protected function readPageLayout()
     }
 
     /**
+     * Get current page layout or fallback to default
+     *
      * @return string
      */
     protected function getPageLayout()
     {
-        return $this->pageConfig->getPageLayout() ?: $this->layout->getUpdate()->getPageLayout();
+        $pageLayout = $this->pageConfig->getPageLayout();
+
+        return ($pageLayout && $this->pageLayoutBuilder->getPageLayoutsConfig()->hasPageLayout($pageLayout))
+            ? $pageLayout
+            : $this->layout->getUpdate()->getPageLayout();
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
index 77bdd91041ad2..0f94e32b0a707 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Page/BuilderTest.php
@@ -8,9 +8,11 @@
 namespace Magento\Framework\View\Test\Unit\Page;
 
 use Magento\Framework\View\Layout\Reader\Context;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 use Magento\Framework\View\Page\Builder;
 use Magento\Framework\View\Page\Config;
 use Magento\Framework\View\Page\Layout\Reader;
+use Magento\Framework\View\PageLayout\Config as PageLayoutConfig;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -22,7 +24,7 @@ class BuilderTest extends \Magento\Framework\View\Test\Unit\Layout\BuilderTest
 
     /**
      * @param array $arguments
-     * @return \Magento\Framework\View\Page\Builder
+     * @return \Magento\Framework\View\Layout\Builder
      */
     protected function getBuilder($arguments)
     {
@@ -39,6 +41,15 @@ protected function getBuilder($arguments)
 
         $arguments['pageLayoutReader'] = $this->createMock(Reader::class);
         $arguments['pageLayoutReader']->expects($this->once())->method('read')->with($readerContext, 'test_layout');
+        $pageLayoutConfig = $this->createMock(PageLayoutConfig::class);
+        $arguments['pageLayoutBuilder'] = $this->getMockForAbstractClass(BuilderInterface::class);
+        $arguments['pageLayoutBuilder']->expects($this->once())
+            ->method('getPageLayoutsConfig')
+            ->willReturn($pageLayoutConfig);
+        $pageLayoutConfig->expects($this->once())
+            ->method('hasPageLayout')
+            ->with('test_layout')
+            ->willReturn(true);
 
         return parent::getBuilder($arguments);
     }

From f62f0204f0cb5a0985b6bcf3b121dc90dd764932 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 12 Aug 2020 22:49:14 +0300
Subject: [PATCH 145/671] MC-36615: [MFTF] AdminProductGridUrlFilterApplierTest
 fails because of bad design

---
 .../Test/AdminProductGridUrlFilterApplierTest.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index 0565f2d08cc1f..fea4436446da2 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -18,19 +18,24 @@
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4931106"/>
             <group value="product"/>
         </annotations>
+
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <createData entity="simpleProductWithShortNameAndSku" stepKey="createSimpleProduct"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
         </before>
+
         <after>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
-        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$$createSimpleProduct.name$$" stepKey="navigateToProductGridWithFilters"/>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$createSimpleProduct.name$" stepKey="navigateToProductGridWithFilters"/>
         <waitForPageLoad stepKey="waitForProductGrid"/>
-        <see selector="{{AdminProductGridSection.productGridNameProduct($$createSimpleProduct.name$$)}}" userInput="$$createSimpleProduct.name$$" stepKey="seeProduct"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($createSimpleProduct.name$)}}" userInput="$createSimpleProduct.name$" stepKey="seeProduct"/>
+        <waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForEnabledFilters"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
-        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $$createSimpleProduct.name$$" stepKey="seeProductNameFilter"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $createSimpleProduct.name$" stepKey="seeProductNameFilter"/>
     </test>
 </tests>

From 50c3d197238bc651eed006179ac697a6f7f036e3 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 12 Aug 2020 18:18:43 -0500
Subject: [PATCH 146/671] MC-32659: Order Details by Order Number with
 additional different product types

---
 .../Sales/RetrieveOrdersWithDownloadableProductTest.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
index f812b8d94ae1a..2f007fb922e57 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersWithDownloadableProductTest.php
@@ -296,7 +296,7 @@ private function getCustomersOrderQuery($orderNumber): array
        orders(filter:{number:{eq:"{$orderNumber}"}}) {
          total_count
          items {
-          id
+           id
            number
            order_date
            status
@@ -314,7 +314,7 @@ private function getCustomersOrderQuery($orderNumber): array
                 sort_order
                 uid
               }
-              entered_options{value id}
+              entered_options{value label}
               product_sku
               product_name
               quantity_ordered

From dc79f565399e4a7c7b5313e35d443bd1144719c3 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 13 Aug 2020 02:32:37 -0500
Subject: [PATCH 147/671] MC-35804: Admin dashboard shows data from all stores

- fixed
- added functional test
- some improvements to functional tests
---
 .../AdminReloadDashboardDataActionGroup.xml   | 20 +++++++++++++++++++
 .../Mftf/Section/AdminDashboardSection.xml    |  2 ++
 .../AdminLoginWithRestrictPermissionTest.xml  |  5 ++---
 ...ctedUserAddCategoryFromProductPageTest.xml |  6 ++----
 ...ductQuantityAndAddToTheCartActionGroup.xml |  5 +++--
 ...FillCustomerSignInPopupFormActionGroup.xml |  2 +-
 .../AdminDeleteRoleActionGroup.xml            |  7 ++++---
 7 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminReloadDashboardDataActionGroup.xml

diff --git a/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminReloadDashboardDataActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminReloadDashboardDataActionGroup.xml
new file mode 100644
index 0000000000000..c4ea56a09a7eb
--- /dev/null
+++ b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminReloadDashboardDataActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminReloadDashboardDataActionGroup">
+        <annotations>
+            <description>Go to Admin Dashboard Page, and reload Dashboard data.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
+        <click selector="{{AdminDashboardSection.dashboardButtonReloadData}}" stepKey="reloadDashboardData"/>
+        <waitForPageLoad stepKey="waitForPageToReload"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml
index e67025cfa68d5..cb5704413df22 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminDashboardSection.xml
@@ -17,5 +17,7 @@
         <element name="dashboardDiagramAmountsContentTab" type="block" selector="#diagram_tab_amounts_content"/>
         <element name="dashboardDiagramTotals" type="text" selector="#diagram_tab_amounts_content"/>
         <element name="dashboardTotals" type="text" selector="//*[@class='dashboard-totals-label' and contains(text(), '{{columnName}}')]/../*[@class='dashboard-totals-value']" parameterized="true"/>
+        <element name="productInBestsellers" type="text" selector="#productsOrderedGrid_table td.col-product.col-name"/>
+        <element name="dashboardButtonReloadData" type="button" selector=".action-primary[title='Reload Data'][type='submit']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginWithRestrictPermissionTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginWithRestrictPermissionTest.xml
index b3797b0720400..bc0e883bf5089 100644
--- a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginWithRestrictPermissionTest.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginWithRestrictPermissionTest.xml
@@ -42,9 +42,8 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsSaleRoleUser"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!--Delete created data-->
-            <actionGroup ref="AdminUserOpenAdminRolesPageActionGroup" stepKey="navigateToUserRoleGrid"/>
-            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteUserRole">
-                <argument name="role" value="adminRole"/>
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteUserRole">
+                <argument name="roleName" value="{{adminRole.rolename}}"/>
             </actionGroup>
             <actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="goToAllUsersPage"/>
             <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
index 6ba300b9c5b57..795c2ac77acdd 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminRestrictedUserAddCategoryFromProductPageTest.xml
@@ -36,10 +36,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <!--Delete created data-->
             <comment userInput="Delete created data" stepKey="commentDeleteCreatedData"/>
-            <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRoleGrid" />
-            <waitForPageLoad stepKey="waitForRolesGridLoad" />
-            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteUserRole">
-                <argument name="role" value="adminRole"/>
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteUserRole">
+                <argument name="roleName" value="{{adminRole.rolename}}"/>
             </actionGroup>
             <amOnPage url="{{AdminUsersPage.url}}" stepKey="goToAllUsersPage"/>
             <waitForPageLoad stepKey="waitForUsersGridLoad" />
diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml
index 293d1060a6c01..053038b896a68 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontEnterProductQuantityAndAddToTheCartActionGroup.xml
@@ -15,10 +15,11 @@
         <arguments>
             <argument name="quantity" type="string"/>
         </arguments>
-        
+
         <clearField selector="{{StorefrontBundleProductActionSection.quantityField}}" stepKey="clearTheQuantityField"/>
         <fillField selector="{{StorefrontBundleProductActionSection.quantityField}}" userInput="{{quantity}}" stepKey="fillTheProductQuantity"/>
         <click selector="{{StorefrontBundleProductActionSection.addToCartButton}}" stepKey="clickOnAddToButton"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{StorefrontMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
index 71c19b6d138d1..b0ff5f001e517 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
@@ -15,7 +15,7 @@
         <arguments>
             <argument name="customer" type="entity"/>
         </arguments>
-        
+
         <waitForElementVisible selector="{{StorefrontCustomerSignInPopupFormSection.email}}" stepKey="waitEmailFieldVisible"/>
         <fillField selector="{{StorefrontCustomerSignInPopupFormSection.email}}" userInput="{{customer.email}}" stepKey="fillCustomerEmail"/>
         <fillField selector="{{StorefrontCustomerSignInPopupFormSection.password}}" userInput="{{customer.password}}" stepKey="fillCustomerPassword"/>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
index 46ad2e228c6c1..af923e865b3f5 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
@@ -10,12 +10,13 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminDeleteRoleActionGroup">
         <annotations>
-            <description>Deletes a User Role.</description>
+            <description>Deletes a User Role. Avoid using of this ActionGroup, it duplicates existing "AdminDeleteUserRoleActionGroup"</description>
         </annotations>
         <arguments>
             <argument name="role" defaultValue=""/>
         </arguments>
-
+        <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRoleGrid" />
+        <waitForPageLoad stepKey="waitForRolesGridLoad" />
         <click stepKey="clickResetFilterButtonBefore" selector="{{AdminRoleGridSection.resetButton}}"/>
         <waitForPageLoad stepKey="waitForRolesGridFilterResetBefore" time="10"/>
         <fillField stepKey="TypeRoleFilter" selector="{{AdminRoleGridSection.roleNameFilterTextField}}" userInput="{{role.name}}"/>
@@ -33,7 +34,7 @@
         <click stepKey="clickToConfirm" selector="{{AdminDeleteRoleSection.confirm}}"/>
         <waitForPageLoad stepKey="waitForPageLoad" time="10"/>
         <see stepKey="seeSuccessMessage" userInput="You deleted the role."/>
-        <waitForPageLoad stepKey="waitForRolesGridLoad" />
+        <waitForPageLoad stepKey="waitForRolesGridLoadAfterDelete" />
         <waitForElementVisible stepKey="waitForResetFilterButtonAfter" selector="{{AdminRoleGridSection.resetButton}}" time="10"/>
         <click stepKey="clickResetFilterButtonAfter" selector="{{AdminRoleGridSection.resetButton}}"/>
         <waitForPageLoad stepKey="waitForRolesGridFilterResetAfter" time="10"/>

From b3b80e68ab9b8d1bb8263f3e306bc97f3b9fa262 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 13 Aug 2020 10:19:31 -0500
Subject: [PATCH 148/671] MC-31652: File system directory write update

- Updated write directory class
- Added integration test coverage for change
---
 .../Filesystem/Directory/WriteTest.php        | 32 ++++++++++++++--
 .../Framework/Filesystem/Directory/Write.php  | 37 ++++++++++++-------
 2 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
index fb367fd557416..c01a28a9ff9bf 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
@@ -7,15 +7,17 @@
  */
 namespace Magento\Framework\Filesystem\Directory;
 
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\DriverPool;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ReadTest
  * Test for Magento\Framework\Filesystem\Directory\Read class
  */
-class WriteTest extends \PHPUnit\Framework\TestCase
+class WriteTest extends TestCase
 {
     /**
      * Test data to be cleaned
@@ -231,6 +233,8 @@ public function renameTargetDirProvider()
      * @param int $permissions
      * @param string $name
      * @param string $newName
+     * @throws ValidatorException
+     * @throws FileSystemException
      */
     public function testCopy($basePath, $permissions, $name, $newName)
     {
@@ -298,6 +302,8 @@ public function testCopyOutside()
      * @param int $permission
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCopyTargetDir($firstDir, $secondDir, $permission, $name, $newName)
     {
@@ -400,6 +406,8 @@ public function testChangePermissionsRecursivelyOutside()
      * @param int $permissions
      * @param string $path
      * @param int $time
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testTouch($basePath, $permissions, $path, $time)
     {
@@ -485,6 +493,8 @@ public function testIsWritableOutside()
      * @param int $permissions
      * @param string $path
      * @param string $mode
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testOpenFile($basePath, $permissions, $path, $mode)
     {
@@ -536,6 +546,8 @@ public function testOpenFileOutside()
      * @param string $path
      * @param string $content
      * @param string $extraContent
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testWriteFile($path, $content, $extraContent)
     {
@@ -553,6 +565,8 @@ public function testWriteFile($path, $content, $extraContent)
      * @param string $path
      * @param string $content
      * @param string $extraContent
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testWriteFileAppend($path, $content, $extraContent)
     {
@@ -595,6 +609,18 @@ public function testWriteFileOutside()
         $this->assertEquals(3, $exceptions);
     }
 
+    /**
+     * @throws ValidatorException
+     */
+    public function testInvalidDeletePath()
+    {
+        $this->expectException(FileSystemException::class);
+        $directory = $this->getDirectoryInstance('newDir', 0777);
+        $invalidPath = 'invalidPath/../';
+        $directory->create($invalidPath);
+        $directory->delete($invalidPath);
+    }
+
     /**
      * Tear down
      */
@@ -620,8 +646,8 @@ private function getDirectoryInstance($path, $permissions)
     {
         $fullPath = __DIR__ . '/../_files/' . $path;
         $objectManager = Bootstrap::getObjectManager();
-        /** @var \Magento\Framework\Filesystem\Directory\WriteFactory $directoryFactory */
-        $directoryFactory = $objectManager->create(\Magento\Framework\Filesystem\Directory\WriteFactory::class);
+        /** @var WriteFactory $directoryFactory */
+        $directoryFactory = $objectManager->create(WriteFactory::class);
         $directory = $directoryFactory->create($fullPath, DriverPool::FILE, $permissions);
         $this->testDirectories[] = $directory;
         return $directory;
diff --git a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
index 484eed347be0f..1d60b7ce879bf 100644
--- a/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
+++ b/lib/internal/Magento/Framework/Filesystem/Directory/Write.php
@@ -8,6 +8,8 @@
 
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\ValidatorException;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\Framework\Phrase;
 
 /**
  * Write Interface implementation
@@ -25,14 +27,14 @@ class Write extends Read implements WriteInterface
      * Constructor
      *
      * @param \Magento\Framework\Filesystem\File\WriteFactory $fileFactory
-     * @param \Magento\Framework\Filesystem\DriverInterface $driver
+     * @param DriverInterface $driver
      * @param string $path
      * @param int $createPermissions
      * @param PathValidatorInterface|null $pathValidator
      */
     public function __construct(
         \Magento\Framework\Filesystem\File\WriteFactory $fileFactory,
-        \Magento\Framework\Filesystem\DriverInterface $driver,
+        DriverInterface $driver,
         $path,
         $createPermissions = null,
         ?PathValidatorInterface $pathValidator = null
@@ -48,13 +50,13 @@ public function __construct(
      *
      * @param string $path
      * @return void
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException|ValidatorException
      */
     protected function assertWritable($path)
     {
         if ($this->isWritable($path) === false) {
             $path = $this->getAbsolutePath($path);
-            throw new FileSystemException(new \Magento\Framework\Phrase('The path "%1" is not writable.', [$path]));
+            throw new FileSystemException(new Phrase('The path "%1" is not writable.', [$path]));
         }
     }
 
@@ -63,7 +65,7 @@ protected function assertWritable($path)
      *
      * @param string $path
      * @return void
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException
      */
     protected function assertIsFile($path)
     {
@@ -71,7 +73,7 @@ protected function assertIsFile($path)
         clearstatcache(true, $absolutePath);
         if (!$this->driver->isFile($absolutePath)) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase('The "%1" file doesn\'t exist.', [$absolutePath])
+                new Phrase('The "%1" file doesn\'t exist.', [$absolutePath])
             );
         }
     }
@@ -149,7 +151,7 @@ public function copyFile($path, $destination, WriteInterface $targetDirectory =
      * @param string $destination
      * @param WriteInterface $targetDirectory [optional]
      * @return bool
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException
      * @throws ValidatorException
      */
     public function createSymlink($path, $destination, WriteInterface $targetDirectory = null)
@@ -178,10 +180,18 @@ public function delete($path = null)
     {
         $exceptionMessages = [];
         $this->validatePath($path);
+
         if (!$this->isExist($path)) {
             return true;
         }
+
         $absolutePath = $this->driver->getAbsolutePath($this->path, $path);
+        $basePath = $this->driver->getRealPathSafety($this->driver->getAbsolutePath($this->path, ''));
+
+        if ($path !== null && $path !== '' && $this->driver->getRealPathSafety($absolutePath) === $basePath) {
+            throw new FileSystemException(new Phrase('The path "%1" is not writable.', [$path]));
+        }
+
         if ($this->driver->isFile($absolutePath)) {
             $this->driver->deleteFile($absolutePath);
         } else {
@@ -198,12 +208,13 @@ public function delete($path = null)
 
             if (!empty($exceptionMessages)) {
                 throw new FileSystemException(
-                    new \Magento\Framework\Phrase(
+                    new Phrase(
                         \implode(' ', $exceptionMessages)
                     )
                 );
             }
         }
+
         return true;
     }
 
@@ -231,7 +242,7 @@ private function deleteFilesRecursively(string $path)
         }
         if (!empty($exceptionMessages)) {
             throw new FileSystemException(
-                new \Magento\Framework\Phrase(
+                new Phrase(
                     \implode(' ', $exceptionMessages)
                 )
             );
@@ -297,7 +308,7 @@ public function touch($path, $modificationTime = null)
      *
      * @param string|null $path
      * @return bool
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException
      * @throws ValidatorException
      */
     public function isWritable($path = null)
@@ -313,7 +324,7 @@ public function isWritable($path = null)
      * @param string $path
      * @param string $mode
      * @return \Magento\Framework\Filesystem\File\WriteInterface
-     * @throws \Magento\Framework\Exception\FileSystemException
+     * @throws FileSystemException
      * @throws ValidatorException
      */
     public function openFile($path, $mode = 'w')
@@ -334,7 +345,7 @@ public function openFile($path, $mode = 'w')
      * @param string $content
      * @param string|null $mode
      * @return int The number of bytes that were written.
-     * @throws FileSystemException
+     * @throws FileSystemException|ValidatorException
      */
     public function writeFile($path, $content, $mode = 'w+')
     {
@@ -344,7 +355,7 @@ public function writeFile($path, $content, $mode = 'w+')
     /**
      * Get driver
      *
-     * @return \Magento\Framework\Filesystem\DriverInterface
+     * @return DriverInterface
      */
     public function getDriver()
     {

From c82ced17686aba898342654021509f197f6268bd Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Thu, 13 Aug 2020 10:46:19 -0500
Subject: [PATCH 149/671] MC-31652: File system directory write update

- Updated writeTest docblocks
---
 .../Filesystem/Directory/WriteTest.php        | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
index c01a28a9ff9bf..ca8cca878d091 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php
@@ -43,6 +43,8 @@ public function testInstance()
      * @param string $basePath
      * @param int $permissions
      * @param string $path
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testCreate($basePath, $permissions, $path)
     {
@@ -66,6 +68,11 @@ public function createProvider()
         ];
     }
 
+    /**
+     * Test for create outside
+     *
+     * @throws FileSystemException
+     */
     public function testCreateOutside()
     {
         $exceptions = 0;
@@ -93,6 +100,8 @@ public function testCreateOutside()
      *
      * @dataProvider deleteProvider
      * @param string $path
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testDelete($path)
     {
@@ -113,6 +122,11 @@ public function deleteProvider()
         return [['subdir'], ['subdir/subsubdir']];
     }
 
+    /**
+     * Test for delete outside
+     *
+     * @throws FileSystemException
+     */
     public function testDeleteOutside()
     {
         $exceptions = 0;
@@ -143,6 +157,8 @@ public function testDeleteOutside()
      * @param int $permissions
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testRename($basePath, $permissions, $name, $newName)
     {
@@ -166,6 +182,11 @@ public function renameProvider()
         return [['newDir1', 0777, 'first_name.txt', 'second_name.txt']];
     }
 
+    /**
+     * Test for rename outside
+     *
+     * @throws FileSystemException
+     */
     public function testRenameOutside()
     {
         $exceptions = 0;
@@ -200,6 +221,8 @@ public function testRenameOutside()
      * @param int $permission
      * @param string $name
      * @param string $newName
+     * @throws FileSystemException
+     * @throws ValidatorException
      */
     public function testRenameTargetDir($firstDir, $secondDir, $permission, $name, $newName)
     {
@@ -259,6 +282,11 @@ public function copyProvider()
         ];
     }
 
+    /**
+     * Test for copy outside
+     *
+     * @throws FileSystemException|ValidatorException
+     */
     public function testCopyOutside()
     {
         $exceptions = 0;
@@ -333,6 +361,8 @@ public function copyTargetDirProvider()
 
     /**
      * Test for changePermissions method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testChangePermissions()
     {
@@ -341,6 +371,11 @@ public function testChangePermissions()
         $this->assertTrue($directory->changePermissions('test_directory', 0644));
     }
 
+    /**
+     * Test for changePermissions outside
+     *
+     * @throws FileSystemException
+     */
     public function testChangePermissionsOutside()
     {
         $exceptions = 0;
@@ -365,6 +400,8 @@ public function testChangePermissionsOutside()
 
     /**
      * Test for changePermissionsRecursively method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testChangePermissionsRecursively()
     {
@@ -376,6 +413,11 @@ public function testChangePermissionsRecursively()
         $this->assertTrue($directory->changePermissionsRecursively('test_directory', 0777, 0644));
     }
 
+    /**
+     * Test for changePermissionsRecursively outside
+     *
+     * @throws FileSystemException
+     */
     public function testChangePermissionsRecursivelyOutside()
     {
         $exceptions = 0;
@@ -430,6 +472,11 @@ public function touchProvider()
         ];
     }
 
+    /**
+     * Test for touch outside
+     *
+     * @throws FileSystemException
+     */
     public function testTouchOutside()
     {
         $exceptions = 0;
@@ -454,6 +501,8 @@ public function testTouchOutside()
 
     /**
      * Test isWritable method
+     *
+     * @throws FileSystemException|ValidatorException
      */
     public function testIsWritable()
     {
@@ -463,6 +512,11 @@ public function testIsWritable()
         $this->assertTrue($directory->isWritable('bar'));
     }
 
+    /**
+     * Test isWritable method outside
+     *
+     * @throws FileSystemException
+     */
     public function testIsWritableOutside()
     {
         $exceptions = 0;
@@ -517,6 +571,11 @@ public function openFileProvider()
         ];
     }
 
+    /**
+     * Test for openFile outside
+     *
+     * @throws FileSystemException
+     */
     public function testOpenFileOutside()
     {
         $exceptions = 0;
@@ -587,6 +646,11 @@ public function writeFileProvider()
         return [['file1', '123', '456'], ['folder1/file1', '123', '456']];
     }
 
+    /**
+     * Test for writeFile outside
+     *
+     * @throws FileSystemException
+     */
     public function testWriteFileOutside()
     {
         $exceptions = 0;
@@ -610,6 +674,8 @@ public function testWriteFileOutside()
     }
 
     /**
+     * Test for invalidDeletePath
+     *
      * @throws ValidatorException
      */
     public function testInvalidDeletePath()
@@ -623,6 +689,8 @@ public function testInvalidDeletePath()
 
     /**
      * Tear down
+     *
+     * @throws ValidatorException|FileSystemException
      */
     protected function tearDown(): void
     {

From ee98385d832b4635d183946dc7f7cc916cda13b9 Mon Sep 17 00:00:00 2001
From: Anusha Vattam <avattam@adobe.com>
Date: Thu, 13 Aug 2020 14:15:13 -0500
Subject: [PATCH 150/671] MC-36617: Performance degradation on Gift Wrapping
 cart item

- Added new code changes to gift message options on ce
---
 .../Model/Resolver/Order/GiftMessage.php      |  9 ++----
 .../Quote/Guest/UpdateCartItemsTest.php       | 28 ++++++++++++++-----
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/GiftMessageGraphQl/Model/Resolver/Order/GiftMessage.php b/app/code/Magento/GiftMessageGraphQl/Model/Resolver/Order/GiftMessage.php
index aae0e3709d87f..f7dd0ca9c62f5 100644
--- a/app/code/Magento/GiftMessageGraphQl/Model/Resolver/Order/GiftMessage.php
+++ b/app/code/Magento/GiftMessageGraphQl/Model/Resolver/Order/GiftMessage.php
@@ -58,17 +58,14 @@ public function resolve(
         if (!isset($value['id'])) {
             throw new GraphQlInputException(__('"id" value should be specified'));
         }
-
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $orderId = (int)base64_decode($value['id']) ?: (int)$value['id'];
         try {
-            $orderGiftMessage = $this->orderRepository->get($value['id']);
+            $orderGiftMessage = $this->orderRepository->get($orderId);
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__('Can\'t load gift message for order'));
         }
 
-        if (!isset($orderGiftMessage)) {
-            return null;
-        }
-
         return [
             'to' => $orderGiftMessage->getRecipient() ?? '',
             'from' =>  $orderGiftMessage->getSender() ?? '',
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
index 0a22f3ca9721c..703e30314ef5f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/UpdateCartItemsTest.php
@@ -284,7 +284,10 @@ private function getCartQuery(string $maskedQuoteId)
      */
     public function testUpdateGiftMessageCartForItemNotAllow()
     {
-        $query = $this->getUpdateGiftMessageQuery();
+        $messageTo = "";
+        $messageFrom = "";
+        $message = "";
+        $query = $this->getUpdateGiftMessageQuery($messageTo, $messageFrom, $message);
         foreach ($this->graphQlMutation($query)['updateCartItems']['cart']['items'] as $item) {
             self::assertNull($item['gift_message']);
         }
@@ -297,16 +300,27 @@ public function testUpdateGiftMessageCartForItemNotAllow()
      */
     public function testUpdateGiftMessageCartForItem()
     {
-        $query = $this->getUpdateGiftMessageQuery();
+        $messageTo = "Alex";
+        $messageFrom = "Mike";
+        $message = "Best regards";
+        $query = $this->getUpdateGiftMessageQuery($messageTo, $messageFrom, $message);
         foreach ($this->graphQlMutation($query)['updateCartItems']['cart']['items'] as $item) {
             self::assertArrayHasKey('gift_message', $item);
             self::assertSame('Alex', $item['gift_message']['to']);
             self::assertSame('Mike', $item['gift_message']['from']);
-            self::assertSame('Best regards.', $item['gift_message']['message']);
+            self::assertSame('Best regards', $item['gift_message']['message']);
+        }
+        $messageTo = "";
+        $messageFrom = "";
+        $message = "";
+        $query = $this->getUpdateGiftMessageQuery($messageTo, $messageFrom, $message);
+        foreach ($this->graphQlMutation($query)['updateCartItems']['cart']['items'] as $item) {
+            self::assertArrayHasKey('gift_message', $item);
+            self::assertSame(null, $item['gift_message']);
         }
     }
 
-    private function getUpdateGiftMessageQuery()
+    private function getUpdateGiftMessageQuery(string $messageTo, string $messageFrom, string $message)
     {
         $quote = $this->quoteFactory->create();
         $this->quoteResource->load($quote, 'test_guest_order_with_gift_message', 'reserved_order_id');
@@ -323,9 +337,9 @@ private function getUpdateGiftMessageQuery()
          cart_item_id: $itemId
           quantity: 3
          gift_message: {
-            to: "Alex"
-            from: "Mike"
-            message: "Best regards."
+            to: "$messageTo"
+            from: "$messageFrom"
+            message: "$message"
           }
         }
       ]

From fdc7c9d94e368ca138c140bdf29065c77fd008d9 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 13 Aug 2020 17:38:50 -0500
Subject: [PATCH 151/671] MC-35804: Admin dashboard shows data from all stores

- refactored fix
---
 .../User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
index af923e865b3f5..868f02337dedd 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
@@ -8,9 +8,9 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminDeleteRoleActionGroup">
+    <actionGroup name="AdminDeleteRoleActionGroup" deprecated="ActionGroup duplicates existing 'AdminDeleteUserRoleActionGroup'">
         <annotations>
-            <description>Deletes a User Role. Avoid using of this ActionGroup, it duplicates existing "AdminDeleteUserRoleActionGroup"</description>
+            <description>DEPRECATED. Deletes a User Role.</description>
         </annotations>
         <arguments>
             <argument name="role" defaultValue=""/>

From 99209dad85ddf95d76d70bc7b03fdabc7de78f3c Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 13 Aug 2020 21:23:51 -0500
Subject: [PATCH 152/671] MC-35804: Admin dashboard shows data from all stores

- static fix
---
 .../User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
index 868f02337dedd..1fd4b2fa4fe65 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
@@ -8,9 +8,9 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminDeleteRoleActionGroup" deprecated="ActionGroup duplicates existing 'AdminDeleteUserRoleActionGroup'">
+    <actionGroup name="AdminDeleteRoleActionGroup">
         <annotations>
-            <description>DEPRECATED. Deletes a User Role.</description>
+            <description>DEPRECATED. Deletes a User Role. ActionGroup duplicates existing 'AdminDeleteUserRoleActionGroup'</description>
         </annotations>
         <arguments>
             <argument name="role" defaultValue=""/>

From c8f0f10950f294e7aa4f61c2c65c4a13614e3b7b Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 14 Aug 2020 11:57:07 +0300
Subject: [PATCH 153/671] MC-36717: SQLSTATE[42S02]: Base table or view not
 found while placing order

---
 app/code/Magento/Sales/Model/Order.php        | 31 ++++++-
 .../Order/Address/Collection.php              | 90 +------------------
 .../Service/V1/OrderAddressUpdateTest.php     |  4 +-
 .../Magento/Sales/Service/V1/OrderGetTest.php |  2 +-
 .../Order/Address/CollectionTest.php          |  9 +-
 5 files changed, 37 insertions(+), 99 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 0af42b0a99d09..e943d6a600ec8 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -7,6 +7,7 @@
 
 use Magento\Config\Model\Config\Source\Nooptreq;
 use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\RegionFactory;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -307,6 +308,16 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var RegionFactory
+     */
+    private $regionFactory;
+
+    /**
+     * @var array
+     */
+    private $regionItems;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -340,6 +351,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
      * @param OrderItemRepositoryInterface $itemRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param ScopeConfigInterface $scopeConfig
+     * @param RegionFactory $regionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -374,7 +386,8 @@ public function __construct(
         ProductOption $productOption = null,
         OrderItemRepositoryInterface $itemRepository = null,
         SearchCriteriaBuilder $searchCriteriaBuilder = null,
-        ScopeConfigInterface $scopeConfig = null
+        ScopeConfigInterface $scopeConfig = null,
+        RegionFactory $regionFactory = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_orderConfig = $orderConfig;
@@ -403,6 +416,8 @@ public function __construct(
         $this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
             ->get(SearchCriteriaBuilder::class);
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
+        $this->regionItems = [];
 
         parent::__construct(
             $context,
@@ -1346,9 +1361,21 @@ public function getShippingMethod($asObject = false)
      */
     public function getAddressesCollection()
     {
+        $region = $this->regionFactory->create();
         $collection = $this->_addressCollectionFactory->create()->setOrderFilter($this);
         if ($this->getId()) {
             foreach ($collection as $address) {
+                if (isset($this->regionItems[$address->getCountryId()][$address->getRegion()])) {
+                    if ($this->regionItems[$address->getCountryId()][$address->getRegion()]) {
+                        $address->setRegion($this->regionItems[$address->getCountryId()][$address->getRegion()]);
+                    }
+                } else {
+                    $region->loadByName($address->getRegion(), $address->getCountryId());
+                    $this->regionItems[$address->getCountryId()][$address->getRegion()] = $region->getName();
+                    if ($region->getName()) {
+                        $address->setRegion($region->getName());
+                    }
+                }
                 $address->setOrder($this);
             }
         }
@@ -1818,7 +1845,7 @@ public function getTotalDue()
         $total = $this->priceCurrency->round($total);
         return max($total, 0);
     }
-    
+
     /**
      * Retrieve order total due value
      *
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
index f2a28b613cfea..5cc170c8bfa4b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
@@ -7,15 +7,8 @@
 
 use Magento\Sales\Api\Data\OrderAddressSearchResultInterface;
 use Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Data\Collection\EntityFactoryInterface;
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\App\ObjectManager;
-use Psr\Log\LoggerInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\ResourceModel\Order\Address as AddressResource;
 
 /**
  * Order addresses collection
@@ -36,44 +29,6 @@ class Collection extends AbstractCollection implements OrderAddressSearchResultI
      */
     protected $_eventObject = 'order_address_collection';
 
-    /**
-     * @var ResolverInterface
-     */
-    private $localeResolver;
-
-    /**
-     * @param EntityFactoryInterface $entityFactory
-     * @param LoggerInterface $logger
-     * @param FetchStrategyInterface $fetchStrategy
-     * @param ManagerInterface $eventManager
-     * @param Snapshot $entitySnapshot
-     * @param AdapterInterface|null $connection
-     * @param AbstractDb|null $resource
-     * @param ResolverInterface|null $localeResolver
-     */
-    public function __construct(
-        EntityFactoryInterface $entityFactory,
-        LoggerInterface $logger,
-        FetchStrategyInterface $fetchStrategy,
-        ManagerInterface $eventManager,
-        Snapshot $entitySnapshot,
-        AdapterInterface $connection = null,
-        AbstractDb $resource = null,
-        ResolverInterface $localeResolver = null
-    ) {
-        $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()
-            ->get(ResolverInterface::class);
-        parent::__construct(
-            $entityFactory,
-            $logger,
-            $fetchStrategy,
-            $eventManager,
-            $entitySnapshot,
-            $connection,
-            $resource
-        );
-    }
-
     /**
      * Model initialization
      *
@@ -82,21 +37,11 @@ public function __construct(
     protected function _construct()
     {
         $this->_init(
-            \Magento\Sales\Model\Order\Address::class,
-            \Magento\Sales\Model\ResourceModel\Order\Address::class
+            Address::class,
+            AddressResource::class
         );
     }
 
-    /**
-     * @inheritdoc
-     */
-    protected function _initSelect()
-    {
-        parent::_initSelect();
-        $this->joinRegions();
-        return $this;
-    }
-
     /**
      * Redeclare after load method for dispatch event
      *
@@ -110,31 +55,4 @@ protected function _afterLoad()
 
         return $this;
     }
-
-    /**
-     * Join region name table with current locale
-     *
-     * @return $this
-     */
-    private function joinRegions()
-    {
-        $locale = $this->localeResolver->getLocale();
-        $connection = $this->getConnection();
-
-        $defaultNameExpr = $connection->getIfNullSql(
-            $connection->quoteIdentifier('rct.default_name'),
-            $connection->quoteIdentifier('main_table.region')
-        );
-        $expression = $connection->getIfNullSql($connection->quoteIdentifier('rnt.name'), $defaultNameExpr);
-
-        $regionId = $connection->quoteIdentifier('main_table.region_id');
-        $condition = $connection->quoteInto("rnt.locale=?", $locale);
-        $rctTable = $this->getTable('directory_country_region');
-        $rntTable = $this->getTable('directory_country_region_name');
-
-        $this->getSelect()
-            ->joinLeft(['rct' => $rctTable], "rct.region_id={$regionId}", [])
-            ->joinLeft(['rnt' => $rntTable], "rnt.region_id={$regionId} AND {$condition}", ['region' => $expression]);
-        return $this;
-    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php
index c5b06285f1fe1..ef47b8819f73b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderAddressUpdateTest.php
@@ -29,7 +29,7 @@ public function testOrderAddressUpdate()
         $order = $objectManager->get(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001');
 
         $address = [
-            OrderAddress::REGION => 'California',
+            OrderAddress::REGION => 'CA',
             OrderAddress::POSTCODE => '11111',
             OrderAddress::LASTNAME => 'lastname',
             OrderAddress::STREET => ['street'],
@@ -76,7 +76,7 @@ public function testOrderAddressUpdate()
         $billingAddress = $actualOrder->getBillingAddress();
 
         $validate = [
-            OrderAddress::REGION => 'California',
+            OrderAddress::REGION => 'CA',
             OrderAddress::POSTCODE => '11111',
             OrderAddress::LASTNAME => 'lastname',
             OrderAddress::STREET => 'street',
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
index e28cca72e8fb8..021698f874e55 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/OrderGetTest.php
@@ -76,7 +76,7 @@ public function testOrderGet(): void
             'city' => 'Los Angeles',
             'email' => 'customer@null.com',
             'postcode' => '11111',
-            'region' => 'California'
+            'region' => 'CA'
         ];
 
         $result = $this->makeServiceCall(self::ORDER_INCREMENT_ID);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Address/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Address/CollectionTest.php
index 52284b3c9ddf9..6d3739d4bbf51 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Address/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/ResourceModel/Order/Address/CollectionTest.php
@@ -29,11 +29,6 @@ class CollectionTest extends TestCase
      */
     private $localeResolverMock;
 
-    /**
-     * @var CollectionFactory
-     */
-    private $addressCollectionFactory;
-
     /**
      * @inheritdoc
      */
@@ -78,8 +73,6 @@ protected function setUp(): void
             ->setStoreId(Bootstrap::getObjectManager()->get(StoreManagerInterface::class)->getStore()->getId())
             ->setPayment($payment);
         $order->save();
-
-        $this->addressCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
     }
 
     /**
@@ -93,7 +86,7 @@ public function testCollectionWithJpLocale(): void
         $order = Bootstrap::getObjectManager()->create(Order::class)
             ->loadByIncrementId('100000001');
 
-        $collection = $this->addressCollectionFactory->create()->setOrderFilter($order);
+        $collection = $order->getAddressesCollection();
         foreach ($collection as $address) {
             $this->assertEquals('アラバマ', $address->getData(OrderAddress::REGION));
         }

From 0471e4e9bd296d6b4872cb450b6e95795060e928 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Fri, 14 Aug 2020 15:15:57 +0300
Subject: [PATCH 154/671] add MFTF test

---
 ...atchToProductWithOutCreatedActionGroup.xml | 43 +++++++++
 ...lSwatchOptionOnCategoryPageActionGroup.xml | 19 ++++
 ...orefrontCategoryPageProductInfoSection.xml | 15 +++
 ...oductToWishlistCategoryPageActionGroup.xml | 24 +++++
 ...tionsConfigurableProductInWishlistTest.xml | 91 +++++++++++++++++++
 5 files changed, 192 insertions(+)
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml
 create mode 100644 app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToWishlistCategoryPageActionGroup.xml
 create mode 100644 app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckOptionsConfigurableProductInWishlistTest.xml

diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml
new file mode 100644
index 0000000000000..604ef606e94e5
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml
@@ -0,0 +1,43 @@
+<?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="AddVisualSwatchToProductWithOutCreatedActionGroup">
+        <annotations>
+            <description>Does not create an attribute. Adds the provided Visual Swatch Attribute and Options (2) to a Product on the Admin Product creation/edit page. Clicks on Save. Validates that the Success Message is present. </description>
+        </annotations>
+        <arguments>
+            <argument name="attribute" defaultValue="visualSwatchAttribute"/>
+        </arguments>
+
+        <seeInCurrentUrl url="{{ProductCatalogPage.url}}" stepKey="seeOnProductEditPage"/>
+        <conditionalClick selector="{{AdminProductFormConfigurationsSection.sectionHeader}}" dependentSelector="{{AdminProductFormConfigurationsSection.createConfigurations}}" visible="false" stepKey="openConfigurationSection"/>
+        <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="openConfigurationPanel"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForSlideOut"/>
+
+        <!--Find attribute in grid and select-->
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="clickOnFilters"/>
+        <fillField selector="{{AdminDataGridHeaderSection.attributeCodeFilterInput}}" userInput="{{attribute.default_label}}" stepKey="fillFilterAttributeCodeField"/>
+        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickApplyFiltersButton"/>
+        <click selector="{{AdminDataGridTableSection.rowCheckbox('1')}}" stepKey="clickOnFirstCheckbox"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep1"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute(attribute.default_label)}}" stepKey="clickSelectAll"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickNextStep2"/>
+
+        <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
+        <fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="100" stepKey="enterAttributeQuantity"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextStep3"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="generateProducts"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..5722210abf211
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml
@@ -0,0 +1,19 @@
+<?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">
+    <!--Click a swatch option on product page-->
+    <actionGroup name="StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup">
+        <arguments>
+            <argument name="productId" type="string"/>
+            <argument name="visualSwatchOptionLabel" type="string" />
+        </arguments>
+        <click selector="{{StorefrontCategoryPageProductInfoSection.visualSwatchOption(productId,visualSwatchOptionLabel)}}" stepKey="clickSwatchOption"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml
new file mode 100644
index 0000000000000..5f321c7f17603
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="StorefrontCategoryPageProductInfoSection">
+        <element name="visualSwatchOption" type="button" selector="#product-item-info_{{var1}} .swatch-option[data-option-label='{{var2}}']" parameterized="true"/>
+        <element name="productAddToWishlist" type="button" selector="#product-item-info_{{var1}} .action.towishlist" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToWishlistCategoryPageActionGroup.xml b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToWishlistCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..baa4bfcab4ebc
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/ActionGroup/StorefrontCustomerAddProductToWishlistCategoryPageActionGroup.xml
@@ -0,0 +1,24 @@
+<?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="StorefrontCustomerAddProductToWishlistCategoryPageActionGroup">
+        <annotations>
+            <description>Adds the provided Product to the Wish List from the Storefront Category page. Validates that the Success Message is present and correct.</description>
+        </annotations>
+        <arguments>
+            <argument name="productVar"/>
+        </arguments>
+
+        <click selector="{{StorefrontCategoryPageProductInfoSection.productAddToWishlist(productVar.id)}}" stepKey="addProductToWishlistClickAddToWishlist"/>
+        <waitForElement selector="{{StorefrontCustomerWishlistSection.successMsg}}" time="30" stepKey="addProductToWishlistWaitForSuccessMessage"/>
+        <see selector="{{StorefrontCustomerWishlistSection.successMsg}}" userInput="{{productVar.name}} has been added to your Wish List. Click here to continue shopping." stepKey="addProductToWishlistSeeProductNameAddedToWishlist"/>
+        <seeCurrentUrlMatches regex="~/wishlist_id/\d+/$~" stepKey="seeCurrentUrlMatches"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckOptionsConfigurableProductInWishlistTest.xml b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckOptionsConfigurableProductInWishlistTest.xml
new file mode 100644
index 0000000000000..638c8f4986a77
--- /dev/null
+++ b/app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontCheckOptionsConfigurableProductInWishlistTest.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCheckOptionsConfigurableProductInWishlistTest">
+        <annotations>
+            <stories value="Wishlist"/>
+            <title value="Move first Configurable Product with selected optional from Category Page to Wishlist."/>
+            <description value="Move first Configurable Product with selected optional from Category Page to Wishlist. On Page will be present minimum two Configurable Product"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-14211"/>
+            <group value="wishlist"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiConfigurableProduct" stepKey="createFirstConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="ApiConfigurableProduct" stepKey="createSecondConfigProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteFirstProducts">
+                <argument name="sku" value="$$createFirstConfigProduct.sku$$"/>
+            </actionGroup>
+            <actionGroup ref="DeleteProductBySkuActionGroup" stepKey="deleteSecondProducts">
+                <argument name="sku" value="$$createSecondConfigProduct.sku$$"/>
+            </actionGroup>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminDeleteProductAttributeByLabelActionGroup" stepKey="deleteAttribute" >
+                <argument name="productAttributeLabel" value="{{visualSwatchAttribute.default_label}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+                <argument name="tags" value=""/>
+            </actionGroup>
+        </after>
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToFirstConfigProductPage">
+            <argument name="productId" value="$$createFirstConfigProduct.id$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForFirstProductPageLoad"/>
+        <actionGroup ref="AddVisualSwatchToProductWithStorefrontConfigActionGroup" stepKey="addSwatchToFirstProduct">
+            <argument name="attribute" value="visualSwatchAttribute"/>
+            <argument name="option1" value="visualSwatchOption1"/>
+            <argument name="option2" value="visualSwatchOption2"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToSecondConfigProductPage">
+            <argument name="productId" value="$$createSecondConfigProduct.id$$"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForSecondProductPageLoad"/>
+        <actionGroup ref="AddVisualSwatchToProductWithOutCreatedActionGroup" stepKey="addSwatchToSecondProduct">
+            <argument name="attribute" value="visualSwatchAttribute"/>
+        </actionGroup>
+
+        <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+            <argument name="Customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" stepKey="openCategoryPage">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup" stepKey="selectVisualSwatch">
+            <argument name="productId" value="$$createFirstConfigProduct.id$$" />
+            <argument name="visualSwatchOptionLabel" value="{{visualSwatchOption1.default_label}}" />
+        </actionGroup>
+        <actionGroup ref="StorefrontCustomerAddProductToWishlistCategoryPageActionGroup" stepKey="addToWishlistProduct">
+            <argument name="productVar" value="$$createFirstConfigProduct$$"/>
+        </actionGroup>
+
+        <seeElement selector="{{StorefrontCustomerWishlistProductSection.productSeeDetailsByName($$createFirstConfigProduct.name$$)}}" stepKey="seeDetails"/>
+    </test>
+</tests>

From 2daec13511986f51576b5991639857081ae683d9 Mon Sep 17 00:00:00 2001
From: Nikita Shcherbatykh <nikita.shcherbatykh@transoftgroup.com>
Date: Fri, 14 Aug 2020 15:18:41 +0300
Subject: [PATCH 155/671] MC-36717: SQLSTATE[42S02]: Base table or view not
 found while placing order

---
 app/code/Magento/Sales/Model/Order.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index e943d6a600ec8..f899bab8d9fc6 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -2079,7 +2079,7 @@ public function getStoreGroupName()
     {
         $storeId = $this->getStoreId();
         if ($storeId === null) {
-            return $this->getStoreName(1);
+            return $this->getStoreName();
         }
         return $this->getStore()->getGroup()->getName();
     }

From 59b4c536405d3617d585b6837839d0c7c1d5930e Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Fri, 14 Aug 2020 07:32:09 -0500
Subject: [PATCH 156/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/etc/di.xml | 4 ++++
 app/etc/di.xml                  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index c18aadd3f6a80..0d0839365cc6a 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -284,6 +284,7 @@
                 <item name="img" xsi:type="string">img</item>
                 <item name="hr" xsi:type="string">hr</item>
                 <item name="figure" xsi:type="string">figure</item>
+                <item name="button" xsi:type="string">button</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>
@@ -302,6 +303,9 @@
                 <item name="img" xsi:type="array">
                     <item name="src" xsi:type="string">src</item>
                 </item>
+                <item name="button" xsi:type="array">
+                    <item name="type" xsi:type="string">type</item>
+                </item>
             </argument>
             <argument name="attributeValidators" xsi:type="array">
                 <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index f3dac922b5a2d..1a33ac6597a3f 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -1858,6 +1858,7 @@
                 <item name="img" xsi:type="string">img</item>
                 <item name="hr" xsi:type="string">hr</item>
                 <item name="figure" xsi:type="string">figure</item>
+                <item name="button" xsi:type="string">button</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>
@@ -1876,6 +1877,9 @@
                 <item name="img" xsi:type="array">
                     <item name="src" xsi:type="string">src</item>
                 </item>
+                <item name="button" xsi:type="array">
+                    <item name="type" xsi:type="string">type</item>
+                </item>
             </argument>
             <argument name="attributeValidators" xsi:type="array">
                 <item name="style" xsi:type="object">Magento\Framework\Validator\HTML\StyleAttributeValidator</item>

From 3b941a60b546f0a9397a5b20738cf3d49df83aea Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 14 Aug 2020 12:16:16 -0500
Subject: [PATCH 157/671] MC-36748: strpos() expects parameter 1 to be string,
 bool given

---
 lib/internal/Magento/Framework/App/ResourceConnection.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/App/ResourceConnection.php b/lib/internal/Magento/Framework/App/ResourceConnection.php
index 00dc88dcd7b17..3ba50fb396a4c 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection.php
@@ -178,7 +178,7 @@ public function getTableName($modelEntity, $connectionName = self::DEFAULT_CONNE
             list($modelEntity, $tableSuffix) = $modelEntity;
         }
 
-        $tableName = $modelEntity;
+        $tableName = (string)$modelEntity;
 
         $mappedTableName = $this->getMappedTableName($tableName);
         if ($mappedTableName) {

From 45bbf367765c12e8e58bc59cea47bf85dc39d428 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@magento.com>
Date: Fri, 14 Aug 2020 14:51:31 -0500
Subject: [PATCH 158/671] MC-36748: strpos() expects parameter 1 to be string,
 bool given

---
 .../Test/Unit/App/ResourceConnectionTest.php  | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php b/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
index 1b12d68e683a3..67d5e303c6896 100644
--- a/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
+++ b/lib/internal/Magento/Framework/Test/Unit/App/ResourceConnectionTest.php
@@ -84,7 +84,7 @@ public function testGetTablePrefixWithInjectedPrefix()
 
     public function testGetTablePrefix()
     {
-        $this->deploymentConfigMock->expects(self::once())
+        $this->deploymentConfigMock->expects($this->once())
             ->method('get')
             ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX)
             ->willReturn('pref_');
@@ -93,10 +93,10 @@ public function testGetTablePrefix()
 
     public function testGetConnectionByName()
     {
-        $this->deploymentConfigMock->expects(self::once())->method('get')
+        $this->deploymentConfigMock->expects($this->once())->method('get')
             ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/default')
             ->willReturn(['config']);
-        $this->connectionFactoryMock->expects(self::once())->method('create')
+        $this->connectionFactoryMock->expects($this->once())->method('create')
             ->with(['config'])
             ->willReturn('connection');
 
@@ -112,15 +112,38 @@ public function testGetExistingConnectionByName()
                 'connections' => ['default_process_' . getmypid() => 'existing_connection']
             ]
         );
-        $this->deploymentConfigMock->expects(self::never())->method('get');
+        $this->deploymentConfigMock->expects($this->never())->method('get');
 
         self::assertEquals('existing_connection', $unit->getConnectionByName('default'));
     }
 
     public function testCloseConnection()
     {
-        $this->configMock->expects(self::once())->method('getConnectionName')->with('default');
+        $this->configMock->expects($this->once())->method('getConnectionName')->with('default');
 
         $this->unit->closeConnection('default');
     }
+
+    public function testGetTableNameWithBoolParam()
+    {
+        $this->deploymentConfigMock->expects($this->at(0))
+            ->method('get')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_DB_PREFIX)
+            ->willReturn('pref_');
+        $this->deploymentConfigMock->expects($this->at(1))->method('get')
+            ->with('db/connection/default')
+            ->willReturn(['config']);
+        $this->configMock->expects($this->atLeastOnce())
+            ->method('getConnectionName')
+            ->with('default')
+            ->willReturn('default');
+
+        $connection = $this->getMockBuilder(\Magento\Framework\DB\Adapter\AdapterInterface::class)->getMock();
+        $connection->expects($this->once())->method('getTableName')->with('pref_1');
+        $this->connectionFactoryMock->expects($this->once())->method('create')
+            ->with(['config'])
+            ->willReturn($connection);
+
+        $this->unit->getTableName(true);
+    }
 }

From 93b25f1773ff1a774703fc2086ad0020fa9cec81 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Mon, 17 Aug 2020 10:25:37 +0300
Subject: [PATCH 159/671] MC-36049: Fixed Product Tax attribute is displayed on
 a product page after it was unassigned from the attribute set

---
 .../Catalog/Model/ResourceModel/Attribute.php |  47 ++-----
 .../Attribute/RemoveProductAttributeData.php  |  70 ++++++++++
 .../Attribute/RemoveProductWeeData.php        |  63 +++++++++
 app/code/Magento/Weee/etc/di.xml              |   3 +
 .../Weee/Model/Attribute/Set/SaveTest.php     | 122 ++++++++++++++++++
 5 files changed, 270 insertions(+), 35 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php
 create mode 100644 app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Weee/Model/Attribute/Set/SaveTest.php

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
index 8457e5d0eaa5c..778ca5b660060 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\Catalog\Model\ResourceModel;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Attribute\LockValidatorInterface;
+use Magento\Catalog\Model\ResourceModel\Attribute\RemoveProductAttributeData;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Catalog attribute resource model
@@ -28,9 +29,9 @@ class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
     protected $attrLockValidator;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var RemoveProductAttributeData|null
      */
-    protected $metadataPool;
+    private $removeProductAttributeData;
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
@@ -38,7 +39,8 @@ class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
      * @param \Magento\Eav\Model\ResourceModel\Entity\Type $eavEntityType
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param LockValidatorInterface $lockValidator
-     * @param string $connectionName
+     * @param string|null $connectionName
+     * @param RemoveProductAttributeData|null $removeProductAttributeData
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -46,10 +48,14 @@ public function __construct(
         \Magento\Eav\Model\ResourceModel\Entity\Type $eavEntityType,
         \Magento\Eav\Model\Config $eavConfig,
         LockValidatorInterface $lockValidator,
-        $connectionName = null
+        $connectionName = null,
+        RemoveProductAttributeData $removeProductAttributeData = null
     ) {
         $this->attrLockValidator = $lockValidator;
         $this->_eavConfig = $eavConfig;
+        $this->removeProductAttributeData = $removeProductAttributeData ?? ObjectManager::getInstance()
+            ->get(RemoveProductAttributeData::class);
+
         parent::__construct($context, $storeManager, $eavEntityType, $connectionName);
     }
 
@@ -135,24 +141,7 @@ public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
                 );
             }
 
-            $backendTable = $attribute->getBackend()->getTable();
-            if ($backendTable) {
-                $linkField = $this->getMetadataPool()
-                    ->getMetadata(ProductInterface::class)
-                    ->getLinkField();
-
-                $backendLinkField = $attribute->getBackend()->getEntityIdField();
-
-                $select = $this->getConnection()->select()
-                    ->from(['b' => $backendTable])
-                    ->join(
-                        ['e' => $attribute->getEntity()->getEntityTable()],
-                        "b.$backendLinkField = e.$linkField"
-                    )->where('b.attribute_id = ?', $attribute->getId())
-                    ->where('e.attribute_set_id = ?', $result['attribute_set_id']);
-
-                $this->getConnection()->query($select->deleteFromSelect('b'));
-            }
+            $this->removeProductAttributeData->execute($object, (int)$result['attribute_set_id']);
         }
 
         $condition = ['entity_attribute_id = ?' => $object->getEntityAttributeId()];
@@ -160,16 +149,4 @@ public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
 
         return $this;
     }
-
-    /**
-     * @return \Magento\Framework\EntityManager\MetadataPool
-     */
-    private function getMetadataPool()
-    {
-        if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
-        }
-        return $this->metadataPool;
-    }
 }
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php
new file mode 100644
index 0000000000000..0db57fa66bdd6
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel\Attribute;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Class for deleting data from attribute additional table by attribute set id.
+ */
+class RemoveProductAttributeData
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection,
+        MetadataPool $metadataPool
+    ) {
+        $this->resourceConnection = $resourceConnection;
+        $this->metadataPool = $metadataPool;
+    }
+
+    /**
+     * Deletes data from attribute table by attribute set id.
+     *
+     * @param AbstractModel $object
+     * @param int $attributeSetId
+     * @return void
+     */
+    public function execute(AbstractModel $object, int $attributeSetId): void
+    {
+        $backendTable = $object->getBackend()->getTable();
+        if ($backendTable) {
+            $linkField = $this->metadataPool
+                ->getMetadata(ProductInterface::class)
+                ->getLinkField();
+
+            $backendLinkField = $object->getBackend()->getEntityIdField();
+
+            $select = $this->resourceConnection->getConnection()->select()
+                ->from(['b' => $backendTable])
+                ->join(
+                    ['e' => $object->getEntity()->getEntityTable()],
+                    "b.$backendLinkField = e.$linkField"
+                )->where('b.attribute_id = ?', $object->getId())
+                ->where('e.attribute_set_id = ?', $attributeSetId);
+
+            $this->resourceConnection->getConnection()->query($select->deleteFromSelect('b'));
+        }
+    }
+}
diff --git a/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php
new file mode 100644
index 0000000000000..4a113848fbb17
--- /dev/null
+++ b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Plugin\Catalog\ResourceModel\Attribute;
+
+use Magento\Catalog\Model\ResourceModel\Attribute\RemoveProductAttributeData;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Model\AbstractModel;
+
+/**
+ * Plugin for deleting wee tax attributes data on unassigning weee attribute from attribute set.
+ */
+class RemoveProductWeeData
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @param ResourceConnection $resourceConnection
+     */
+    public function __construct(
+        ResourceConnection $resourceConnection
+    ) {
+        $this->resourceConnection = $resourceConnection;
+    }
+
+    /**
+     * Deletes wee tax attributes data on unassigning weee attribute from attribute set.
+     *
+     * @param RemoveProductAttributeData $subject
+     * @param \Closure $proceed
+     * @param AbstractModel $object
+     * @param int $attributeSetId
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundExecute(
+        RemoveProductAttributeData $subject,
+        \Closure $proceed,
+        AbstractModel $object,
+        int $attributeSetId
+    ) {
+        if ($object->getFrontendInput() == 'weee') {
+            $select =$this->resourceConnection->getConnection()->select()
+                ->from(['b' => $this->resourceConnection->getTableName('weee_tax')])
+                ->join(
+                    ['e' => $object->getEntity()->getEntityTable()],
+                    'b.entity_id = e.entity_id'
+                )->where('b.attribute_id = ?', $object->getAttributeId())
+                ->where('e.attribute_set_id = ?', $attributeSetId);
+
+            $this->resourceConnection->getConnection()->query($select->deleteFromSelect('b'));
+        } else {
+            $proceed($object, $attributeSetId);
+        }
+    }
+}
diff --git a/app/code/Magento/Weee/etc/di.xml b/app/code/Magento/Weee/etc/di.xml
index 8b433163cad22..ccc849f4d8493 100644
--- a/app/code/Magento/Weee/etc/di.xml
+++ b/app/code/Magento/Weee/etc/di.xml
@@ -81,4 +81,7 @@
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper">
         <plugin name="weeeAttributeOptionsProcess" type="Magento\Weee\Plugin\Catalog\Controller\Adminhtml\Product\Initialization\Helper\ProcessTaxAttribute"/>
     </type>
+    <type name="Magento\Catalog\Model\ResourceModel\Attribute\RemoveProductAttributeData">
+        <plugin name="removeWeeAttributesData" type="Magento\Weee\Plugin\Catalog\ResourceModel\Attribute\RemoveProductWeeData" />
+    </type>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Weee/Model/Attribute/Set/SaveTest.php b/dev/tests/integration/testsuite/Magento/Weee/Model/Attribute/Set/SaveTest.php
new file mode 100644
index 0000000000000..628e681dfabd8
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Weee/Model/Attribute/Set/SaveTest.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Weee\Model\Attribute\Set;
+
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\SetRepository;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Type;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Eav\Model\ResourceModel\GetEntityIdByAttributeId;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Weee\Model\ResourceModel\Tax as WeeTaxResource;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test checks that wee attributes data was deleted after unassigning wee attributes from attribute set.
+ *
+ * @magentoDbIsolation enabled
+ * @magentoDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+ * @magentoDataFixture Magento/Weee/_files/product_with_fpt.php
+ */
+class SaveTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Type
+     */
+    private $productEntityType;
+
+    /**
+     * @var GetEntityIdByAttributeId
+     */
+    private $getEntityIdByAttributeId;
+
+    /**
+     * @var SetRepository
+     */
+    private $setRepository;
+
+    /**
+     * @var Config
+     */
+    private $eavConfig;
+
+    /**
+     * @var WeeTaxResource
+     */
+    private $taxResource;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productEntityType = $this->objectManager->get(Type::class)
+            ->loadByCode(ProductAttributeInterface::ENTITY_TYPE_CODE);
+        $this->getEntityIdByAttributeId = $this->objectManager->get(GetEntityIdByAttributeId::class);
+        $this->setRepository = $this->objectManager->get(SetRepository::class);
+        $this->eavConfig = $this->objectManager->get(Config::class);
+        $this->taxResource = $this->objectManager->get(WeeTaxResource::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+    }
+
+    /**
+     * @return void
+     */
+    public function testSaveAttributeSet(): void
+    {
+        $fptAttribute = $this->eavConfig->getAttribute(ProductAttributeInterface::ENTITY_TYPE_CODE, 'fpt_for_all');
+        $attributeSet = $this->setRepository->get($this->productEntityType->getDefaultAttributeSetId());
+        $entityAttributeId = $this->getEntityIdByAttributeId->execute(
+            (int)$attributeSet->getAttributeSetId(),
+            (int)$fptAttribute->getAttributeId(),
+            (int)$attributeSet->getDefaultGroupId($attributeSet->getAttributeSetId())
+        );
+        $attributeSet->organizeData(['attribute_set_name' => 'Default', 'not_attributes' => [$entityAttributeId]]);
+        $this->setRepository->save($attributeSet);
+        $this->assertEmpty(
+            $this->getWeeTaxDataByAttributeAndProduct(
+                (int)$this->productRepository->get('simple-with-ftp')->getId(),
+                (int)$fptAttribute->getAttributeId()
+            )
+        );
+    }
+
+    /**
+     * Loads data from wee_tax table.
+     *
+     * @param int $productId
+     * @param int $attributeId
+     * @return array
+     */
+    private function getWeeTaxDataByAttributeAndProduct(int $productId, int $attributeId): array
+    {
+        $select = $this->taxResource->getConnection()
+            ->select()
+            ->from(['main' => $this->taxResource->getMainTable()])
+            ->where('entity_id = ?', $productId)
+            ->where('attribute_id = ?', $attributeId);
+
+        return $this->taxResource->getConnection()->fetchAll($select);
+    }
+}

From 5aa786c97ffbc59116b63fb96dbfae746f0bb27c Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Mon, 17 Aug 2020 11:31:55 +0300
Subject: [PATCH 160/671] MC-36049: Fixed Product Tax attribute is displayed on
 a product page after it was unassigned from the attribute set

---
 .../Model/ResourceModel/AttributeTest.php     | 59 ++++---------------
 1 file changed, 12 insertions(+), 47 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
index abe6949d87b90..6c8fffff88da5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
@@ -8,17 +8,15 @@
 
 namespace Magento\Catalog\Test\Unit\Model\ResourceModel;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Attribute\LockValidatorInterface;
 use Magento\Catalog\Model\ResourceModel\Attribute;
+use Magento\Catalog\Model\ResourceModel\Attribute\RemoveProductAttributeData;
 use Magento\Eav\Model\Config;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend;
 use Magento\Eav\Model\ResourceModel\Entity\Type;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface as Adapter;
-use Magento\Framework\EntityManager\EntityMetadataInterface;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\ResourceConnections\DB\Select;
@@ -72,9 +70,9 @@ class AttributeTest extends TestCase
     private $lockValidatorMock;
 
     /**
-     * @var EntityMetadataInterface|MockObject
+     * @var RemoveProductAttributeData|MockObject
      */
-    private $entityMetaDataInterfaceMock;
+    private $removeProductAttributeDataMock;
 
     /**
      * @inheritDoc
@@ -88,13 +86,7 @@ protected function setUp(): void
 
         $this->connectionMock = $this->getMockBuilder(Adapter::class)
             ->getMockForAbstractClass();
-        $this->connectionMock->expects($this->once())->method('select')->willReturn($this->selectMock);
-        $this->connectionMock->expects($this->once())->method('query')->willReturn($this->selectMock);
         $this->connectionMock->expects($this->once())->method('delete')->willReturn($this->selectMock);
-        $this->selectMock->expects($this->once())->method('from')->willReturnSelf();
-        $this->selectMock->expects($this->once())->method('join')->willReturnSelf();
-        $this->selectMock->expects($this->any())->method('where')->willReturnSelf();
-        $this->selectMock->expects($this->any())->method('deleteFromSelect')->willReturnSelf();
 
         $this->resourceMock = $this->getMockBuilder(ResourceConnection::class)
             ->disableOriginalConstructor()
@@ -117,26 +109,10 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['validate'])
             ->getMockForAbstractClass();
-        $this->entityMetaDataInterfaceMock = $this->getMockBuilder(EntityMetadataInterface::class)
+        $this->removeProductAttributeDataMock = $this->getMockBuilder(RemoveProductAttributeData::class)
+            ->setMethods(['execute'])
             ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-    }
-
-    /**
-     * Sets object non-public property.
-     *
-     * @param mixed $object
-     * @param string $propertyName
-     * @param mixed $value
-     *
-     * @return void
-     */
-    private function setObjectProperty($object, string $propertyName, $value) : void
-    {
-        $reflectionClass = new \ReflectionClass($object);
-        $reflectionProperty = $reflectionClass->getProperty($propertyName);
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($object, $value);
+            ->getMock();
     }
 
     /**
@@ -159,7 +135,7 @@ public function testDeleteEntity() : void
         $backendFieldName = 'value_id';
 
         $attributeModel = $this->getMockBuilder(Attribute::class)
-            ->setMethods(['getEntityAttribute', 'getMetadataPool', 'getConnection', 'getTable'])
+            ->setMethods(['getEntityAttribute', 'getConnection', 'getTable'])
             ->setConstructorArgs([
                 $this->contextMock,
                 $this->storeManagerMock,
@@ -167,17 +143,12 @@ public function testDeleteEntity() : void
                 $this->eavConfigMock,
                 $this->lockValidatorMock,
                 null,
+                $this->removeProductAttributeDataMock
             ])->getMock();
         $attributeModel->expects($this->any())
             ->method('getEntityAttribute')
             ->with($entityAttributeId)
             ->willReturn($result);
-        $metadataPoolMock = $this->getMockBuilder(MetadataPool::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getMetadata'])
-            ->getMock();
-
-        $this->setObjectProperty($attributeModel, 'metadataPool', $metadataPoolMock);
 
         $eavAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
             ->disableOriginalConstructor()
@@ -204,7 +175,7 @@ public function testDeleteEntity() : void
 
         $backendModelMock = $this->getMockBuilder(AbstractBackend::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getBackend', 'getTable', 'getEntityIdField'])
+            ->setMethods(['getBackend', 'getTable'])
             ->getMock();
 
         $abstractAttributeMock = $this->getMockBuilder(AbstractAttribute::class)
@@ -216,16 +187,10 @@ public function testDeleteEntity() : void
         $eavAttributeMock->expects($this->any())->method('getEntity')->willReturn($abstractAttributeMock);
 
         $backendModelMock->expects($this->any())->method('getTable')->willReturn($backendTableName);
-        $backendModelMock->expects($this->once())->method('getEntityIdField')->willReturn($backendFieldName);
-
-        $metadataPoolMock->expects($this->any())
-            ->method('getMetadata')
-            ->with(ProductInterface::class)
-            ->willReturn($this->entityMetaDataInterfaceMock);
 
-        $this->entityMetaDataInterfaceMock->expects($this->any())
-            ->method('getLinkField')
-            ->willReturn('row_id');
+        $this->removeProductAttributeDataMock->expects($this->once())
+            ->method('execute')
+            ->with($abstractModelMock, $result['attribute_set_id']);
 
         $attributeModel->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
         $attributeModel->expects($this->any())

From d27b464d5f4463cd5e7dd090774f72e9e0ed33d5 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Mon, 17 Aug 2020 13:45:13 +0300
Subject: [PATCH 161/671] MC-36049: Fixed Product Tax attribute is displayed on
 a product page after it was unassigned from the attribute set

---
 app/code/Magento/Catalog/Model/ResourceModel/Attribute.php   | 4 +---
 .../ResourceModel/Attribute/RemoveProductAttributeData.php   | 2 +-
 .../Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php  | 5 ++---
 .../Catalog/ResourceModel/Attribute/RemoveProductWeeData.php | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
index 778ca5b660060..203126cf1fd8c 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute.php
@@ -11,8 +11,6 @@
 
 /**
  * Catalog attribute resource model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Attribute extends \Magento\Eav\Model\ResourceModel\Entity\Attribute
 {
@@ -141,7 +139,7 @@ public function deleteEntity(\Magento\Framework\Model\AbstractModel $object)
                 );
             }
 
-            $this->removeProductAttributeData->execute($object, (int)$result['attribute_set_id']);
+            $this->removeProductAttributeData->removeData($object, (int)$result['attribute_set_id']);
         }
 
         $condition = ['entity_attribute_id = ?' => $object->getEntityAttributeId()];
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php b/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php
index 0db57fa66bdd6..2782047902048 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Attribute/RemoveProductAttributeData.php
@@ -46,7 +46,7 @@ public function __construct(
      * @param int $attributeSetId
      * @return void
      */
-    public function execute(AbstractModel $object, int $attributeSetId): void
+    public function removeData(AbstractModel $object, int $attributeSetId): void
     {
         $backendTable = $object->getBackend()->getTable();
         if ($backendTable) {
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
index 6c8fffff88da5..2cbee50b5f590 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/AttributeTest.php
@@ -110,7 +110,7 @@ protected function setUp(): void
             ->setMethods(['validate'])
             ->getMockForAbstractClass();
         $this->removeProductAttributeDataMock = $this->getMockBuilder(RemoveProductAttributeData::class)
-            ->setMethods(['execute'])
+            ->setMethods(['removeData'])
             ->disableOriginalConstructor()
             ->getMock();
     }
@@ -132,7 +132,6 @@ public function testDeleteEntity() : void
         ];
 
         $backendTableName = 'weee_tax';
-        $backendFieldName = 'value_id';
 
         $attributeModel = $this->getMockBuilder(Attribute::class)
             ->setMethods(['getEntityAttribute', 'getConnection', 'getTable'])
@@ -189,7 +188,7 @@ public function testDeleteEntity() : void
         $backendModelMock->expects($this->any())->method('getTable')->willReturn($backendTableName);
 
         $this->removeProductAttributeDataMock->expects($this->once())
-            ->method('execute')
+            ->method('removeData')
             ->with($abstractModelMock, $result['attribute_set_id']);
 
         $attributeModel->expects($this->any())->method('getConnection')->willReturn($this->connectionMock);
diff --git a/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php
index 4a113848fbb17..b1b228296eb6b 100644
--- a/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php
+++ b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php
@@ -40,7 +40,7 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundExecute(
+    public function aroundRemoveData(
         RemoveProductAttributeData $subject,
         \Closure $proceed,
         AbstractModel $object,

From f36d5eb3fbbdf68e1a3a208086891c042a775062 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 17 Aug 2020 12:32:22 +0100
Subject: [PATCH 162/671] Added no store cache header to webapis requests

---
 .../Plugin/AppendNoStoreCacheHeader.php       | 30 +++++++++++++++++++
 .../Magento/PageCache/etc/webapi_rest/di.xml  | 12 ++++++++
 .../Magento/PageCache/etc/webapi_soap/di.xml  | 12 ++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 app/code/Magento/PageCache/Plugin/AppendNoStoreCacheHeader.php
 create mode 100644 app/code/Magento/PageCache/etc/webapi_rest/di.xml
 create mode 100644 app/code/Magento/PageCache/etc/webapi_soap/di.xml

diff --git a/app/code/Magento/PageCache/Plugin/AppendNoStoreCacheHeader.php b/app/code/Magento/PageCache/Plugin/AppendNoStoreCacheHeader.php
new file mode 100644
index 0000000000000..fc18855a51710
--- /dev/null
+++ b/app/code/Magento/PageCache/Plugin/AppendNoStoreCacheHeader.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageCache\Plugin;
+
+use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\Response\HttpInterface;
+
+class AppendNoStoreCacheHeader
+{
+    /**
+     * Set cache-control header
+     *
+     * @param FrontControllerInterface $controller
+     * @param HttpInterface $response
+     * @return HttpInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterDispatch(FrontControllerInterface $controller, HttpInterface $response): HttpInterface
+    {
+        $response->setHeader('Cache-Control', 'no-store');
+        return $response;
+    }
+}
diff --git a/app/code/Magento/PageCache/etc/webapi_rest/di.xml b/app/code/Magento/PageCache/etc/webapi_rest/di.xml
new file mode 100644
index 0000000000000..04906a615a9df
--- /dev/null
+++ b/app/code/Magento/PageCache/etc/webapi_rest/di.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="append_no_store_cache_header" type="Magento\PageCache\Plugin\AppendNoStoreCacheHeader" />
+    </type>
+</config>
diff --git a/app/code/Magento/PageCache/etc/webapi_soap/di.xml b/app/code/Magento/PageCache/etc/webapi_soap/di.xml
new file mode 100644
index 0000000000000..04906a615a9df
--- /dev/null
+++ b/app/code/Magento/PageCache/etc/webapi_soap/di.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\FrontControllerInterface">
+        <plugin name="append_no_store_cache_header" type="Magento\PageCache\Plugin\AppendNoStoreCacheHeader" />
+    </type>
+</config>

From b2af5dbb0a4b8ac3ec1f427004eff8b4b55b2083 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Mon, 17 Aug 2020 15:21:28 -0500
Subject: [PATCH 163/671] MC-36276: Internal Server error when adding a
 configurable product with customized option to cart

---
 .../Resolver/ConfigurableCartItemOptions.php  |   4 +
 .../etc/schema.graphqls                       |   2 +-
 .../AddConfigurableProductToCartTest.php      | 123 ++++++++++++++++++
 ...nfigurable_with_custom_option_dropdown.php |  50 +++++++
 ...e_with_custom_option_dropdown_rollback.php |  10 ++
 5 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown_rollback.php

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableCartItemOptions.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableCartItemOptions.php
index fed05208e0d55..6624a2624f1c3 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableCartItemOptions.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/ConfigurableCartItemOptions.php
@@ -55,6 +55,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $result = [];
         foreach ($this->configurationHelper->getOptions($cartItem) as $option) {
+            if (isset($option['option_type'])) {
+                //Don't return customizable options in this resolver
+                continue;
+            }
             $result[] = [
                 'id' => $option['option_id'],
                 'option_label' => $option['label'],
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 6e85653380acc..68ff3184dc0ee 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -58,7 +58,7 @@ input ConfigurableProductCartItemInput {
 }
 
 type ConfigurableCartItem implements CartItemInterface {
-    customizable_options: [SelectedCustomizableOption]!
+    customizable_options: [SelectedCustomizableOption] @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\CustomizableOptions")
     configurable_options: [SelectedConfigurableOption!]! @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableCartItemOptions")
 }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
index 519f5fef13fdc..5bc543f9f122a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartTest.php
@@ -328,6 +328,94 @@ public function testOutOfStockVariationToCart()
         $this->graphQlMutation($query);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php
+     * @magentoApiDataFixture Magento/Checkout/_files/active_quote.php
+     */
+    public function testAddConfigurableProductToCartWithCustomOption()
+    {
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_order_1');
+        $sku = 'configurable';
+        $variantSku = 'simple_10';
+        $productOptions = $this->getAvailableProductCustomOption($sku);
+        $optionId = $productOptions[0]['option_id'];
+        $optionValueId = $productOptions[0]['value'][1]['option_type_id'];
+
+        $mutation = <<<QUERY
+mutation {
+  addConfigurableProductsToCart(input: {
+    cart_id: "{$maskedQuoteId}",
+    cart_items: [
+      {
+        parent_sku: "{$sku}",
+        variant_sku: "{$variantSku}",
+        data: {
+          sku: "{$variantSku}",
+          quantity: 1
+        },
+        customizable_options: [
+          {id: {$optionId}, value_string: "{$optionValueId}"}]
+      }
+    ]
+  }) {
+    cart {
+      items {
+        id
+        quantity
+        product {
+          sku
+          name
+        }
+        ... on ConfigurableCartItem {
+          configurable_options {
+            option_label
+            value_label
+          }
+          customizable_options {
+            id
+            label
+            values{
+              label
+              value
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlMutation($mutation);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertCount(1, $response['addConfigurableProductsToCart']['cart']['items']);
+        $item = $response['addConfigurableProductsToCart']['cart']['items'][0];
+        $this->assertEquals($sku, $item['product']['sku']);
+        $expectedOptions = [
+            'configurable_options' => [
+                [
+                    'option_label' => 'Test Configurable',
+                    'value_label' => 'Option 1'
+                ]
+            ],
+            'customizable_options' => [
+                [
+                    'id' => $optionId,
+                    'label' => 'Dropdown Options',
+                    'values' => [
+                        [
+                            'label' => 'Option 2',
+                            'value' => $optionValueId
+                        ]
+                    ]
+                ]
+            ]
+        ];
+
+        $this->assertResponseFields($item['configurable_options'], $expectedOptions['configurable_options']);
+        $this->assertResponseFields($item['customizable_options'], $expectedOptions['customizable_options']);
+    }
+
     /**
      * @param string $maskedQuoteId
      * @param string $parentSku
@@ -406,4 +494,39 @@ private function getFetchProductQuery(string $term): string
 }
 QUERY;
     }
+
+    /**
+     * Get product customizable dropdown options
+     *
+     * @param string $productSku
+     * @return array
+     */
+    private function getAvailableProductCustomOption(string $productSku): array
+    {
+        $query = <<<QUERY
+{
+  products(filter: {sku: {eq: "${productSku}"}}) {
+    items {
+      name
+      ... on CustomizableProductInterface {
+        options {
+          option_id
+          title
+          ... on CustomizableDropDownOption {
+            value {
+              option_type_id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertNotEmpty($response['products']['items'], "No result for product with sku: '{$productSku}'");
+        return $response['products']['items'][0]['options'];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php
new file mode 100644
index 0000000000000..cc440eb4c474f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/product_configurable.php');
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductCustomOptionInterfaceFactory $optionRepository */
+$optionRepository = $objectManager->get(ProductCustomOptionInterfaceFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('configurable');
+$dropdownOption = [
+    'previous_group' => 'select',
+    'title' => 'Dropdown Options',
+    'type' => 'drop_down',
+    'is_require' => 1,
+    'sort_order' => 0,
+    'values' => [
+        [
+            'option_type_id' => null,
+            'title' => 'Option 1',
+            'price' => '10.00',
+            'price_type' => 'fixed',
+            'sku' => 'opt1',
+        ],
+        [
+            'option_type_id' => null,
+            'title' => 'Option 2',
+            'price' => '20.00',
+            'price_type' => 'fixed',
+            'sku' => 'opt2',
+        ],
+    ]
+];
+
+$createdOption = $optionRepository->create(['data' => $dropdownOption]);
+$createdOption->setProductSku($product->getSku());
+$product->setOptions([$createdOption]);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown_rollback.php
new file mode 100644
index 0000000000000..26e15b60dc695
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/product_configurable_with_custom_option_dropdown_rollback.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/product_configurable_rollback.php');

From 89173faabd93790a9c4d0468366cd732da211ce3 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 18 Aug 2020 17:24:47 +0300
Subject: [PATCH 164/671] MC-36810: Unexpected behavior in the login page
 during loding

---
 .../view/frontend/templates/form/login.phtml    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
index a1d1a0260672a..73e9ec35d51c8 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/login.phtml
@@ -50,14 +50,13 @@
             </fieldset>
         </form>
     </div>
-</div>
-
-<script type="text/x-magento-init">
-    {
-        "*": {
-            "Magento_Customer/js/block-submit-on-send": {
-                "formId": "login-form"
+    <script type="text/x-magento-init">
+        {
+            "*": {
+                "Magento_Customer/js/block-submit-on-send": {
+                    "formId": "login-form"
+                }
             }
         }
-    }
-</script>
+    </script>
+</div>

From 2eaee52aeeb1bdb61d653e2a73bb91f2f8e7d1d5 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Tue, 18 Aug 2020 11:17:44 -0500
Subject: [PATCH 165/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/Model/PageRepository.php | 25 +++++++++++--------
 app/code/Magento/Cms/etc/di.xml               |  2 ++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index f5c64b26c42ec..301c0efa740bd 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -17,6 +17,7 @@
 use Magento\Framework\EntityManager\HydratorInterface;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Store\Model\StoreManagerInterface;
@@ -162,24 +163,28 @@ private function validateLayoutUpdate(Data\PageInterface $page): void
      */
     public function save(\Magento\Cms\Api\Data\PageInterface $page)
     {
-        if ($page->getStoreId() === null) {
-            $storeId = $this->storeManager->getStore()->getId();
-            $page->setStoreId($storeId);
-        }
-        $pageId = $page->getId();
-        if ($pageId && !($page instanceof Page && $page->getOrigData())) {
-            $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
-        }
-
         try {
+            $pageId = $page->getId();
+            if ($pageId && !($page instanceof Page && $page->getOrigData())) {
+                $page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
+            }
+            if ($page->getStoreId() === null) {
+                $storeId = $this->storeManager->getStore()->getId();
+                $page->setStoreId($storeId);
+            }
             $this->validateLayoutUpdate($page);
             $this->resource->save($page);
             $this->identityMap->add($page);
-        } catch (\Exception $exception) {
+        } catch (LocalizedException $exception) {
             throw new CouldNotSaveException(
                 __('Could not save the page: %1', $exception->getMessage()),
                 $exception
             );
+        } catch (\Throwable $exception) {
+            throw new CouldNotSaveException(
+                __('Could not save the page: %1', __('Something went wrong while saving the page.')),
+                $exception
+            );
         }
         return $page;
     }
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 0d0839365cc6a..2c265f881acf8 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -285,6 +285,8 @@
                 <item name="hr" xsi:type="string">hr</item>
                 <item name="figure" xsi:type="string">figure</item>
                 <item name="button" xsi:type="string">button</item>
+                <item name="i" xsi:type="string">i</item>
+                <item name="u" xsi:type="string">u</item>
             </argument>
             <argument name="allowedAttributes" xsi:type="array">
                 <item name="class" xsi:type="string">class</item>

From 98ec18d674c8e6a3151ab99af4c980439ca7d6ff Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 18 Aug 2020 22:09:09 -0500
Subject: [PATCH 166/671] MC-36837: events.xml is added for quote submit succes
 to trigger sales

---
 .../Magento/GraphQl/Quote/Guest/PlaceOrderTest.php    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index 00b960d66cfc6..f1aa4f02a6922 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -11,6 +11,7 @@
 use Magento\Framework\Registry;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\OrderFactory;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
@@ -40,6 +41,11 @@ class PlaceOrderTest extends GraphQlAbstract
      */
     private $registry;
 
+    /**
+     * @var OrderFactory
+     */
+    private $orderFactory;
+
     /**
      * @inheritdoc
      */
@@ -49,6 +55,7 @@ protected function setUp(): void
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
         $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        $this->orderFactory = $objectManager->get(OrderFactory::class);
         $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
     }
 
@@ -80,6 +87,10 @@ public function testPlaceOrder()
         self::assertArrayHasKey('placeOrder', $response);
         self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
         self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
+        $orderIncrementId = $response['placeOrder']['order']['order_number'];
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId($orderIncrementId);
+        $this->assertNotEmpty($order->getEmailSent());
     }
 
     /**

From e8d8886a6083bf2ec78373c1d658835e9a94cea6 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 12 Aug 2020 21:17:09 +0800
Subject: [PATCH 167/671] magento/adobe-stock-integration#1742: Cover
 SynchronizeFilesInterface with integration - Integration test coverage and
 add test image with metadata

---
 .../Model/SynchronizeFilesTest.php            | 151 ++++++++++++++++++
 .../Integration/_files/magento_metadata.jpg   | Bin 0 -> 34986 bytes
 2 files changed, 151 insertions(+)
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg

diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
new file mode 100644
index 0000000000000..6c4338c0935dc
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Test\Integration\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for SynchronizeFiles.
+ */
+class SynchronizeFilesTest extends TestCase
+{
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SynchronizeFilesInterface
+     */
+    private $synchronizeFiles;
+
+    /**
+     * @var GetAssetsByPathsInterface
+     */
+    private $getAssetsByPath;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetKeywords;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->synchronizeFiles = Bootstrap::getObjectManager()->get(SynchronizeFilesInterface::class);
+        $this->getAssetsByPath = Bootstrap::getObjectManager()->get(GetAssetsByPathsInterface::class);
+        $this->getAssetKeywords = Bootstrap::getObjectManager()->get(GetAssetsKeywordsInterface::class);
+        $this->mediaDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
+    }
+
+    /**
+     * Test for SynchronizeFiles::execute
+     *
+     * @dataProvider filesProvider
+     * @param null|string $file
+     * @param null|string $title
+     * @param null|string $description
+     * @param null|array $keywords
+     * @throws FileSystemException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecute(
+        ?string $file,
+        ?string $title,
+        ?string $description,
+        ?array $keywords
+    ): void {
+        $path = realpath(__DIR__ . '/../_files/' . $file);
+        $modifiableFilePath = $this->mediaDirectory->getAbsolutePath($file);
+        $this->driver->copy(
+            $path,
+            $modifiableFilePath
+        );
+
+        $this->synchronizeFiles->execute([$file]);
+
+        $loadedAssets = $this->getAssetsByPath->execute([$file])[0];
+        $loadedKeywords = $this->getKeywords($loadedAssets) ?: null;
+
+        $this->assertEquals($title, $loadedAssets->getTitle());
+        $this->assertEquals($description, $loadedAssets->getDescription());
+        $this->assertEquals($keywords, $loadedKeywords);
+
+        $this->driver->deleteFile($modifiableFilePath);
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                '/magento.jpg',
+                'magento',
+                null,
+                null
+            ],
+            [
+                '/magento_metadata.jpg',
+                'Title of the magento image',
+                'Description of the magento image',
+                [
+                    'magento',
+                    'mediagallerymetadata'
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Key asset keywords
+     *
+     * @param AssetInterface $asset
+     * @return string[]
+     */
+    private function getKeywords(AssetInterface $asset): array
+    {
+        $assetKeywords = $this->getAssetKeywords->execute([$asset->getId()]);
+
+        if (empty($assetKeywords)) {
+            return [];
+        }
+
+        $keywords = current($assetKeywords)->getKeywords();
+
+        return array_map(
+            function (KeywordInterface $keyword) {
+                return $keyword->getKeyword();
+            },
+            $keywords
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg b/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6dc8cd69e41c1ed0fcdbd38370c3b5b90d6c3ded
GIT binary patch
literal 34986
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

literal 0
HcmV?d00001


From 21819fe47d7ff332ab884ab8868e18e2365252f1 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sun, 9 Aug 2020 17:47:50 +0100
Subject: [PATCH 168/671] magento/adobe-stock-integration#1726: Simplified
 AssetDetailsProvider implementation

---
 .../etc/adminhtml/di.xml                      |   2 +-
 .../MediaGalleryCmsUi/etc/adminhtml/di.xml    |   2 +-
 .../Model/AssetDetailsProvider/CreatedAt.php  |  59 ---------
 .../Model/AssetDetailsProvider/Height.php     |  33 -----
 .../Model/AssetDetailsProvider/Size.php       |  49 --------
 .../Model/AssetDetailsProvider/Type.php       |  59 ---------
 .../Model/AssetDetailsProvider/UpdatedAt.php  |  59 ---------
 .../Model/AssetDetailsProvider/UsedIn.php     | 113 -----------------
 .../Model/AssetDetailsProvider/Width.php      |  33 -----
 .../Model/AssetDetailsProviderInterface.php   |  24 ----
 .../Model/AssetDetailsProviderPool.php        |  46 -------
 .../MediaGalleryUi/Model/GetAssetDetails.php  | 102 +++++++++++++++
 .../Model/GetAssetUsageDetails.php            | 119 ++++++++++++++++++
 .../Model/GetDetailsByAssetId.php             |  12 +-
 app/code/Magento/MediaGalleryUi/etc/di.xml    |  20 ---
 15 files changed, 229 insertions(+), 503 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
 delete mode 100644 app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderPool.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php

diff --git a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
index 500ac10f4745a..ae01c29928b4a 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
@@ -24,7 +24,7 @@
             <argument name="entityType" xsi:type="string">catalog_category</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\UsedIn">
+    <type name="Magento\MediaGalleryUi\Model\GetAssetUsageDetails">
         <arguments>
             <argument name="contentTypes" xsi:type="array">
                 <item name="catalog_category" xsi:type="array">
diff --git a/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
index b06ad0fff1df6..65ed3b7197f83 100644
--- a/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/etc/adminhtml/di.xml
@@ -24,7 +24,7 @@
             <argument name="entityType" xsi:type="string">cms_block</argument>
         </arguments>
     </virtualType>
-    <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\UsedIn">
+    <type name="Magento\MediaGalleryUi\Model\GetAssetUsageDetails">
         <arguments>
             <argument name="contentTypes" xsi:type="array">
                 <item name="cms_block" xsi:type="array">
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
deleted file mode 100644
index 7c3eccfea521f..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/CreatedAt.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide asset created at date time
- */
-class CreatedAt implements AssetDetailsProviderInterface
-{
-    /**
-     * @var TimezoneInterface
-     */
-    private $dateTime;
-
-    /**
-     * @param TimezoneInterface $dateTime
-     */
-    public function __construct(
-        TimezoneInterface $dateTime
-    ) {
-        $this->dateTime = $dateTime;
-    }
-
-    /**
-     * Provide asset created at date time
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws \Exception
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Created'),
-            'value' => $this->formatDate($asset->getCreatedAt())
-        ];
-    }
-
-    /**
-     * Format date to standard format
-     *
-     * @param string $date
-     * @return string
-     * @throws \Exception
-     */
-    private function formatDate(string $date): string
-    {
-        return $this->dateTime->formatDate($date, \IntlDateFormatter::SHORT, true);
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
deleted file mode 100644
index b2b0f389f6b9a..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Height.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide asset height
- */
-class Height implements AssetDetailsProviderInterface
-{
-    /**
-     * Provide asset height
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws IntegrationException
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Height'),
-            'value' => sprintf('%spx', $asset->getHeight())
-        ];
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
deleted file mode 100644
index 55841cc5abd3f..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Size.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide asset file size
- */
-class Size implements AssetDetailsProviderInterface
-{
-    /**
-     * Provide asset file size
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws IntegrationException
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Size'),
-            'value' => $this->formatImageSize($asset->getSize())
-        ];
-    }
-
-    /**
-     * Format image size
-     *
-     * @param int $imageSize
-     *
-     * @return string
-     */
-    private function formatImageSize(int $imageSize): string
-    {
-        if ($imageSize === 0) {
-            return '';
-        }
-
-        return sprintf('%sKb', $imageSize / 1000);
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
deleted file mode 100644
index 5b47616398ef7..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Type.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide asset type
- */
-class Type implements AssetDetailsProviderInterface
-{
-    /**
-     * @var array
-     */
-    private $types;
-
-    /**=
-     * @param array $types
-     */
-    public function __construct(array $types = [])
-    {
-        $this->types = $types;
-    }
-
-    /**
-     * Provide asset type
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws IntegrationException
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Type'),
-            'value' => $this->getImageTypeByContentType($asset->getContentType()),
-        ];
-    }
-
-    /**
-     * Return image type by content type
-     *
-     * @param string $contentType
-     * @return string
-     */
-    private function getImageTypeByContentType(string $contentType): string
-    {
-        $type = current(explode('/', $contentType));
-
-        return isset($this->types[$type]) ? $this->types[$type] : 'Asset';
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
deleted file mode 100644
index 2f50bd9a72208..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UpdatedAt.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide asset updated at date time
- */
-class UpdatedAt implements AssetDetailsProviderInterface
-{
-    /**
-     * @var TimezoneInterface
-     */
-    private $dateTime;
-
-    /**
-     * @param TimezoneInterface $dateTime
-     */
-    public function __construct(
-        TimezoneInterface $dateTime
-    ) {
-        $this->dateTime = $dateTime;
-    }
-
-    /**
-     * Provide asset updated at date time
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws \Exception
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Modified'),
-            'value' => $this->formatDate($asset->getUpdatedAt())
-        ];
-    }
-
-    /**
-     * Format date to standard format
-     *
-     * @param string $date
-     * @return string
-     * @throws \Exception
-     */
-    private function formatDate(string $date): string
-    {
-        return $this->dateTime->formatDate($date, \IntlDateFormatter::SHORT, true);
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
deleted file mode 100644
index ca3883d5c937c..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/UsedIn.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Backend\Model\UrlInterface;
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide information on which content asset is used in
- */
-class UsedIn implements AssetDetailsProviderInterface
-{
-    /**
-     * @var GetContentByAssetIdsInterface
-     */
-    private $getContent;
-
-    /**
-     * @var array
-     */
-    private $contentTypes;
-
-    /**
-     * @var UrlInterface
-     */
-    private $url;
-
-    /**
-     * @param GetContentByAssetIdsInterface $getContent
-     * @param UrlInterface $url
-     * @param array $contentTypes
-     */
-    public function __construct(
-        GetContentByAssetIdsInterface $getContent,
-        UrlInterface $url,
-        array $contentTypes = []
-    ) {
-        $this->getContent = $getContent;
-        $this->url = $url;
-        $this->contentTypes = $contentTypes;
-    }
-
-    /**
-     * Provide information on which content asset is used in
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws IntegrationException
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Used In'),
-            'value' => $this->getUsedIn($asset->getId())
-        ];
-    }
-
-    /**
-     * Retrieve assets used in the Content
-     *
-     * @param int $assetId
-     * @return array
-     * @throws IntegrationException
-     */
-    private function getUsedIn(int $assetId): array
-    {
-        $details = [];
-
-        foreach ($this->getUsedInCounts($assetId) as $type => $number) {
-            $details[$type] = $this->contentTypes[$type] ?? ['name' => $type, 'link' => null];
-            $details[$type]['number'] = $number;
-            $details[$type]['link'] = $details[$type]['link'] ? $this->url->getUrl($details[$type]['link']) : null;
-        }
-
-        return array_values($details);
-    }
-
-    /**
-     * Get used in counts per type
-     *
-     * @param int $assetId
-     * @return int[]
-     * @throws IntegrationException
-     */
-    private function getUsedInCounts(int $assetId): array
-    {
-        $usedIn = [];
-        $entityIds = [];
-
-        $contentIdentities = $this->getContent->execute([$assetId]);
-
-        foreach ($contentIdentities as $contentIdentity) {
-            $entityId = $contentIdentity->getEntityId();
-            $type = $contentIdentity->getEntityType();
-
-            if (!isset($entityIds[$type])) {
-                $usedIn[$type] = 1;
-            } elseif ($entityIds[$type]['entity_id'] !== $entityId) {
-                ++$usedIn[$type];
-            }
-            $entityIds[$type]['entity_id'] = $entityId;
-        }
-        return $usedIn;
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
deleted file mode 100644
index 64e9cf8ad1a8f..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProvider/Width.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model\AssetDetailsProvider;
-
-use Magento\Framework\Exception\IntegrationException;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryUi\Model\AssetDetailsProviderInterface;
-
-/**
- * Provide asset width
- */
-class Width implements AssetDetailsProviderInterface
-{
-    /**
-     * Provide asset width
-     *
-     * @param AssetInterface $asset
-     * @return array
-     * @throws IntegrationException
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        return [
-            'title' => __('Width'),
-            'value' => sprintf('%spx', $asset->getWidth())
-        ];
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
deleted file mode 100644
index 92375adfdd4f2..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model;
-
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-
-/**
- * Provides asset detail for view details section
- */
-interface AssetDetailsProviderInterface
-{
-    /**
-     * Get a piece of asset details
-     *
-     * @param AssetInterface $asset
-     * @return array
-     */
-    public function execute(AssetInterface $asset): array;
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderPool.php b/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderPool.php
deleted file mode 100644
index 207f35bb99d6a..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Model/AssetDetailsProviderPool.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryUi\Model;
-
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-
-/**
- * Provides asset detail for view details section
- */
-class AssetDetailsProviderPool
-{
-    /**
-     * @var AssetDetailsProviderInterface[]
-     */
-    private $detailsProviders;
-
-    /**
-     * @param AssetDetailsProviderInterface[] $detailsProviders
-     */
-    public function __construct(array $detailsProviders = [])
-    {
-        $this->detailsProviders = $detailsProviders;
-    }
-
-    /**
-     * Get a piece of asset details
-     *
-     * @param AssetInterface $asset
-     * @return array
-     */
-    public function execute(AssetInterface $asset): array
-    {
-        $details = [];
-        foreach ($this->detailsProviders as $detailsProvider) {
-            if ($detailsProvider instanceof AssetDetailsProviderInterface) {
-                $details[] = $detailsProvider->execute($asset);
-            }
-        }
-        return $details;
-    }
-}
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
new file mode 100644
index 0000000000000..469d62646292e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+
+/**
+ * Provides asset detail for view details section
+ */
+class GetAssetDetails
+{
+    /**
+     * @var TimezoneInterface
+     */
+    private $dateTime;
+
+    /**
+     * @var GetAssetUsageDetails
+     */
+    private $getAssetUsageDetails;
+
+    /**
+     * @param GetAssetUsageDetails $getAssetUsageDetails
+     * @param TimezoneInterface $dateTime
+     */
+    public function __construct(
+        GetAssetUsageDetails $getAssetUsageDetails,
+        TimezoneInterface $dateTime
+    ) {
+        $this->dateTime = $dateTime;
+        $this->getAssetUsageDetails = $getAssetUsageDetails;
+    }
+
+    /**
+     * Get a piece of asset details
+     *
+     * @param AssetInterface $asset
+     * @return array
+     */
+    public function execute(AssetInterface $asset): array
+    {
+        $details = [
+            [
+                'title' => __('Type'),
+                'value' => __('Asset'),
+            ],
+            [
+                'title' => __('Created'),
+                'value' => $this->formatDate($asset->getCreatedAt())
+            ],
+            [
+                'title' => __('Modified'),
+                'value' => $this->formatDate($asset->getUpdatedAt())
+            ],
+            [
+                'title' => __('Width'),
+                'value' => sprintf('%spx', $asset->getWidth())
+            ],
+            [
+                'title' => __('Height'),
+                'value' => sprintf('%spx', $asset->getHeight())
+            ],
+            [
+                'title' => __('Size'),
+                'value' => $this->formatSize($asset->getSize())
+            ],
+            [
+                'title' => __('Used In'),
+                'value' => $this->getAssetUsageDetails->execute($asset->getId())
+            ]
+        ];
+        return $details;
+    }
+
+    /**
+     * Format image size
+     *
+     * @param int $imageSize
+     * @return string
+     */
+    private function formatSize(int $imageSize): string
+    {
+        return $imageSize === 0 ? '' : sprintf('%sKb', $imageSize / 1000);
+    }
+
+    /**
+     * Format date to standard format
+     *
+     * @param string $date
+     * @return string
+     */
+    private function formatDate(string $date): string
+    {
+        return $this->dateTime->formatDate($date, \IntlDateFormatter::SHORT, true);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
new file mode 100644
index 0000000000000..30b58667a6244
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model;
+
+use Magento\Backend\Model\UrlInterface;
+use Magento\Framework\Exception\IntegrationException;
+use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
+
+/**
+ * Provide information on which content asset is used in
+ */
+class GetAssetUsageDetails
+{
+    /**
+     * @var GetContentByAssetIdsInterface
+     */
+    private $getContent;
+
+    /**
+     * @var UrlInterface
+     */
+    private $url;
+
+    /**
+     * @var array
+     */
+    private $contentTypes;
+
+    /**
+     * @param GetContentByAssetIdsInterface $getContent
+     * @param UrlInterface $url
+     * @param array $contentTypes
+     */
+    public function __construct(
+        GetContentByAssetIdsInterface $getContent,
+        UrlInterface $url,
+        array $contentTypes = []
+    ) {
+        $this->getContent = $getContent;
+        $this->url = $url;
+        $this->contentTypes = $contentTypes;
+    }
+
+    /**
+     * Provide information on which content asset is used in
+     *
+     * @param int $id
+     * @return array
+     * @throws IntegrationException
+     */
+    public function execute(int $id): array
+    {
+        $details = [];
+
+        foreach ($this->getUsageByEntities($id) as $type => $entities) {
+            $details[] = [
+                'name' => $this->getName($type),
+                'number' => count($entities),
+                'link' => $this->getLinkUrl($type)
+            ];
+        }
+
+        return $details;
+    }
+
+    /**
+     * Retrieve the type name from content types configuration
+     *
+     * @param string $type
+     * @return string
+     */
+    private function getName(string $type): string
+    {
+        if (isset($this->contentTypes[$type]) && !empty($this->contentTypes[$type]['name'])) {
+            return $this->contentTypes[$type]['name'];
+        }
+        return $type;
+    }
+
+    /**
+     * Retrieve the type link from content types configuration
+     *
+     * @param string $type
+     * @return string|null
+     */
+    private function getLinkUrl(string $type): ?string
+    {
+        if (isset($this->contentTypes[$type]) && !empty($this->contentTypes[$type]['link'])) {
+            return $this->contentTypes[$type]['link'];
+        }
+        return null;
+    }
+
+    /**
+     * Get used in counts per type
+     *
+     * @param int $assetId
+     * @return int[]
+     * @throws IntegrationException
+     */
+    private function getUsageByEntities(int $assetId): array
+    {
+        $usage = [];
+
+        foreach ($this->getContent->execute([$assetId]) as $contentIdentity) {
+            $id = $contentIdentity->getEntityId();
+            $type = $contentIdentity->getEntityType();
+            $usage[$type][$id] = isset($usage[$type][$id]) ? $usage[$type][$id]++ : 0;
+        }
+
+        return $usage;
+    }
+}
+
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php b/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
index b870082ea2aa1..f6972637b3610 100644
--- a/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
+++ b/app/code/Magento/MediaGalleryUi/Model/GetDetailsByAssetId.php
@@ -44,25 +44,25 @@ class GetDetailsByAssetId
     private $getAssetKeywords;
 
     /**
-     * @var AssetDetailsProviderPool
+     * @var GetAssetDetails
      */
-    private $detailsProviderPool;
+    private $getAssetDetails;
 
     /**
-     * @param AssetDetailsProviderPool $detailsProviderPool
+     * @param GetAssetDetails $getAssetDetails
      * @param GetAssetsByIdsInterface $getAssetById
      * @param StoreManagerInterface $storeManager
      * @param SourceIconProvider $sourceIconProvider
      * @param GetAssetsKeywordsInterface $getAssetKeywords
      */
     public function __construct(
-        AssetDetailsProviderPool $detailsProviderPool,
+        GetAssetDetails $getAssetDetails,
         GetAssetsByIdsInterface $getAssetById,
         StoreManagerInterface $storeManager,
         SourceIconProvider $sourceIconProvider,
         GetAssetsKeywordsInterface $getAssetKeywords
     ) {
-        $this->detailsProviderPool = $detailsProviderPool;
+        $this->getAssetDetails = $getAssetDetails;
         $this->getAssetsById = $getAssetById;
         $this->storeManager = $storeManager;
         $this->sourceIconProvider = $sourceIconProvider;
@@ -89,7 +89,7 @@ public function execute(array $assetIds): array
                 'path' => $asset->getPath(),
                 'description' => $asset->getDescription(),
                 'id' => $asset->getId(),
-                'details' => $this->detailsProviderPool->execute($asset),
+                'details' => $this->getAssetDetails->execute($asset),
                 'size' => $asset->getSize(),
                 'tags' => $this->getKeywords($asset),
                 'source' => $asset->getSource() ?
diff --git a/app/code/Magento/MediaGalleryUi/etc/di.xml b/app/code/Magento/MediaGalleryUi/etc/di.xml
index 56ccf7c1aa727..a8c4e2a8d8963 100644
--- a/app/code/Magento/MediaGalleryUi/etc/di.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/di.xml
@@ -33,27 +33,7 @@
             <argument name="path" xsi:type="string">media</argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGalleryUi\Model\AssetDetailsProvider\Type">
-        <arguments>
-            <argument name="types" xsi:type="array">
-                <item name="image" xsi:type="string">Image</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
         <plugin name="createMediaGalleryThumbnails" type="Magento\MediaGalleryUi\Plugin\CreateThumbnails"/>
     </type>
-    <type name="Magento\MediaGalleryUi\Model\AssetDetailsProviderPool">
-        <arguments>
-            <argument name="detailsProviders" xsi:type="array">
-                <item name="10" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\Type</item>
-                <item name="20" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\CreatedAt</item>
-                <item name="30" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\UpdatedAt</item>
-                <item name="40" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\Width</item>
-                <item name="50" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\Height</item>
-                <item name="60" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\Size</item>
-                <item name="70" xsi:type="object">Magento\MediaGalleryUi\Model\AssetDetailsProvider\UsedIn</item>
-            </argument>
-        </arguments>
-    </type>
 </config>

From 59f11118d1640c6c9586104a15a5338e24e03f56 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 10 Aug 2020 11:56:58 +0100
Subject: [PATCH 169/671] magento/magento2#29449: Corrected file size
 formatting

---
 app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
index 469d62646292e..853f256e10615 100644
--- a/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
@@ -81,12 +81,12 @@ public function execute(AssetInterface $asset): array
     /**
      * Format image size
      *
-     * @param int $imageSize
+     * @param int $size
      * @return string
      */
-    private function formatSize(int $imageSize): string
+    private function formatSize(int $size): string
     {
-        return $imageSize === 0 ? '' : sprintf('%sKb', $imageSize / 1000);
+        return $size === 0 ? '' : sprintf('%.2f KB', $size / 1024);
     }
 
     /**

From 751e8ae9a97c1b852bfa1607589a8cebeccd22e3 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 10 Aug 2020 14:52:27 +0100
Subject: [PATCH 170/671] magento/magento2#29449: Corrected link url retrieval

---
 app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
index 30b58667a6244..67a95f4404279 100644
--- a/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
@@ -91,7 +91,7 @@ private function getName(string $type): string
     private function getLinkUrl(string $type): ?string
     {
         if (isset($this->contentTypes[$type]) && !empty($this->contentTypes[$type]['link'])) {
-            return $this->contentTypes[$type]['link'];
+            return $this->url->getUrl($this->contentTypes[$type]['link']);
         }
         return null;
     }

From d2690b3696dbe5a9515893bf2fa93a1f7f6a33a7 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 11 Aug 2020 12:51:29 +0100
Subject: [PATCH 171/671] magento/magento2#29449: Fixed tests

---
 app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php      | 2 +-
 app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
index 853f256e10615..88bd5cf96e534 100644
--- a/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetDetails.php
@@ -48,7 +48,7 @@ public function execute(AssetInterface $asset): array
         $details = [
             [
                 'title' => __('Type'),
-                'value' => __('Asset'),
+                'value' => __('Image'),
             ],
             [
                 'title' => __('Created'),
diff --git a/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
index 67a95f4404279..1dd8b736a9c90 100644
--- a/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
+++ b/app/code/Magento/MediaGalleryUi/Model/GetAssetUsageDetails.php
@@ -116,4 +116,3 @@ private function getUsageByEntities(int $assetId): array
         return $usage;
     }
 }
-

From f0d92e725653b7ad24d31b650c1cf2233748251d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 15:23:58 +0300
Subject: [PATCH 172/671] Extract images from content only when new media
 gallery enabled magento/adobe-stock-integration#1750

---
 .../Magento/MediaContentApi/Model/Config.php  | 47 +++++++++++++++++++
 .../MediaContentCatalog/Observer/Category.php | 13 +++++
 .../Observer/CategoryDelete.php               | 19 ++++++--
 .../MediaContentCatalog/Observer/Product.php  | 15 +++++-
 .../Observer/ProductDelete.php                | 19 ++++++--
 .../MediaContentCms/Observer/Block.php        | 12 +++++
 .../MediaContentCms/Observer/BlockDelete.php  | 21 +++++++--
 .../Magento/MediaContentCms/Observer/Page.php | 13 +++++
 .../MediaContentCms/Observer/PageDelete.php   | 23 +++++++--
 9 files changed, 166 insertions(+), 16 deletions(-)
 create mode 100644 app/code/Magento/MediaContentApi/Model/Config.php

diff --git a/app/code/Magento/MediaContentApi/Model/Config.php b/app/code/Magento/MediaContentApi/Model/Config.php
new file mode 100644
index 0000000000000..dd3b30124cdd9
--- /dev/null
+++ b/app/code/Magento/MediaContentApi/Model/Config.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaContentApi\Model;
+
+use Magento\Framework\App\Config\ScopeConfigInterface;
+
+/**
+ * Class responsible to provide access to system configuration related to the Media Gallery
+ */
+class Config
+{
+    /**
+     * Path to enable/disable media gallery in the system settings.
+     */
+    private const XML_PATH_ENABLED = 'system/media_gallery/enabled';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * Config constructor.
+     *
+     * @param ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Check if new media gallery emabled
+     *
+     * @return bool
+     */
+    public function isEnabled(): bool
+    {
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED);
+    }
+}
diff --git a/app/code/Magento/MediaContentCatalog/Observer/Category.php b/app/code/Magento/MediaContentCatalog/Observer/Category.php
index 5c2deeab258df..53afae53a2aa7 100644
--- a/app/code/Magento/MediaContentCatalog/Observer/Category.php
+++ b/app/code/Magento/MediaContentCatalog/Observer/Category.php
@@ -13,6 +13,7 @@
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe the catalog_category_save_after event and run processing relation between category content and media asset.
@@ -29,6 +30,11 @@ class Category implements ObserverInterface
      */
     private $updateContentAssetLinks;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var array
      */
@@ -50,17 +56,20 @@ class Category implements ObserverInterface
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param GetEntityContentsInterface $getContent
      * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         GetEntityContentsInterface $getContent,
         UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        Config $config,
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
         $this->getContent = $getContent;
         $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -72,6 +81,10 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $model = $observer->getEvent()->getData('category');
 
         if ($model instanceof CatalogCategory) {
diff --git a/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php b/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php
index 1565d455cc43f..2a94a2d3963a3 100644
--- a/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php
+++ b/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php
@@ -15,6 +15,7 @@
 use Magento\MediaContentApi\Api\DeleteContentAssetLinksInterface;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
 use Magento\MediaContentApi\Api\ExtractAssetsFromContentInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe the catalog_category_delete_after event and deletes relation between category content and media asset.
@@ -25,7 +26,7 @@ class CategoryDelete implements ObserverInterface
     private const TYPE = 'entityType';
     private const ENTITY_ID = 'entityId';
     private const FIELD = 'field';
-    
+
     /**
      * @var ContentIdentityInterfaceFactory
      */
@@ -51,17 +52,23 @@ class CategoryDelete implements ObserverInterface
      */
     private $getContent;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var ExtractAssetsFromContentInterface
      */
     private $extractAssetsFromContent;
-    
+
     /**
      * @param ExtractAssetsFromContentInterface $extractAssetsFromContent
      * @param GetEntityContentsInterface $getContent
      * @param DeleteContentAssetLinksInterface $deleteContentAssetLinks
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param ContentAssetLinkInterfaceFactory $contentAssetLinkFactory
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
@@ -70,6 +77,7 @@ public function __construct(
         DeleteContentAssetLinksInterface $deleteContentAssetLinks,
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         ContentAssetLinkInterfaceFactory $contentAssetLinkFactory,
+        Config $config,
         array $fields
     ) {
         $this->extractAssetsFromContent = $extractAssetsFromContent;
@@ -77,6 +85,7 @@ public function __construct(
         $this->deleteContentAssetLinks = $deleteContentAssetLinks;
         $this->contentAssetLinkFactory = $contentAssetLinkFactory;
         $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -88,9 +97,13 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $category = $observer->getEvent()->getData('category');
         $contentAssetLinks = [];
-        
+
         if ($category instanceof CatalogCategory) {
             foreach ($this->fields as $field) {
                 $contentIdentity = $this->contentIdentityFactory->create(
diff --git a/app/code/Magento/MediaContentCatalog/Observer/Product.php b/app/code/Magento/MediaContentCatalog/Observer/Product.php
index 306bcc0b466c2..b7f52d95068fb 100644
--- a/app/code/Magento/MediaContentCatalog/Observer/Product.php
+++ b/app/code/Magento/MediaContentCatalog/Observer/Product.php
@@ -13,6 +13,7 @@
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe the catalog_product_save_after event and run processing relation between product content and media asset
@@ -34,6 +35,11 @@ class Product implements ObserverInterface
      */
     private $fields;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var ContentIdentityInterfaceFactory
      */
@@ -45,22 +51,25 @@ class Product implements ObserverInterface
     private $getContent;
 
     /**
-     * * Create links for product content
+     * Product observer constructor
      *
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param GetEntityContentsInterface $getContent
      * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         GetEntityContentsInterface $getContent,
         UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        Config $config,
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
         $this->getContent = $getContent;
         $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -72,6 +81,10 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $model = $observer->getEvent()->getData('product');
         if ($model instanceof CatalogProduct) {
             foreach ($this->fields as $field) {
diff --git a/app/code/Magento/MediaContentCatalog/Observer/ProductDelete.php b/app/code/Magento/MediaContentCatalog/Observer/ProductDelete.php
index 421bb5a33fa1d..38622178e2119 100644
--- a/app/code/Magento/MediaContentCatalog/Observer/ProductDelete.php
+++ b/app/code/Magento/MediaContentCatalog/Observer/ProductDelete.php
@@ -15,6 +15,7 @@
 use Magento\MediaContentApi\Api\DeleteContentAssetLinksInterface;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
 use Magento\MediaContentApi\Api\ExtractAssetsFromContentInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe the catalog_product_delete_before event and deletes relation between category content and media asset.
@@ -25,7 +26,7 @@ class ProductDelete implements ObserverInterface
     private const TYPE = 'entityType';
     private const ENTITY_ID = 'entityId';
     private const FIELD = 'field';
-    
+
     /**
      * @var ContentIdentityInterfaceFactory
      */
@@ -51,17 +52,23 @@ class ProductDelete implements ObserverInterface
      */
     private $getContent;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var ExtractAssetsFromContentInterface
      */
     private $extractAssetsFromContent;
-    
+
     /**
      * @param ExtractAssetsFromContentInterface $extractAssetsFromContent
      * @param GetEntityContentsInterface $getContent
      * @param DeleteContentAssetLinksInterface $deleteContentAssetLinks
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param ContentAssetLinkInterfaceFactory $contentAssetLinkFactory
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
@@ -70,6 +77,7 @@ public function __construct(
         DeleteContentAssetLinksInterface $deleteContentAssetLinks,
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         ContentAssetLinkInterfaceFactory $contentAssetLinkFactory,
+        Config $config,
         array $fields
     ) {
         $this->extractAssetsFromContent = $extractAssetsFromContent;
@@ -77,6 +85,7 @@ public function __construct(
         $this->deleteContentAssetLinks = $deleteContentAssetLinks;
         $this->contentAssetLinkFactory = $contentAssetLinkFactory;
         $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -88,9 +97,13 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $product = $observer->getEvent()->getData('product');
         $contentAssetLinks = [];
-        
+
         if ($product instanceof CatalogProduct) {
             foreach ($this->fields as $field) {
                 $contentIdentity = $this->contentIdentityFactory->create(
diff --git a/app/code/Magento/MediaContentCms/Observer/Block.php b/app/code/Magento/MediaContentCms/Observer/Block.php
index ccd1abb98bc60..fadf1b8918c90 100644
--- a/app/code/Magento/MediaContentCms/Observer/Block.php
+++ b/app/code/Magento/MediaContentCms/Observer/Block.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe cms_block_save_after event and run processing relation between cms block content and media asset
@@ -28,6 +29,11 @@ class Block implements ObserverInterface
      */
     private $updateContentAssetLinks;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var array
      */
@@ -41,15 +47,18 @@ class Block implements ObserverInterface
     /**
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        Config $config,
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
         $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -60,6 +69,9 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
         $model = $observer->getEvent()->getData('object');
 
         if ($model instanceof CmsBlock) {
diff --git a/app/code/Magento/MediaContentCms/Observer/BlockDelete.php b/app/code/Magento/MediaContentCms/Observer/BlockDelete.php
index 582f0a9ec6701..b9be5c54d79bd 100644
--- a/app/code/Magento/MediaContentCms/Observer/BlockDelete.php
+++ b/app/code/Magento/MediaContentCms/Observer/BlockDelete.php
@@ -15,6 +15,7 @@
 use Magento\MediaContentApi\Api\DeleteContentAssetLinksInterface;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
 use Magento\MediaContentApi\Api\ExtractAssetsFromContentInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe the adminhtml_cmspage_on_delete event and deletes relation between page content and media asset.
@@ -25,7 +26,12 @@ class BlockDelete implements ObserverInterface
     private const TYPE = 'entityType';
     private const ENTITY_ID = 'entityId';
     private const FIELD = 'field';
-    
+
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var ContentIdentityInterfaceFactory
      */
@@ -55,13 +61,14 @@ class BlockDelete implements ObserverInterface
      * @var ExtractAssetsFromContentInterface
      */
     private $extractAssetsFromContent;
-    
+
     /**
      * @param ExtractAssetsFromContentInterface $extractAssetsFromContent
      * @param GetEntityContentsInterface $getContent
      * @param DeleteContentAssetLinksInterface $deleteContentAssetLinks
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param ContentAssetLinkInterfaceFactory $contentAssetLinkFactory
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
@@ -70,6 +77,7 @@ public function __construct(
         DeleteContentAssetLinksInterface $deleteContentAssetLinks,
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         ContentAssetLinkInterfaceFactory $contentAssetLinkFactory,
+        Config $config,
         array $fields
     ) {
         $this->extractAssetsFromContent = $extractAssetsFromContent;
@@ -77,6 +85,7 @@ public function __construct(
         $this->deleteContentAssetLinks = $deleteContentAssetLinks;
         $this->contentAssetLinkFactory = $contentAssetLinkFactory;
         $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -88,9 +97,13 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $block = $observer->getEvent()->getData('object');
         $contentAssetLinks = [];
-        
+
         if ($block instanceof CmsBlock) {
             foreach ($this->fields as $field) {
                 $contentIdentity = $this->contentIdentityFactory->create(
@@ -101,7 +114,7 @@ public function execute(Observer $observer): void
                     ]
                 );
                 $assets = $this->extractAssetsFromContent->execute((string) $block->getData($field));
-                
+
                 foreach ($assets as $asset) {
                     $contentAssetLinks[] = $this->contentAssetLinkFactory->create(
                         [
diff --git a/app/code/Magento/MediaContentCms/Observer/Page.php b/app/code/Magento/MediaContentCms/Observer/Page.php
index 4c0ed5c628d1c..ef83d6bb58718 100644
--- a/app/code/Magento/MediaContentCms/Observer/Page.php
+++ b/app/code/Magento/MediaContentCms/Observer/Page.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Event\ObserverInterface;
 use Magento\MediaContentApi\Api\UpdateContentAssetLinksInterface;
 use Magento\MediaContentApi\Api\Data\ContentIdentityInterfaceFactory;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe cms_page_save_after event and run processing relation between cms page content and media asset.
@@ -28,6 +29,11 @@ class Page implements ObserverInterface
      */
     private $updateContentAssetLinks;
 
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @var array
      */
@@ -41,15 +47,18 @@ class Page implements ObserverInterface
     /**
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param UpdateContentAssetLinksInterface $updateContentAssetLinks
+     * @param Config $config
      * @param array $fields
      */
     public function __construct(
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         UpdateContentAssetLinksInterface $updateContentAssetLinks,
+        Config $config,
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
         $this->updateContentAssetLinks = $updateContentAssetLinks;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -60,6 +69,10 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $model = $observer->getEvent()->getData('object');
 
         if ($model instanceof CmsPage) {
diff --git a/app/code/Magento/MediaContentCms/Observer/PageDelete.php b/app/code/Magento/MediaContentCms/Observer/PageDelete.php
index 96d2bf89873bd..e3e59f0991a75 100644
--- a/app/code/Magento/MediaContentCms/Observer/PageDelete.php
+++ b/app/code/Magento/MediaContentCms/Observer/PageDelete.php
@@ -15,6 +15,7 @@
 use Magento\MediaContentApi\Api\DeleteContentAssetLinksInterface;
 use Magento\MediaContentApi\Model\GetEntityContentsInterface;
 use Magento\MediaContentApi\Api\ExtractAssetsFromContentInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Observe the cms_page_delete_before event and deletes relation between page content and media asset.
@@ -25,7 +26,7 @@ class PageDelete implements ObserverInterface
     private const TYPE = 'entityType';
     private const ENTITY_ID = 'entityId';
     private const FIELD = 'field';
-    
+
     /**
      * @var ContentIdentityInterfaceFactory
      */
@@ -55,13 +56,19 @@ class PageDelete implements ObserverInterface
      * @var ExtractAssetsFromContentInterface
      */
     private $extractAssetsFromContent;
-    
+
+    /**
+     * @var Config
+     */
+    private $config;
+
     /**
      * @param ExtractAssetsFromContentInterface $extractAssetsFromContent
      * @param GetEntityContentsInterface $getContent
      * @param DeleteContentAssetLinksInterface $deleteContentAssetLinks
      * @param ContentIdentityInterfaceFactory $contentIdentityFactory
      * @param ContentAssetLinkInterfaceFactory $contentAssetLinkFactory
+     * @param Config $config
      * @param arry $fields
      */
     public function __construct(
@@ -70,6 +77,7 @@ public function __construct(
         DeleteContentAssetLinksInterface $deleteContentAssetLinks,
         ContentIdentityInterfaceFactory $contentIdentityFactory,
         ContentAssetLinkInterfaceFactory $contentAssetLinkFactory,
+        Config $config,
         array $fields
     ) {
         $this->extractAssetsFromContent = $extractAssetsFromContent;
@@ -77,6 +85,7 @@ public function __construct(
         $this->deleteContentAssetLinks = $deleteContentAssetLinks;
         $this->contentAssetLinkFactory = $contentAssetLinkFactory;
         $this->contentIdentityFactory = $contentIdentityFactory;
+        $this->config = $config;
         $this->fields = $fields;
     }
 
@@ -88,9 +97,13 @@ public function __construct(
      */
     public function execute(Observer $observer): void
     {
+        if (!$this->config->isEnabled()) {
+            return;
+        }
+
         $page = $observer->getEvent()->getData('object');
         $contentAssetLinks = [];
-        
+
         if ($page instanceof CmsPage) {
             foreach ($this->fields as $field) {
                 $contentIdentity = $this->contentIdentityFactory->create(
@@ -100,9 +113,9 @@ public function execute(Observer $observer): void
                         self::ENTITY_ID => (string) $page->getId(),
                     ]
                 );
-                
+
                 $assets = $this->extractAssetsFromContent->execute((string) $page->getData($field));
-                
+
                 foreach ($assets as $asset) {
                     $contentAssetLinks[] = $this->contentAssetLinkFactory->create(
                         [

From 49686821fde792716e55f6abdd0560677667b753 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 15:31:59 +0300
Subject: [PATCH 173/671] Fix typo

---
 app/code/Magento/MediaContentApi/Model/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaContentApi/Model/Config.php b/app/code/Magento/MediaContentApi/Model/Config.php
index dd3b30124cdd9..ab2b4e7ae0dbe 100644
--- a/app/code/Magento/MediaContentApi/Model/Config.php
+++ b/app/code/Magento/MediaContentApi/Model/Config.php
@@ -36,7 +36,7 @@ public function __construct(ScopeConfigInterface $scopeConfig)
     }
 
     /**
-     * Check if new media gallery emabled
+     * Check if new media gallery enabled
      *
      * @return bool
      */

From 03d87037778d7356f762c45a106d8ef1043aa918 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 17:08:42 +0300
Subject: [PATCH 174/671] Fix static tests cover changes with integration tests

---
 .../Observer/CategoryDelete.php               |  2 +-
 .../MediaContentCms/Observer/Block.php        |  2 +-
 .../GetAssetIdsByContentFieldTest.php         | 19 ++++++++++++++++++-
 .../_files/product_with_asset.php             |  4 ----
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php b/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php
index 2a94a2d3963a3..8722f6568310c 100644
--- a/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php
+++ b/app/code/Magento/MediaContentCatalog/Observer/CategoryDelete.php
@@ -82,10 +82,10 @@ public function __construct(
     ) {
         $this->extractAssetsFromContent = $extractAssetsFromContent;
         $this->getContent = $getContent;
+        $this->config = $config;
         $this->deleteContentAssetLinks = $deleteContentAssetLinks;
         $this->contentAssetLinkFactory = $contentAssetLinkFactory;
         $this->contentIdentityFactory = $contentIdentityFactory;
-        $this->config = $config;
         $this->fields = $fields;
     }
 
diff --git a/app/code/Magento/MediaContentCms/Observer/Block.php b/app/code/Magento/MediaContentCms/Observer/Block.php
index fadf1b8918c90..48db872f4056f 100644
--- a/app/code/Magento/MediaContentCms/Observer/Block.php
+++ b/app/code/Magento/MediaContentCms/Observer/Block.php
@@ -57,8 +57,8 @@ public function __construct(
         array $fields
     ) {
         $this->contentIdentityFactory = $contentIdentityFactory;
-        $this->updateContentAssetLinks = $updateContentAssetLinks;
         $this->config = $config;
+        $this->updateContentAssetLinks = $updateContentAssetLinks;
         $this->fields = $fields;
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
index 2194200181729..1b08c7b55769a 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -43,6 +43,7 @@ protected function setUp(): void
      * Test for getting asset id by category fields
      *
      * @dataProvider dataProvider
+     * @magentoConfigFixture system/media_gallery/enabled 1
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCatalog/_files/category_with_asset.php
      *
@@ -63,9 +64,9 @@ public function testCategoryFields(string $field, string $value, array $expected
      * Test for getting asset id by product fields
      *
      * @dataProvider dataProvider
+     * @magentoConfigFixture system/media_gallery/enabled 1
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
-     *
      * @param string $field
      * @param string $value
      * @param array $expectedAssetIds
@@ -79,6 +80,22 @@ public function testProductFields(string $field, string $value, array $expectedA
         );
     }
 
+    /**
+     * Test for getting asset when media gallery disabled
+     *
+     * @magentoConfigFixture system/media_gallery/enabled 0
+     * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
+     * @magentoDataFixture Magento/MediaContentCatalog/_files/product_with_asset.php
+     * @throws InvalidArgumentException
+     */
+    public function testProductFieldsWithDisabledMediaGallery(): void
+    {
+        $this->assertEquals(
+            [],
+            $this->getAssetIdsByContentField->execute(self::STATUS_FIELD, self::STATUS_ENABLED)
+        );
+    }
+
     /**
      * Data provider for tests
      *
diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/_files/product_with_asset.php b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/_files/product_with_asset.php
index 2a1177661572a..2d54b5fa862ea 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCatalog/_files/product_with_asset.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCatalog/_files/product_with_asset.php
@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-use Magento\Catalog\Api\Data\ProductTierPriceExtensionFactory;
-use Magento\Catalog\Api\Data\ProductExtensionInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
@@ -14,8 +12,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
 
-Bootstrap::getInstance()->reinitialize();
-
 /** @var ObjectManager $objectManager */
 $objectManager = Bootstrap::getObjectManager();
 

From dc6c24968e94226631a455760af6f5c16443d07d Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 19:29:40 +0300
Subject: [PATCH 175/671] Correct integration tests

---
 .../Model/ResourceModel/GetAssetIdsByContentFieldTest.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
index bd6a08a7ab189..c7fb0a38340c1 100644
--- a/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
+++ b/dev/tests/integration/testsuite/Magento/MediaContentCms/Model/ResourceModel/GetAssetIdsByContentFieldTest.php
@@ -44,6 +44,7 @@ protected function setUp(): void
      * Test for getting asset id by block field
      *
      * @dataProvider blockDataProvider
+     * @magentoConfigFixture system/media_gallery/enabled 1
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCms/_files/block_with_asset.php
      *
@@ -64,6 +65,7 @@ public function testBlockFields(string $field, string $value, array $expectedAss
      * Test for getting asset id by page field
      *
      * @dataProvider pageDataProvider
+     * @magentoConfigFixture system/media_gallery/enabled 1
      * @magentoDataFixture Magento/MediaGallery/_files/media_asset.php
      * @magentoDataFixture Magento/MediaContentCms/_files/page_with_asset.php
      *

From 3226d069cdf0779b9e2a1a8d8041a8223b42aa55 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 12:51:35 +0300
Subject: [PATCH 176/671] fix Used in entities
 magento/adobe-stock-integration#1749

---
 .../deleteImageWithDetailConfirmation.js      | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
index 51d124ca319e6..2bff49a256c96 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
@@ -52,13 +52,15 @@ define([
          */
         getRecordRelatedContentMessage: function (images) {
             var usedInMessage = $t('The selected assets are used in the content of the following entities: '),
-                usedIn = [];
+                usedIn = {};
 
             $.each(images, function (key, image) {
                 $.each(image.details, function (sectionIndex, section) {
                     if (section.title === 'Used In' && _.isObject(section) && !_.isEmpty(section.value)) {
                         $.each(section.value, function (entityTypeIndex, entityTypeData) {
-                            usedIn.push(entityTypeData.name + '(' + entityTypeData.number + ')');
+                            usedIn[entityTypeData.name] = entityTypeData.name in usedIn ?
+                                usedIn[entityTypeData.name] + entityTypeData.number :
+                                entityTypeData.number;
                         });
                     }
                 });
@@ -68,7 +70,26 @@ define([
                 return '';
             }
 
-            return usedInMessage + usedIn.join(', ') + '.';
+            return usedInMessage + this.usedInObjectToString(usedIn);
+        },
+
+        /**
+         * Fromats usedIn object to string
+         *
+         * @param {Object} usedIn
+         * @return {String}
+         */
+        usedInObjectToString: function (usedIn) {
+            var message = '',
+                count = 0;
+
+            $.each(usedIn, function (entityName, number) {
+                count++;
+                message += entityName + '(' + number + ')';
+                message += count != Object.keys(usedIn).length ?  ', ' : '.';
+            });
+
+            return message;
         }
     };
 });

From 624ebcdcc399b856fe673628c18cc7ea2a3edc99 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 14:26:59 +0300
Subject: [PATCH 177/671] Fix static tests

---
 .../web/js/action/deleteImageWithDetailConfirmation.js          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
index 2bff49a256c96..f7ea1b8459904 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
@@ -86,7 +86,7 @@ define([
             $.each(usedIn, function (entityName, number) {
                 count++;
                 message += entityName + '(' + number + ')';
-                message += count != Object.keys(usedIn).length ?  ', ' : '.';
+                message += count !== Object.keys(usedIn).length ?  ', ' : '.';
             });
 
             return message;

From 0cd3df6de5a20edf1c17512c0a5ecd7f5f392718 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 12:35:28 +0300
Subject: [PATCH 178/671] Code review suggestion

---
 .../web/js/action/deleteImageWithDetailConfirmation.js   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
index f7ea1b8459904..ed40674df20f0 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
@@ -80,16 +80,13 @@ define([
          * @return {String}
          */
         usedInObjectToString: function (usedIn) {
-            var message = '',
-                count = 0;
+            var entities = [];
 
             $.each(usedIn, function (entityName, number) {
-                count++;
-                message += entityName + '(' + number + ')';
-                message += count !== Object.keys(usedIn).length ?  ', ' : '.';
+                entities.push(entityName + '(' + number + ')');
             });
 
-            return message;
+            return entities.join(', ') + '.';
         }
     };
 });

From b56ac4f2c75e997c38ad776b40bbfc0fd1e20696 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 11 Aug 2020 18:14:55 +0100
Subject: [PATCH 179/671] magento/adobe-stock-integration#1746: Corrected
 placeholders

---
 .../view/adminhtml/web/template/image/image-edit.html           | 2 +-
 .../base/web/templates/grid/filters/elements/ui-select.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
index e8448e1a64aef..80d1e29fd683f 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/image-edit.html
@@ -54,7 +54,7 @@
                     <div class="admin__field-control admin__field-option admin__control-grouped">
                         <div class="admin__field admin__field-group-additional">
                             <div class="admin__field-control">
-                                <input type="text" id="keyword" data-ui-id="keyword" name="keyword" placeholder="New Keyword"
+                                <input type="text" id="keyword" data-ui-id="keyword" name="keyword" placeholder="New Tag"
                                        class="admin__control-text minimum-length-0 maximum-length-128" ko-value="newKeyword"
                                        data-validate="{'validate-image-keyword': true, 'validate-length': true}"/>
                             </div>
diff --git a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
index 3e5108b53ccd5..5036b7121c626 100644
--- a/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
+++ b/app/code/Magento/Ui/view/base/web/templates/grid/filters/elements/ui-select.html
@@ -141,7 +141,7 @@
         </div>
         <div ifnot="options().length"
              class="admin__action-multiselect-empty-area">
-            <ul data-bind="html: getEmptyOptionsUnsanitizedHtml"/>
+            <ul data-bind="html: getEmptyOptionsUnsanitizedHtml()"/>
         </div>
         <!-- /ko -->
         <ul class="admin__action-multiselect-menu-inner _root"

From e1540f0f7cc463ba20094fad89147adda69c2497 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 15:58:32 +0300
Subject: [PATCH 180/671] Fix new iTxt segment creation for PNG image XMP
 segment

---
 .../Model/Png/Segment/WriteXmp.php               | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
index 292a52322d621..7cda517ed1b76 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
@@ -80,9 +80,11 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         }
 
         if (empty($pngXmpSegments)) {
+            $segments[] = $this->createPngXmpSegment($metadata);
+
             return $this->fileFactory->create([
                 'path' => $file->getPath(),
-                'segments' => $this->insertPngXmpSegment($segments, $this->createPngXmpSegment($metadata))
+                'segments' => $segments
             ]);
         }
 
@@ -96,18 +98,6 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         ]);
     }
 
-    /**
-     * Insert XMP segment to image png segments (at position 1)
-     *
-     * @param SegmentInterface[] $segments
-     * @param SegmentInterface $xmpSegment
-     * @return SegmentInterface[]
-     */
-    private function insertPngXmpSegment(array $segments, SegmentInterface $xmpSegment): array
-    {
-        return array_merge(array_slice($segments, 0, 2), [$xmpSegment], array_slice($segments, 2));
-    }
-
     /**
      * Write new png segment  metadata
      *

From aabcbfc5f262006aec7f547ab3a1ce15732c7fe7 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 16:26:20 +0300
Subject: [PATCH 181/671] write PNG metadata chunks before IEND chunk

---
 .../Model/Png/Segment/WriteIptc.php           | 20 ++++++++++++++++---
 .../Model/Png/Segment/WriteXmp.php            | 20 ++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
index d40dbc13d2962..becbd8861affa 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
@@ -71,11 +71,9 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         }
 
         if (empty($pngIptcSegments)) {
-            $segments[] =  $this->createPngIptcSegment($metadata);
-
             return $this->fileFactory->create([
                 'path' => $file->getPath(),
-                'segments' => $segments
+                'segments' => $this->insertPngIptcSegment($segments, $this->createPngIptcSegment($metadata))
             ]);
         }
 
@@ -89,6 +87,22 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         ]);
     }
 
+    /**
+     * Insert IPTC segment to image png segments before IEND chunk
+     *
+     * @param SegmentInterface[] $segments
+     * @param SegmentInterface $xmpSegment
+     * @return SegmentInterface[]
+     */
+    private function insertPngIptcSegment(array $segments, SegmentInterface $xmpSegment): array
+    {
+        return array_merge(
+            array_slice($segments, 0, count($segments) - 1),
+            [$xmpSegment],
+            array_slice($segments, count($segments) - 1)
+        );
+    }
+
     /**
      * Create new  zTXt segment with metadata
      *
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
index 7cda517ed1b76..84fea00f99ea9 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
@@ -80,11 +80,9 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         }
 
         if (empty($pngXmpSegments)) {
-            $segments[] = $this->createPngXmpSegment($metadata);
-
             return $this->fileFactory->create([
                 'path' => $file->getPath(),
-                'segments' => $segments
+                'segments' => $this->insertPngXmpSegment($segments, $this->createPngXmpSegment($metadata))
             ]);
         }
 
@@ -98,6 +96,22 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
         ]);
     }
 
+    /**
+     * Insert XMP segment to image png segments before IEND chunk
+     *
+     * @param SegmentInterface[] $segments
+     * @param SegmentInterface $xmpSegment
+     * @return SegmentInterface[]
+     */
+    private function insertPngXmpSegment(array $segments, SegmentInterface $xmpSegment): array
+    {
+        return array_merge(
+            array_slice($segments, 0, count($segments) - 1),
+            [$xmpSegment],
+            array_slice($segments, count($segments) - 1)
+        );
+    }
+
     /**
      * Write new png segment  metadata
      *

From f44976fd85d1c1b0a4beeff2fd9a41f3f1677a85 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 18:47:06 +0300
Subject: [PATCH 182/671] Correct variable names

---
 .../MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
index becbd8861affa..fd4b2e7252a1f 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
@@ -91,14 +91,14 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
      * Insert IPTC segment to image png segments before IEND chunk
      *
      * @param SegmentInterface[] $segments
-     * @param SegmentInterface $xmpSegment
+     * @param SegmentInterface $iptcSegment
      * @return SegmentInterface[]
      */
-    private function insertPngIptcSegment(array $segments, SegmentInterface $xmpSegment): array
+    private function insertPngIptcSegment(array $segments, SegmentInterface $iptcSegment): array
     {
         return array_merge(
             array_slice($segments, 0, count($segments) - 1),
-            [$xmpSegment],
+            [$iptcSegment],
             array_slice($segments, count($segments) - 1)
         );
     }

From c986c812627280dd7bc66a08d67ccc74dac02a73 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 11:25:57 +0300
Subject: [PATCH 183/671] Code review improvements

---
 .../MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php    | 6 ++++--
 .../MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php     | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
index fd4b2e7252a1f..9025ba9363fde 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteIptc.php
@@ -96,10 +96,12 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
      */
     private function insertPngIptcSegment(array $segments, SegmentInterface $iptcSegment): array
     {
+        $iendSegmentIndex = count($segments) - 1;
+
         return array_merge(
-            array_slice($segments, 0, count($segments) - 1),
+            array_slice($segments, 0, $iendSegmentIndex),
             [$iptcSegment],
-            array_slice($segments, count($segments) - 1)
+            array_slice($segments, $iendSegmentIndex)
         );
     }
 
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
index 84fea00f99ea9..f03482ecf6054 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/WriteXmp.php
@@ -105,10 +105,11 @@ public function execute(FileInterface $file, MetadataInterface $metadata): FileI
      */
     private function insertPngXmpSegment(array $segments, SegmentInterface $xmpSegment): array
     {
+        $iendSegmentIndex = count($segments) - 1;
         return array_merge(
-            array_slice($segments, 0, count($segments) - 1),
+            array_slice($segments, 0, $iendSegmentIndex),
             [$xmpSegment],
-            array_slice($segments, count($segments) - 1)
+            array_slice($segments, $iendSegmentIndex)
         );
     }
 

From 31dc97c3458eb01b0f31dc1e195752607e37ec26 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 5 Aug 2020 18:39:19 +0800
Subject: [PATCH 184/671] magento/magento2#1684: Login failed error contains
 HTML tags - added a function to format messages to render as HTML

---
 .../view/adminhtml/web/js/grid/messages.js     | 18 +++++++++++++++---
 .../adminhtml/web/template/grid/messages.html  |  2 +-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
index 7116784f41a0d..6e68b8e679e17 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
@@ -4,15 +4,17 @@
  */
 
 define([
-    'uiElement'
-], function (Element) {
+    'uiElement',
+    'escaper'
+], function (Element, escaper) {
     'use strict';
 
     return Element.extend({
         defaults: {
             template: 'Magento_MediaGalleryUi/grid/messages',
             messageDelay: 5,
-            messages: []
+            messages: [],
+            allowedTags: ['div', 'span', 'b', 'strong', 'i', 'em', 'u', 'a']
         },
 
         /**
@@ -72,6 +74,16 @@ define([
                 clearTimeout(timerId);
                 this.clear();
             }.bind(this), Number(delay) * 1000);
+        },
+
+        /**
+         * Prepare the given message to be rendered as HTML
+         *
+         * @param {String} message
+         * @return {String}
+         */
+        prepareMessageForHtml: function (message) {
+            return escaper.escapeHtml(message, this.allowedTags);
         }
     });
 });
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
index 1ec084e223e98..ca758b721e8fc 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
@@ -8,7 +8,7 @@
     <div class="messages" outereach="messages">
         <div attr="class: 'message message-'+code">
             <div data-ui-id="messages-message-error">
-                <span text="message"></span>
+                <span data-bind="html: $parent.prepareMessageForHtml(message)"></span>
             </div>
         </div>
     </div>

From 162e583474521e296d9b7df2ccf658b95da0277d Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Thu, 6 Aug 2020 18:22:07 +0800
Subject: [PATCH 185/671] magento/magento2#1684: Login failed error contains
 HTML tags - fix static tests and added jasmine tests

---
 .../view/adminhtml/web/js/grid/messages.js    |  2 +-
 .../adminhtml/web/template/grid/messages.html |  2 +-
 .../adminhtml/js/grid/messages.test.js        | 56 +++++++++++++++++++
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
index 6e68b8e679e17..8ed802d53825a 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/messages.js
@@ -82,7 +82,7 @@ define([
          * @param {String} message
          * @return {String}
          */
-        prepareMessageForHtml: function (message) {
+        prepareMessageUnsanitizedHtml: function (message) {
             return escaper.escapeHtml(message, this.allowedTags);
         }
     });
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
index ca758b721e8fc..eb526c68de23a 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
@@ -8,7 +8,7 @@
     <div class="messages" outereach="messages">
         <div attr="class: 'message message-'+code">
             <div data-ui-id="messages-message-error">
-                <span data-bind="html: $parent.prepareMessageForHtml(message)"></span>
+                <span data-bind="html: $parent.prepareMessageUnsanitizedHtml(message)"></span>
             </div>
         </div>
     </div>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
new file mode 100644
index 0000000000000..7de3e61695f37
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
@@ -0,0 +1,56 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_MediaGalleryUi/js/grid/messages',
+], function (Messages) {
+    'use strict';
+
+    describe('Magento_MediaGalleryUi/grid/messages', function () {
+        var message,
+            messageText,
+            errorType,
+            successType;
+
+        beforeEach(function () {
+            message = Messages;
+            messageText = 'test message';
+            errorType = 'error';
+            successType = 'success';
+        });
+
+        describe('message handling', function () {
+            it('add error message, get error message', function () {
+                message.add(errorType, messageText);
+                expect(message.get()).toEqual([messageText]);
+            });
+
+            it('add success message, get success message', function () {
+                message.add(successType, messageText);
+                expect(message.get()).toEqual([messageText]);
+            });
+
+            it('scheduled cleaning messages', function () {
+                message.add(errorType, messageText);
+                message.scheduleCleanup();
+                expect(message.get()).toEqual([]);
+            });
+        });
+
+        describe('prepareMessageUnsanitizedHtml', function () {
+            var messageData,
+                expectedData;
+
+            beforeEach(function () {
+                messageData = 'Login failed. Please check if the <a href="%1">Secret Key</a> is set correctly and try again.';
+                expectedData = 'Login failed. Please check if the <a href="%1">Secret Key</a> is set correctly and try again.';
+            });
+
+            it('prepare message to be rendered as HTML', function () {
+               expect(message.prepareMessageUnsanitizedHtml(messageData)).toEqual(expectedData)
+            });
+        });
+    });
+});

From 72e2cfe62a6d174d71c77afe37ef8c4ff4f57177 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Thu, 6 Aug 2020 19:23:02 +0800
Subject: [PATCH 186/671] magento/magento2#1684: Login failed error contains
 HTML tags - fix static tests

---
 .../MediaGalleryUi/adminhtml/js/grid/messages.test.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
index 7de3e61695f37..2f1e56a737e71 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
@@ -4,11 +4,11 @@
  */
 
 define([
-    'Magento_MediaGalleryUi/js/grid/messages',
+    'Magento_MediaGalleryUi/js/grid/messages'
 ], function (Messages) {
     'use strict';
 
-    describe('Magento_MediaGalleryUi/grid/messages', function () {
+    describe('Magento_MediaGalleryUi/js/grid/messages', function () {
         var message,
             messageText,
             errorType,
@@ -49,7 +49,7 @@ define([
             });
 
             it('prepare message to be rendered as HTML', function () {
-               expect(message.prepareMessageUnsanitizedHtml(messageData)).toEqual(expectedData)
+                expect(message.prepareMessageUnsanitizedHtml(messageData)).toEqual(expectedData)
             });
         });
     });

From 02da4f06667c1389bcb680960757f618a53b1912 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sun, 9 Aug 2020 19:29:16 +0100
Subject: [PATCH 187/671] magento/magento2#29398: Fixed jasmine test

---
 .../adminhtml/js/grid/messages.test.js        | 76 ++++++++++++-------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
index 2f1e56a737e71..a906c28fdbd56 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
@@ -4,53 +4,75 @@
  */
 
 define([
-    'Magento_MediaGalleryUi/js/grid/messages'
-], function (Messages) {
+    'Magento_MediaGalleryUi/js/grid/messages',
+    'escaper'
+], function (Messages, Escaper) {
     'use strict';
 
     describe('Magento_MediaGalleryUi/js/grid/messages', function () {
-        var message,
+        var messagesInstance,
+            escaperInstance,
             messageText,
             errorType,
             successType;
 
         beforeEach(function () {
-            message = Messages;
+            escaperInstance = Escaper;
+            messagesInstance = Messages({
+                escaper: escaperInstance
+            });
             messageText = 'test message';
             errorType = 'error';
             successType = 'success';
         });
 
-        describe('message handling', function () {
-            it('add error message, get error message', function () {
-                message.add(errorType, messageText);
-                expect(message.get()).toEqual([messageText]);
-            });
+        it('add error message, get error message', function () {
+            messagesInstance.add(errorType, messageText);
+            expect(messagesInstance.get()).toEqual([{
+                code: errorType,
+                message: messageText
+            }]);
+        });
 
-            it('add success message, get success message', function () {
-                message.add(successType, messageText);
-                expect(message.get()).toEqual([messageText]);
-            });
+        it('add success message, get success message', function () {
+            messagesInstance.add(successType, messageText);
+            expect(messagesInstance.get()).toEqual([{
+                code: successType,
+                message: messageText
+            }]);
+        });
 
-            it('scheduled cleaning messages', function () {
-                message.add(errorType, messageText);
-                message.scheduleCleanup();
-                expect(message.get()).toEqual([]);
-            });
+        it('handles multiple messages', function () {
+            messagesInstance.add(successType, messageText);
+            messagesInstance.add(errorType, messageText);
+            expect(messagesInstance.get()).toEqual([
+                {
+                    code: successType,
+                    message: messageText
+                },
+                {
+                    code: errorType,
+                    message: messageText
+                }
+            ]);
         });
 
-        describe('prepareMessageUnsanitizedHtml', function () {
-            var messageData,
-                expectedData;
+        it('cleans messages', function () {
+            messagesInstance.add(errorType, messageText);
+            messagesInstance.clear();
 
-            beforeEach(function () {
-                messageData = 'Login failed. Please check if the <a href="%1">Secret Key</a> is set correctly and try again.';
-                expectedData = 'Login failed. Please check if the <a href="%1">Secret Key</a> is set correctly and try again.';
-            });
+            expect(messagesInstance.get()).toEqual([]);
+        });
 
-            it('prepare message to be rendered as HTML', function () {
-                expect(message.prepareMessageUnsanitizedHtml(messageData)).toEqual(expectedData)
+        it('prepare message to be rendered as HTML', function () {
+            var escapedMessage = 'escaped message';
+
+            // eslint-disable-next-line max-nested-callbacks
+            spyOn(escaperInstance, 'escapeHtml').and.callFake(function () {
+                return escapedMessage;
             });
+
+            expect(messagesInstance.prepareMessageUnsanitizedHtml(messageText)).toEqual(escapedMessage);
         });
     });
 });

From 856f5c15e625531e21068c4bc582542f2e68e4d6 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sun, 9 Aug 2020 19:35:18 +0100
Subject: [PATCH 188/671] magento/magento2#29398: Corrected binding

---
 .../view/adminhtml/web/template/grid/messages.html              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
index eb526c68de23a..3279856895d77 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/messages.html
@@ -8,7 +8,7 @@
     <div class="messages" outereach="messages">
         <div attr="class: 'message message-'+code">
             <div data-ui-id="messages-message-error">
-                <span data-bind="html: $parent.prepareMessageUnsanitizedHtml(message)"></span>
+                <span html="$parent.prepareMessageUnsanitizedHtml(message)"></span>
             </div>
         </div>
     </div>

From 411187957e097aabd546dde7811fc4dbb8f0ce97 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 11 Aug 2020 12:47:09 +0100
Subject: [PATCH 189/671] magento/magento2#29398: Corrected objects comparison
 in jasmine test

---
 .../adminhtml/js/grid/messages.test.js             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
index a906c28fdbd56..39444f8859465 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/MediaGalleryUi/adminhtml/js/grid/messages.test.js
@@ -28,24 +28,24 @@ define([
 
         it('add error message, get error message', function () {
             messagesInstance.add(errorType, messageText);
-            expect(messagesInstance.get()).toEqual([{
+            expect(JSON.stringify(messagesInstance.get())).toEqual(JSON.stringify([{
                 code: errorType,
                 message: messageText
-            }]);
+            }]));
         });
 
         it('add success message, get success message', function () {
             messagesInstance.add(successType, messageText);
-            expect(messagesInstance.get()).toEqual([{
+            expect(JSON.stringify(messagesInstance.get())).toEqual(JSON.stringify([{
                 code: successType,
                 message: messageText
-            }]);
+            }]));
         });
 
         it('handles multiple messages', function () {
             messagesInstance.add(successType, messageText);
             messagesInstance.add(errorType, messageText);
-            expect(messagesInstance.get()).toEqual([
+            expect(JSON.stringify(messagesInstance.get())).toEqual(JSON.stringify([
                 {
                     code: successType,
                     message: messageText
@@ -54,14 +54,14 @@ define([
                     code: errorType,
                     message: messageText
                 }
-            ]);
+            ]));
         });
 
         it('cleans messages', function () {
             messagesInstance.add(errorType, messageText);
             messagesInstance.clear();
 
-            expect(messagesInstance.get()).toEqual([]);
+            expect(JSON.stringify(messagesInstance.get())).toEqual(JSON.stringify([]));
         });
 
         it('prepare message to be rendered as HTML', function () {

From 7882f6abcfd8b15245df906c96e16c524734f696 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 12 Aug 2020 19:24:25 +0300
Subject: [PATCH 190/671] Exif Reader IMplementation

---
 .../Model/Jpeg/Segment/ReadExif.php           |  74 ++++++++++++++++++
 .../Test/_files/exif-image.jpeg               | Bin 0 -> 22905 bytes
 .../Magento/MediaGalleryMetadata/etc/di.xml   |   1 +
 3 files changed, 75 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
new file mode 100644
index 0000000000000..0c142403affd1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Jpeg\Segment;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * Jpeg EXIF Reader
+ */
+class ReadExif implements ReadMetadataInterface
+{
+    private const EXIF_SEGMENT_NAME = 'APP1';
+    private const EXIF_SEGMENT_START = "Exif\x00";
+    private const EXIF_DATA_START_POSITION = 0;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(
+        MetadataInterfaceFactory $metadataFactory
+    ) {
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = [];
+
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isExifSegment($segment)) {
+            }
+        }
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => !empty($keywords) ? $keywords : null
+        ]);
+    }
+
+    /**
+     * Does segment contain Exif data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isExifSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::EXIF_SEGMENT_NAME
+            && strncmp(
+                substr($segment->getData(), self::EXIF_DATA_START_POSITION, 4),
+                self::EXIF_SEGMENT_START,
+                self::EXIF_DATA_START_POSITION
+            ) == 0;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..7c1dbc3a6a465fa7f9026e088f623387de657a4c
GIT binary patch
literal 22905
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
U|8Nkv2VWR5Bd@z1^lrTg0QL`_O#lD@

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/etc/di.xml b/app/code/Magento/MediaGalleryMetadata/etc/di.xml
index d2f1f90510488..d6b2899729fb7 100644
--- a/app/code/Magento/MediaGalleryMetadata/etc/di.xml
+++ b/app/code/Magento/MediaGalleryMetadata/etc/di.xml
@@ -121,6 +121,7 @@
             <argument name="segmentReaders" xsi:type="array">
                 <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadXmp</item>
                 <item name="iptc" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadIptc</item>
+                <item name="exif" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadExif</item>
             </argument>
         </arguments>
     </virtualType>

From 732d9f57e33ab9d4c2c4fa5353faf0a5a1dbbd05 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 14:49:16 +0300
Subject: [PATCH 191/671] add integration test for exif standart

---
 .../Model/Jpeg/Segment/ExifTest.php           | 132 ++++++++++++++++++
 .../Test/_files/exif-image.jpeg               | Bin 22905 -> 19494 bytes
 2 files changed, 132 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php
new file mode 100644
index 0000000000000..93c4ced52bc9f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Test\Integration\Model\Jpeg\Segment;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile;
+use Magento\MediaGalleryMetadata\Model\MetadataFactory;
+
+/**
+ * Test for EXIF reader
+ */
+class ExifTest extends TestCase
+{
+    /**
+     * @var WriteIptc
+     */
+    private $iptcWriter;
+
+    /**
+     * @var ReadIptc
+     */
+    private $iptcReader;
+
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var ReadFile
+     */
+    private $fileReader;
+
+    /**
+     * @var MetadataFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @var WriteInterface
+     */
+    private $varDirectory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->varDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
+            ->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $this->iptcWriter = Bootstrap::getObjectManager()->get(WriteIptc::class);
+        $this->iptcReader = Bootstrap::getObjectManager()->get(ReadIptc::class);
+        $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
+    }
+
+    /**
+     * Test for IPTC reader and writer
+     *
+     * @dataProvider filesProvider
+     * @param string $fileName
+     * @param string $title
+     * @param string $description
+     * @param array $keywords
+     * @throws LocalizedException
+     */
+    public function testWriteRead(
+        string $fileName,
+        string $title,
+        string $description,
+        array $keywords
+    ): void {
+        $path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
+        $modifiableFilePath = $this->varDirectory->getAbsolutePath($fileName);
+        $this->driver->copy(
+            $path,
+            $modifiableFilePath
+        );
+        $modifiableFilePath = $this->fileReader->execute($modifiableFilePath);
+        $originalMetadata = $this->iptcReader->execute($modifiableFilePath);
+
+        $this->assertEmpty($originalMetadata->getTitle());
+        $this->assertEmpty($originalMetadata->getDescription());
+        $this->assertEmpty($originalMetadata->getKeywords());
+
+        $updatedFile = $this->iptcWriter->execute(
+            $modifiableFilePath,
+            $this->metadataFactory->create([
+                'title' => $title,
+                'description' => $description,
+                'keywords' => $keywords
+            ])
+        );
+
+        $updatedMetadata = $this->iptcReader->execute($updatedFile);
+
+        $this->assertEquals($title, $updatedMetadata->getTitle());
+        $this->assertEquals($description, $updatedMetadata->getDescription());
+        $this->assertEquals($keywords, $updatedMetadata->getKeywords());
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                'empty_iptc.jpeg',
+                'Updated Title',
+                'Updated Description',
+                [
+                    'magento2',
+                    'mediagallery'
+                ]
+            ]
+        ];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg
index 7c1dbc3a6a465fa7f9026e088f623387de657a4c..666488a923b2cbe4e2b1150e27da140b2016b29c 100644
GIT binary patch
delta 156
zcmeyliE-Hs#`^y^{y$`x<64oK#=zj~%b>-;z`()4#>mUS1Y`*VaTp^Xm@NflXE91K
zumWjDAZ}rlhO>JZH5iz|;y_(Y!caCy6%c^TR`5+sPt7aIS18FW$w`HZrKA=oPuwcP
R>j6{*QVXUxf97rT1^{$f8%F>D

delta 3610
zcmeHK&2Q936n{>F_!1wDdV(A*BLpg}?RCOOtT+e~0x4QRBvPy19DBU$#%mjU!a95L
z4K9do_kcJc6bUKf2t6V7(0_n4Y9$VE<AS(Vs#IzFX4dv@+rV<!+pab8Z)e{8-h032
zXN|WX34i?}q@CY8Z{hH_OUp|j2mmd-pz}_6c{y<%fJz0v0f0TQS2zG;h`z?r6b^EH
z1n~o562|c^;03}F*u^oxGvR1~p9?258)Oi)g6HKu7t)Dr!~4fi7zIq>c!dL403vm%
zN5ndzrfpKQJ7<&FirkR8f!|xf4H!6Q;CD^cR9!u*YnrH)^%+f{R^c)v;DQ6EVI2r;
zLIVOwBd{T6{`R%T^T-6JHBsPZ>no0TBm0BaWPu;H?*h)jB+fr+|IFtn&Y_!jyN9=g
zo;q7&kR?0T-Wtzv3h+1czEiwA&7D%qx~c-?_lqkF%geZb#fk{=<61yF@Am&uqcqeN
z#gApv4%Ucl1$8AcL!~UM3d~(dLep9&R9qv~)b$PN<FCI-qH7z{cV{YUC0rmi_i8gD
zE6wYxR&(8&wWSO5;#{I9^^lc9OzNH=>xm(8b{#RBRwR*|&~-!lzH(Ds2qGfR$TPB9
z!dl+ZB;<%}N58eWlriAH)R3}Z8;yqCn3jX6s+4DEXBAabG_8atrFhe)W>WIwV>!iQ
z-y^^%&9z{I8WIN3jjSFPv^#2$8-}$spaH7(3HuQB<jY*Sd>3^cXJ>x4@-I`{Dh$Jo
z$m7}BmO?yICq9jpaw?aZZuL-Kh=@taA`U}hl`pAhOPaQtKfPU}N?^Or=4XtGh;?Sv
z<;22v2^nWW*nNUh346?O^c#_j0hz3+45`d?wk^G{)3VxK^k{}Wmx--=re8Irq+}Dv
z-0-M0-(Q*l8@Pt;YgUmv5M2i56jm_LMH+@uy-TV5&mB(i?*C%XtNdN@1wQ*+(v)pN
z7w9eCSo@J!d48A7YLV%DmO)?aSrT<(yJpq&JQ8i@Z>c^jo@<whCD`-87noFO_9n~Z
zV9mi`(QEVKaDVA==?Aip{1239s0Jhbhbr$t@{#@nB^s*1NdKYAJCJ;&|3HcUW6(Rk
z6CY1@4LqB7KETzR`B7DzmQ^@^X}L1NzBT|3O$k51_|fB6rts@)3@^TRoUa`|cj)}d
X?fCY6|MjsGKfU>L`{|3VyVw2!O?J2y


From 7acd2fd3fc63259340f5b1ed719ab0224ddb197a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 13 Aug 2020 14:49:56 +0300
Subject: [PATCH 192/671] skip tests cases

---
 .../Integration/Model/ExtractMetadataTest.php | 87 ++++++++++---------
 1 file changed, 48 insertions(+), 39 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
index 982ccbb20fe2c..a5ff5de0aeaef 100644
--- a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
@@ -63,50 +63,59 @@ public function filesProvider(): array
     {
         return [
             [
-                'macos-photos.jpeg',
+                'exif-image.jpeg',
                 'Title of the magento image',
-                'Description of the magento image',
+                'exif fromat title',
                 [
-                    'magento',
-                    'mediagallerymetadata'
-                ]
-            ],
-            [
-                'macos-preview.png',
-                'Title of the magento image',
-                'Description of the magento image',
-                [
-                    'magento',
-                    'mediagallerymetadata'
-                ]
-            ],
-            [
-                'iptc_only.jpeg',
-                'Title of the magento image',
-                'Description of the magento image',
-                [
-                    'magento',
-                    'mediagallerymetadata'
-                ]
-            ],
-            [
-                'exiftool.gif',
-                'Title of the magento image',
-                'Description of the magento image',
-                [
-                    'magento',
-                    'mediagallerymetadata'
-                ]
-            ],
-            [
-                'iptc_only.png',
-                'Title of the magento image',
-                'PNG format is awesome',
-                [
-                    'png',
+                    'exif',
                     'awesome'
                 ]
             ],
+            //[
+            //  'macos-photos.jpeg',
+            //  'Title of the magento image',
+            //  'Description of the magento image',
+            //  [
+            //      'magento',
+            //      'mediagallerymetadata'
+            //  ]
+            //],
+            // [
+            //  'macos-preview.png',
+            //  'Title of the magento image',
+            //  'Description of the magento image',
+            //  [
+            //      'magento',
+            //      'mediagallerymetadata'
+            ///  ]
+            // ],
+            // [
+            //  'iptc_only.jpeg',
+            ///  'Title of the magento image',
+            // 'Description of the magento image',
+            //  [
+            //      'magento',
+            //      'mediagallerymetadata'
+            //  ]
+            //],
+            //[
+            //  'exiftool.gif',
+            //  'Title of the magento image',
+            //  'Description of the magento image',
+            //  [
+            //      'magento',
+            //      'mediagallerymetadata'
+            //  ]
+            // ],
+            //[
+            //  'iptc_only.png',
+            //  'Title of the magento image',
+            //  'PNG format is awesome',
+            //  [
+            //      'png',
+            //      'awesome'
+            //  ]
+            ///],
         ];
     }
 }

From 8d4adce22a58926992ce4eb76c6a98efbc511f7a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:21:45 +0300
Subject: [PATCH 193/671] Add suport of reading PNG JPEG Exif metadata

---
 .../Model/Jpeg/Segment/ReadExif.php           |  36 ++++++-
 .../Model/Png/Segment/ReadExif.php            |  91 ++++++++++++++++
 .../Integration/Model/ExtractMetadataTest.php | 101 +++++++++---------
 .../Test/_files/exif-image.jpeg               | Bin 19494 -> 19630 bytes
 .../Test/_files/exif_image.png                | Bin 0 -> 47756 bytes
 .../Magento/MediaGalleryMetadata/etc/di.xml   |   1 +
 6 files changed, 177 insertions(+), 52 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
 create mode 100644 app/code/Magento/MediaGalleryMetadata/Test/_files/exif_image.png

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
index 0c142403affd1..5e5deb0e119fc 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
@@ -41,14 +41,44 @@ public function __construct(
      */
     public function execute(FileInterface $file): MetadataInterface
     {
-        $title = null;
-        $description = null;
-        $keywords = [];
+        if (!is_callable('exif_read_data')) {
+            throw new LocalizedException(
+                __('exif_read_data() must be enabled in php configuration')
+            );
+        }
 
         foreach ($file->getSegments() as $segment) {
             if ($this->isExifSegment($segment)) {
+                return $this->getExifData($file->getPath());
             }
         }
+
+        return $this->metadataFactory->create([
+            'title' => null,
+            'description' => null,
+            'keywords' => null
+        ]);
+    }
+
+    /**
+     * Parese exif data from segment
+     *
+     * @param string $filePath
+     */
+    private function getExifData(string $filePath): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = [];
+
+        $data = exif_read_data($filePath);
+
+        if ($data) {
+            $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
+            $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
+            $keywords = '';
+        }
+
         return $this->metadataFactory->create([
             'title' => $title,
             'description' => $description,
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
new file mode 100644
index 0000000000000..cd1160ed92589
--- /dev/null
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Png\Segment;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+
+/**
+ * Jpeg EXIF Reader
+ */
+class ReadExif implements ReadMetadataInterface
+{
+    private const EXIF_SEGMENT_NAME = 'eXIf';
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(
+        MetadataInterfaceFactory $metadataFactory
+    ) {
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isExifSegment($segment)) {
+                return $this->getExifData($segment);
+            }
+        }
+
+        return $this->metadataFactory->create([
+            'title' => null,
+            'description' => null,
+            'keywords' => null
+        ]);
+    }
+
+    /**
+     * Parese exif data from segment
+     *
+     * @param FileInterface $filePath
+     */
+    private function getExifData(SegmentInterface $segment): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = [];
+
+        $data = exif_read_data('data://image/jpeg;base64,' . base64_encode($segment->getData()));
+
+        if ($data) {
+            $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
+            $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
+            $keywords = '';
+        }
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => !empty($keywords) ? $keywords : null
+        ]);
+    }
+
+    /**
+     * Does segment contain Exif data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isExifSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::EXIF_SEGMENT_NAME;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
index a5ff5de0aeaef..ebe96183eb1f2 100644
--- a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
+++ b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php
@@ -37,14 +37,14 @@ protected function setUp(): void
      * @param string $fileName
      * @param string $title
      * @param string $description
-     * @param array $keywords
+     * @param null|array $keywords
      * @throws LocalizedException
      */
     public function testExecute(
         string $fileName,
         string $title,
         string $description,
-        array $keywords
+        ?array $keywords
     ): void {
         $path = realpath(__DIR__ . '/../../_files/' . $fileName);
         $metadata = $this->extractMetadata->execute($path);
@@ -62,60 +62,63 @@ public function testExecute(
     public function filesProvider(): array
     {
         return [
+            [
+                'exif_image.png',
+                'Exif title png imge',
+                'Exif description png imge',
+                null
+            ],
             [
                 'exif-image.jpeg',
+                'Exif Magento title',
+                'Exif description metadata',
+                 null
+            ],
+            [
+                'macos-photos.jpeg',
+                'Title of the magento image',
+                'Description of the magento image',
+                [
+                    'magento',
+                    'mediagallerymetadata'
+                ]
+            ],
+            [
+                'macos-preview.png',
+                'Title of the magento image',
+                'Description of the magento image',
+                [
+                    'magento',
+                    'mediagallerymetadata'
+                ]
+            ],
+            [
+                'iptc_only.jpeg',
+                'Title of the magento image',
+                'Description of the magento image',
+                [
+                    'magento',
+                    'mediagallerymetadata'
+                ]
+            ],
+            [
+                'exiftool.gif',
+                'Title of the magento image',
+                'Description of the magento image',
+                [
+                    'magento',
+                    'mediagallerymetadata'
+                ]
+            ],
+            [
+                'iptc_only.png',
                 'Title of the magento image',
-                'exif fromat title',
+                'PNG format is awesome',
                 [
-                    'exif',
+                    'png',
                     'awesome'
                 ]
             ],
-            //[
-            //  'macos-photos.jpeg',
-            //  'Title of the magento image',
-            //  'Description of the magento image',
-            //  [
-            //      'magento',
-            //      'mediagallerymetadata'
-            //  ]
-            //],
-            // [
-            //  'macos-preview.png',
-            //  'Title of the magento image',
-            //  'Description of the magento image',
-            //  [
-            //      'magento',
-            //      'mediagallerymetadata'
-            ///  ]
-            // ],
-            // [
-            //  'iptc_only.jpeg',
-            ///  'Title of the magento image',
-            // 'Description of the magento image',
-            //  [
-            //      'magento',
-            //      'mediagallerymetadata'
-            //  ]
-            //],
-            //[
-            //  'exiftool.gif',
-            //  'Title of the magento image',
-            //  'Description of the magento image',
-            //  [
-            //      'magento',
-            //      'mediagallerymetadata'
-            //  ]
-            // ],
-            //[
-            //  'iptc_only.png',
-            //  'Title of the magento image',
-            //  'PNG format is awesome',
-            //  [
-            //      'png',
-            //      'awesome'
-            //  ]
-            ///],
         ];
     }
 }
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/exif-image.jpeg
index 666488a923b2cbe4e2b1150e27da140b2016b29c..cfe27433fd9fce9d4b0202f604c13a3848f90c35 100644
GIT binary patch
delta 269
zcmZ2BgK^zV#`^y^{y$_?ajnQqV_@+0Wzb?^VBlcjVB}?B0<wgGIFFGJ%$5SOn;4}S
zSb;Pn5YJ(hhO?J2YA`T^#euq*grRJps`g9<7O47TbLN5dfy`M0#0(%i6(*)z)~7O5
zFk~{MG3YQPGL$o<G88l9GvoqkAYh%qz`zcqSqzMfjV3Ze*o;if43pZxY!RSaI2ORv
z7#bKXV1!uy|364O1A}9*v!^GJP6b+~lUSZwoS&Qe{{Vv^2g4txNz9B&3`~L>*Oz+(
E02;e1cmMzZ

delta 109
zcmZ2ClX2M$#<>4C{y$`x<64oK#=zj~%b>-;z`()4#>mUS1Y`*VaTp^Xm@NflXE91K
lumWjDAZ}rlhO>JZH5iz|;y_(Y!caC))x<KV%^Hkt-T+V<4>te+

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/exif_image.png b/app/code/Magento/MediaGalleryMetadata/Test/_files/exif_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a6bf30c2d516ee21c515ccff1fbe812299cd0a8
GIT binary patch
literal 47756
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
UKBqk>1m_4!a_W#Onb#rz3wPioP5=M^

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGalleryMetadata/etc/di.xml b/app/code/Magento/MediaGalleryMetadata/etc/di.xml
index d6b2899729fb7..4cd9a34e43a93 100644
--- a/app/code/Magento/MediaGalleryMetadata/etc/di.xml
+++ b/app/code/Magento/MediaGalleryMetadata/etc/di.xml
@@ -112,6 +112,7 @@
             <argument name="segmentReaders" xsi:type="array">
                 <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\ReadXmp</item>
                 <item name="iptc" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\ReadIptc</item>
+                <item name="exif" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\ReadExif</item>
             </argument>
         </arguments>
     </virtualType>

From 982d015bfbc5b62131fd69216222216aeada043e Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:31:35 +0300
Subject: [PATCH 194/671] Add validation

---
 .../MediaGalleryMetadata/Model/Png/Segment/ReadExif.php     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
index cd1160ed92589..94e5f4a9ef0e9 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -39,6 +39,12 @@ public function __construct(
      */
     public function execute(FileInterface $file): MetadataInterface
     {
+        if (!is_callable('exif_read_data')) {
+            throw new LocalizedException(
+                __('exif_read_data() must be enabled in php configuration')
+            );
+        }
+
         foreach ($file->getSegments() as $segment) {
             if ($this->isExifSegment($segment)) {
                 return $this->getExifData($segment);

From 36ea7b5423282545e656268c7501c723cf402c73 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:34:06 +0300
Subject: [PATCH 195/671] Remove obsolete tests

---
 .../Model/Jpeg/Segment/ExifTest.php           | 132 ------------------
 1 file changed, 132 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php

diff --git a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php b/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php
deleted file mode 100644
index 93c4ced52bc9f..0000000000000
--- a/app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/Jpeg/Segment/ExifTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryMetadata\Test\Integration\Model\Jpeg\Segment;
-
-use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\DriverInterface;
-use Magento\TestFramework\Helper\Bootstrap;
-use PHPUnit\Framework\TestCase;
-use Magento\MediaGalleryMetadata\Model\Jpeg\ReadFile;
-use Magento\MediaGalleryMetadata\Model\MetadataFactory;
-
-/**
- * Test for EXIF reader
- */
-class ExifTest extends TestCase
-{
-    /**
-     * @var WriteIptc
-     */
-    private $iptcWriter;
-
-    /**
-     * @var ReadIptc
-     */
-    private $iptcReader;
-
-    /**
-     * @var DriverInterface
-     */
-    private $driver;
-
-    /**
-     * @var ReadFile
-     */
-    private $fileReader;
-
-    /**
-     * @var MetadataFactory
-     */
-    private $metadataFactory;
-
-    /**
-     * @var WriteInterface
-     */
-    private $varDirectory;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp(): void
-    {
-        $this->varDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
-            ->getDirectoryWrite(DirectoryList::VAR_DIR);
-        $this->iptcWriter = Bootstrap::getObjectManager()->get(WriteIptc::class);
-        $this->iptcReader = Bootstrap::getObjectManager()->get(ReadIptc::class);
-        $this->fileReader = Bootstrap::getObjectManager()->get(ReadFile::class);
-        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
-        $this->metadataFactory = Bootstrap::getObjectManager()->get(MetadataFactory::class);
-    }
-
-    /**
-     * Test for IPTC reader and writer
-     *
-     * @dataProvider filesProvider
-     * @param string $fileName
-     * @param string $title
-     * @param string $description
-     * @param array $keywords
-     * @throws LocalizedException
-     */
-    public function testWriteRead(
-        string $fileName,
-        string $title,
-        string $description,
-        array $keywords
-    ): void {
-        $path = realpath(__DIR__ . '/../../../../_files/' . $fileName);
-        $modifiableFilePath = $this->varDirectory->getAbsolutePath($fileName);
-        $this->driver->copy(
-            $path,
-            $modifiableFilePath
-        );
-        $modifiableFilePath = $this->fileReader->execute($modifiableFilePath);
-        $originalMetadata = $this->iptcReader->execute($modifiableFilePath);
-
-        $this->assertEmpty($originalMetadata->getTitle());
-        $this->assertEmpty($originalMetadata->getDescription());
-        $this->assertEmpty($originalMetadata->getKeywords());
-
-        $updatedFile = $this->iptcWriter->execute(
-            $modifiableFilePath,
-            $this->metadataFactory->create([
-                'title' => $title,
-                'description' => $description,
-                'keywords' => $keywords
-            ])
-        );
-
-        $updatedMetadata = $this->iptcReader->execute($updatedFile);
-
-        $this->assertEquals($title, $updatedMetadata->getTitle());
-        $this->assertEquals($description, $updatedMetadata->getDescription());
-        $this->assertEquals($keywords, $updatedMetadata->getKeywords());
-    }
-
-    /**
-     * Data provider for testExecute
-     *
-     * @return array[]
-     */
-    public function filesProvider(): array
-    {
-        return [
-            [
-                'empty_iptc.jpeg',
-                'Updated Title',
-                'Updated Description',
-                [
-                    'magento2',
-                    'mediagallery'
-                ]
-            ]
-        ];
-    }
-}

From 78dc5b9251d542cf5129ae1ee19d4a0938199546 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 14:36:07 +0300
Subject: [PATCH 196/671] Update docBlock

---
 .../Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
index 94e5f4a9ef0e9..4c13d9a97255f 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -61,7 +61,7 @@ public function execute(FileInterface $file): MetadataInterface
     /**
      * Parese exif data from segment
      *
-     * @param FileInterface $filePath
+     * @param SegmentInterface $segment
      */
     private function getExifData(SegmentInterface $segment): MetadataInterface
     {

From 9acc3fb935ebbf4888eb850dc8bfa0ee3d9c0882 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 15:49:37 +0300
Subject: [PATCH 197/671] Fix static tests

---
 .../Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php | 1 +
 .../Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
index 5e5deb0e119fc..edacd8bb65cec 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
@@ -12,6 +12,7 @@
 use Magento\MediaGalleryMetadataApi\Model\FileInterface;
 use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
 use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Jpeg EXIF Reader
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
index 4c13d9a97255f..a0e70eef62a0b 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -12,6 +12,7 @@
 use Magento\MediaGalleryMetadataApi\Model\FileInterface;
 use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
 use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Jpeg EXIF Reader

From eac8e9c2466faf2d0f0610e56d1a5af9e96ae6b1 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 21:23:21 +0300
Subject: [PATCH 198/671] Improve metadata types && isExifSegment()
 verification for jpeg

---
 .../Model/GetIptcMetadata.php                 |   7 +++----
 .../Model/Jpeg/Segment/ReadExif.php           |  11 +++++------
 .../Model/Jpeg/Segment/ReadIptc.php           |   6 +++---
 .../Model/Jpeg/Segment/ReadXmp.php            |   6 +++---
 .../Model/Png/Segment/ReadExif.php            |   1 -
 .../Model/Png/Segment/ReadXmp.php             |   6 +++---
 .../Test/_files/empty_iptc.jpeg               | Bin 19416 -> 19416 bytes
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php
index d7290f31ee34e..e100a7f852e42 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php
@@ -9,7 +9,6 @@
 
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
-use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
 
 /**
  * Get metadata from IPTC block
@@ -42,8 +41,8 @@ public function __construct(
      */
     public function execute(string $data): MetadataInterface
     {
-        $title = '';
-        $description = '';
+        $title = null;
+        $description = null;
         $keywords = [];
 
         if (is_callable('iptcparse')) {
@@ -65,7 +64,7 @@ public function execute(string $data): MetadataInterface
         return $this->metadataFactory->create([
             'title' => $title,
             'description' => $description,
-            'keywords' => $keywords
+            'keywords' => !empty($keywords) ? $keywords : null
         ]);
     }
 }
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
index edacd8bb65cec..b6c32296f3f7d 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php
@@ -70,20 +70,19 @@ private function getExifData(string $filePath): MetadataInterface
     {
         $title = null;
         $description = null;
-        $keywords = [];
+        $keywords = null;
 
         $data = exif_read_data($filePath);
 
-        if ($data) {
+        if (!empty($data)) {
             $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
             $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
-            $keywords = '';
         }
 
         return $this->metadataFactory->create([
             'title' => $title,
             'description' => $description,
-            'keywords' => !empty($keywords) ? $keywords : null
+            'keywords' => $keywords
         ]);
     }
 
@@ -97,9 +96,9 @@ private function isExifSegment(SegmentInterface $segment): bool
     {
         return $segment->getName() === self::EXIF_SEGMENT_NAME
             && strncmp(
-                substr($segment->getData(), self::EXIF_DATA_START_POSITION, 4),
+                substr($segment->getData(), self::EXIF_DATA_START_POSITION, 5),
                 self::EXIF_SEGMENT_START,
-                self::EXIF_DATA_START_POSITION
+                5
             ) == 0;
     }
 }
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php
index 94ccb400e5e0a..e56993528a041 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php
@@ -56,9 +56,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php
index 81ff7200c3475..e68c86d35eb97 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php
@@ -54,9 +54,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
index a0e70eef62a0b..81ecf57efaf32 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -75,7 +75,6 @@ private function getExifData(SegmentInterface $segment): MetadataInterface
         if ($data) {
             $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
             $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
-            $keywords = '';
         }
 
         return $this->metadataFactory->create([
diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php
index 83ba554f7bf5d..518697d421474 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php
@@ -55,9 +55,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.jpeg b/app/code/Magento/MediaGalleryMetadata/Test/_files/empty_iptc.jpeg
index 144a56dac2d3e748d47cf56e0fdde0bab2f49def..1a345c2d33fdddfb2a66fee2f40d822d8604d029 100644
GIT binary patch
delta 29
XcmcaHo$<zW#tBja3}|4Z);ezhV_*eu

delta 29
hcmcaHo$<zW#tBjatPBhcQa}s>d5O8H8@1MX0|0OW2QL5s


From 16a98de93143b65fe856e416e8fa4785ed58a708 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 10:27:15 +0300
Subject: [PATCH 199/671] Improve comparsion remove exif data from other images

---
 .../Model/Png/Segment/ReadExif.php            |   3 +--
 .../Test/_files/macos-preview.png             | Bin 57535 -> 57155 bytes
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
index 81ecf57efaf32..98c763d131b22 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -70,7 +70,6 @@ private function getExifData(SegmentInterface $segment): MetadataInterface
         $description = null;
         $keywords = [];
 
-        $data = exif_read_data('data://image/jpeg;base64,' . base64_encode($segment->getData()));
 
         if ($data) {
             $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
@@ -92,6 +91,6 @@ private function getExifData(SegmentInterface $segment): MetadataInterface
      */
     private function isExifSegment(SegmentInterface $segment): bool
     {
-        return $segment->getName() === self::EXIF_SEGMENT_NAME;
+        return strcmp($segment->getName(), self::EXIF_SEGMENT_NAME) === 0;
     }
 }
diff --git a/app/code/Magento/MediaGalleryMetadata/Test/_files/macos-preview.png b/app/code/Magento/MediaGalleryMetadata/Test/_files/macos-preview.png
index 966520f0d01124eec138a9e29298dbe8e2fea5ab..95eb45f69b3eafcedbadbb204baabb01b3bec775 100644
GIT binary patch
delta 13
VcmdmgkooXF<_QLy*Dwm-2LLUY1{weW

delta 400
zcmX@Sk9q$=<_QM%j0LF?o@u_m3|b5f3>*yXjC>4CK$ap9Cou{!Fav2uAY@>aVqgWc
z85mj^rQz%zMh&PMpe{xuuwD_Mx+(3M3@lLfD}XeEOKNd)QD#9&W`3SRewso_Myf(?
zVtVRie`d~lkUYZ#AO_k4p^XfT46F>ytc;8lj0~+zjI4|e7#O%FFvHAeRGYv8XIo7W
z1hd(J2KY@7g0sUWwJ`w27=(c0ag!#3#aYaOCQX`zU@u@~sE2!U0Tay8Op_Kc!`KXe
zfQB$&a}qW&Z39Cq1E6bRv}3TdrzcQ<aB@*<YF=?heu<04`Po1L&H|6fVg?2=)s0r1
F_W}GlJTU+O


From 01422493bd1cfbbb758161da53ab29981965028a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 10:32:06 +0300
Subject: [PATCH 200/671] rever removed line by php-cs-fixer

---
 .../Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
index 98c763d131b22..09aeaf526443a 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php
@@ -70,6 +70,7 @@ private function getExifData(SegmentInterface $segment): MetadataInterface
         $description = null;
         $keywords = [];
 
+        $data = exif_read_data('data://image/jpeg;base64,' . base64_encode($segment->getData()));
 
         if ($data) {
             $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;

From ca205f8d3d2b26c58c72210489ab63423bcf6f1f Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 21:49:45 +0800
Subject: [PATCH 201/671] magento/adobe-stock-integration#1748: Some category
 grid columns are empty - fixed issue of empty columns and added column
 renderer for in menu and enabled columns

---
 .../Ui/Component/Listing/Columns/InMenu.php   | 36 +++++++++++++++++++
 .../Ui/Component/Listing/Columns/IsActive.php | 36 +++++++++++++++++++
 .../media_gallery_category_listing.xml        |  4 +--
 3 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
new file mode 100644
index 0000000000000..fe4720b4a3e60
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/InMenu.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class InMenu column for Category grid
+ */
+class InMenu extends Column
+{
+    /**
+     * Prepare data source.
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        if (isset($dataSource['data']['items'])) {
+            $fieldName = $this->getData('name');
+            foreach ($dataSource['data']['items'] as & $item) {
+                if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
+                    $item[$fieldName] = 'Yes';
+                } else {
+                    $item[$fieldName] = 'No';
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
new file mode 100644
index 0000000000000..c6f20c937d5b3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/IsActive.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
+
+use Magento\Ui\Component\Listing\Columns\Column;
+
+/**
+ * Class IsActive column for Category grid
+ */
+class IsActive extends Column
+{
+    /**
+     * Prepare data source.
+     *
+     * @param array $dataSource
+     * @return array
+     */
+    public function prepareDataSource(array $dataSource)
+    {
+        if (isset($dataSource['data']['items'])) {
+            $fieldName = $this->getData('name');
+            foreach ($dataSource['data']['items'] as & $item) {
+                if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
+                    $item[$fieldName] = 'Yes';
+                } else {
+                    $item[$fieldName] = 'No';
+                }
+            }
+        }
+
+        return $dataSource;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
index 9945643ccffef..e12d90b95303b 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
@@ -167,12 +167,12 @@
                 <label translate="true">Products</label>
             </settings>
         </column>
-        <column name="include_in_menu" component="Magento_Ui/js/grid/columns/select">
+        <column name="include_in_menu" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\InMenu">
             <settings>
                 <label translate="true">In Menu</label>
             </settings>
         </column>
-        <column name="is_active" component="Magento_Ui/js/grid/columns/select" >
+        <column name="is_active" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\IsActive">
             <settings>
                 <label translate="true">Enabled</label>
             </settings>

From fc7a3d7c63b1aa82d7c0b21393395c86a9f3a1df Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 13 Aug 2020 19:40:27 +0800
Subject: [PATCH 202/671] magento/adobe-stock-integration#1748: Some category
 grid columns are empty - added columns to section and added verification to
 action group

---
 .../AdminAssertCategoryGridPageDetailsActionGroup.xml           | 2 ++
 .../Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
index 0788bbd60291a..7875c62f9591d 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
@@ -16,5 +16,7 @@
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name('1', 'Default Category')}}" stepKey="assertNameColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.displayMode('1', 'PRODUCTS')}}" stepKey="assertDisplayModeColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('1', '0')}}" stepKey="assertProductsColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu('1', 'Yes')}}" stepKey="assertInMenuColumn"/>
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled('1', 'Yes')}}" stepKey="assertEnabledColumn"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
index 5267a215c8edd..41bec6f6220a0 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -13,6 +13,8 @@
         <element name="name" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Name')]/preceding-sibling::th) +1 ]//*[text()='{{categoryName}}']" parameterized="true"/>
         <element name="displayMode" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Display Mode')]/preceding-sibling::th) +1 ]//*[text()='{{productsText}}']" parameterized="true"/>
         <element name="products" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Products')]/preceding-sibling::th) +1 ]//*[text()='{{productsQty}}']" parameterized="true"/>
+        <element name="inMenu" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//*[text()='{{inMenuValue}}']" parameterized="true"/>
+        <element name="enabled" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//*[text()='{{enabledValue}}']" parameterized="true"/>
         <element name="edit" type="button" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{edit}}']" parameterized="true"/>
     </section>
 </sections>

From 9bd7256d556763ac69fbad4b75e70afe05b56589 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 19:58:22 +0800
Subject: [PATCH 203/671] magento/adobe-stock-integration#1712: Remove
 DataObject usage from OpenDialogUrl provider - remove data object usage from
 OpenDialogUrl provider, added new plugin and modified the integration test

---
 .../Plugin/NewMediaGalleryOpenDialogUrl.php   | 43 +++++++++++++++++++
 ...ProviderTest.php => OpenDialogUrlTest.php} | 16 +++----
 .../etc/adminhtml/di.xml                      |  4 +-
 .../Element/DataType/Media/OpenDialogUrl.php  | 14 +-----
 4 files changed, 54 insertions(+), 23 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
 rename app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/{OpenDialogUrlProviderTest.php => OpenDialogUrlTest.php} (80%)

diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php b/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
new file mode 100644
index 0000000000000..f076aa43b6f96
--- /dev/null
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryIntegration\Plugin;
+
+use Magento\MediaGalleryUiApi\Api\ConfigInterface;
+use Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl;
+
+class NewMediaGalleryOpenDialogUrl
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @param ConfigInterface $config
+     */
+    public function __construct(ConfigInterface $config)
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * @param OpenDialogUrl $subject
+     * @param string $result
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return string
+     */
+    public function afterGet(OpenDialogUrl $subject, string $result)
+    {
+        $writer = new \Zend\Log\Writer\Stream(BP . '/var/log/newmediagalleryplugin.log');
+        $logger = new \Zend\Log\Logger();
+        $logger->addWriter($writer);
+        $logger->debug(__METHOD__);
+        $logger->debug("PASSING HERE!");
+        return $this->config->isEnabled() ? 'media_gallery/index/index' : $result;
+    }
+}
diff --git a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlTest.php
similarity index 80%
rename from app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
rename to app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlTest.php
index 7a3316f293879..90f363d6d792b 100644
--- a/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlProviderTest.php
+++ b/app/code/Magento/MediaGalleryIntegration/Test/Integration/Model/OpenDialogUrlTest.php
@@ -9,16 +9,16 @@
 namespace Magento\MediaGalleryIntegration\Test\Integration\Model;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\MediaGalleryIntegration\Model\OpenDialogUrlProvider;
 use Magento\MediaGalleryUiApi\Api\ConfigInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Provide tests cover getting correct url based on the config settings.
  * @magentoAppArea adminhtml
  */
-class OpenDialogUrlProviderTest extends TestCase
+class OpenDialogUrlTest extends TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -26,9 +26,9 @@ class OpenDialogUrlProviderTest extends TestCase
     private $objectManger;
 
     /**
-     * @var OpenDialogUrlProvider
+     * @var OpenDialogUrl
      */
-    private $openDialogUrlProvider;
+    private $openDialogUrl;
 
     /**
      * @inheritdoc
@@ -37,8 +37,8 @@ protected function setUp(): void
     {
         $this->objectManger = Bootstrap::getObjectManager();
         $config = $this->objectManger->create(ConfigInterface::class);
-        $this->openDialogUrlProvider = $this->objectManger->create(
-            OpenDialogUrlProvider::class,
+        $this->openDialogUrl = $this->objectManger->create(
+            OpenDialogUrl::class,
             ['config' => $config]
         );
     }
@@ -49,7 +49,7 @@ protected function setUp(): void
      */
     public function testWithEnhancedMediaGalleryDisabled(): void
     {
-        self::assertEquals('cms/wysiwyg_images/index', $this->openDialogUrlProvider->getUrl());
+        self::assertEquals('cms/wysiwyg_images/index', $this->openDialogUrl->get());
     }
 
     /**
@@ -58,6 +58,6 @@ public function testWithEnhancedMediaGalleryDisabled(): void
      */
     public function testWithEnhancedMediaGalleryEnabled(): void
     {
-        self::assertEquals('media_gallery/index/index', $this->openDialogUrlProvider->getUrl());
+        self::assertEquals('media_gallery/index/index', $this->openDialogUrl->get());
     }
 }
diff --git a/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
index 1559a6d7dfcd5..08e83ce6cad88 100644
--- a/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryIntegration/etc/adminhtml/di.xml
@@ -7,9 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl">
-        <arguments>
-            <argument name="url" xsi:type="object">Magento\MediaGalleryIntegration\Model\OpenDialogUrlProvider</argument>
-        </arguments>
+        <plugin name="new_media_gallery_open_dialog_url" type="Magento\MediaGalleryIntegration\Plugin\NewMediaGalleryOpenDialogUrl" />
     </type>
     <type name="Magento\Framework\File\Uploader">
         <plugin name="save_asset_image" type="Magento\MediaGalleryIntegration\Plugin\SaveImageInformation"/>
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php
index 27370cbfbd68c..cd116a6f1bff8 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php
@@ -8,10 +8,8 @@
 
 namespace Magento\Ui\Component\Form\Element\DataType\Media;
 
-use Magento\Framework\DataObject;
-
 /**
- * Basic configuration for OdenDialogUrl
+ * Basic configuration for OpenDialogUrl
  */
 class OpenDialogUrl
 {
@@ -22,14 +20,6 @@ class OpenDialogUrl
      */
     private $openDialogUrl;
 
-    /**
-     * @param DataObject $url
-     */
-    public function __construct(DataObject $url = null)
-    {
-        $this->openDialogUrl = $url;
-    }
-
     /**
      * Returns open dialog url for media browser
      *
@@ -38,7 +28,7 @@ public function __construct(DataObject $url = null)
     public function get(): string
     {
         if ($this->openDialogUrl) {
-            return $this->openDialogUrl->getUrl();
+            return $this->openDialogUrl;
         }
         return self::DEFAULT_OPEN_DIALOG_URL;
     }

From 05cd07c6b6ca56fa224fb3731e12a239ad59c3b7 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 20:02:43 +0800
Subject: [PATCH 204/671] magento/adobe-stock-integration#1712: Remove
 DataObject usage from OpenDialogUrl provider - remove logs

---
 .../Plugin/NewMediaGalleryOpenDialogUrl.php                  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php b/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
index f076aa43b6f96..13068721634e8 100644
--- a/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
@@ -33,11 +33,6 @@ public function __construct(ConfigInterface $config)
      */
     public function afterGet(OpenDialogUrl $subject, string $result)
     {
-        $writer = new \Zend\Log\Writer\Stream(BP . '/var/log/newmediagalleryplugin.log');
-        $logger = new \Zend\Log\Logger();
-        $logger->addWriter($writer);
-        $logger->debug(__METHOD__);
-        $logger->debug("PASSING HERE!");
         return $this->config->isEnabled() ? 'media_gallery/index/index' : $result;
     }
 }

From 538d0adac57a8df90466bd211674919f5db24239 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 22:13:59 +0800
Subject: [PATCH 205/671] magento/adobe-stock-integration#1712: Remove
 DataObject usage from OpenDialogUrl provider - fixed static test fails and
 removed unused class

---
 .../Model/OpenDialogUrlProvider.php           | 40 -------------------
 .../Plugin/NewMediaGalleryOpenDialogUrl.php   |  5 +++
 .../MediaGalleryIntegration/composer.json     |  3 +-
 3 files changed, 7 insertions(+), 41 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php

diff --git a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php b/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
deleted file mode 100644
index 317b811df5692..0000000000000
--- a/app/code/Magento/MediaGalleryIntegration/Model/OpenDialogUrlProvider.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryIntegration\Model;
-
-use Magento\Framework\DataObject;
-use Magento\MediaGalleryUiApi\Api\ConfigInterface;
-
-/**
- * Provider to get open media gallery dialog URL for WYSIWYG and widgets
- */
-class OpenDialogUrlProvider extends DataObject
-{
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
-    /**
-     * @param ConfigInterface $config
-     */
-    public function __construct(ConfigInterface $config)
-    {
-        $this->config = $config;
-    }
-
-    /**
-     * Get Url based on media gallery configuration
-     *
-     * @return string
-     */
-    public function getUrl(): string
-    {
-        return $this->config->isEnabled() ? 'media_gallery/index/index' : 'cms/wysiwyg_images/index';
-    }
-}
diff --git a/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php b/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
index 13068721634e8..ed8108f012af0 100644
--- a/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
+++ b/app/code/Magento/MediaGalleryIntegration/Plugin/NewMediaGalleryOpenDialogUrl.php
@@ -10,6 +10,9 @@
 use Magento\MediaGalleryUiApi\Api\ConfigInterface;
 use Magento\Ui\Component\Form\Element\DataType\Media\OpenDialogUrl;
 
+/**
+ * Plugin to get open media gallery dialog URL for WYSIWYG and widgets
+ */
 class NewMediaGalleryOpenDialogUrl
 {
     /**
@@ -26,6 +29,8 @@ public function __construct(ConfigInterface $config)
     }
 
     /**
+     * Get Url based on media gallery configuration
+     *
      * @param OpenDialogUrl $subject
      * @param string $result
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
diff --git a/app/code/Magento/MediaGalleryIntegration/composer.json b/app/code/Magento/MediaGalleryIntegration/composer.json
index c55d6e0b89733..a9709da81222e 100644
--- a/app/code/Magento/MediaGalleryIntegration/composer.json
+++ b/app/code/Magento/MediaGalleryIntegration/composer.json
@@ -6,7 +6,8 @@
         "magento/framework": "*",
         "magento/module-media-gallery-ui-api": "*",
         "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*"
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-ui": "*"
     },
     "require-dev": {
         "magento/module-cms": "*"

From b8a7ef051917fcc636d193bc40ed2400c642e776 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 13 Aug 2020 21:29:48 +0800
Subject: [PATCH 206/671] magento/adobe-stock-integration#1712: Remove
 DataObject usage from OpenDialogUrl provider - apply requested changes

---
 .../Form/Element/DataType/Media/OpenDialogUrl.php   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php
index cd116a6f1bff8..9961fc41fc70d 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Media/OpenDialogUrl.php
@@ -20,6 +20,14 @@ class OpenDialogUrl
      */
     private $openDialogUrl;
 
+    /**
+     * @param string $url
+     */
+    public function __construct(string $url = null)
+    {
+        $this->openDialogUrl = $url ?? self::DEFAULT_OPEN_DIALOG_URL;
+    }
+
     /**
      * Returns open dialog url for media browser
      *
@@ -27,9 +35,6 @@ class OpenDialogUrl
      */
     public function get(): string
     {
-        if ($this->openDialogUrl) {
-            return $this->openDialogUrl;
-        }
-        return self::DEFAULT_OPEN_DIALOG_URL;
+        return $this->openDialogUrl;
     }
 }

From a4ce1c424e74697686bb3e9c5e0d93c93f733922 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 11 Aug 2020 01:59:52 +0800
Subject: [PATCH 207/671] magento/adobe-stock-integration#1727: Introduce
 internal class wrapping SplFileInfo - implement class wrapping SplFileInfo
 and modified the files to use the newly added classes

---
 .../Model/CreateAssetFromFile.php             |  14 +-
 .../Model/Filesystem/FileInfo.php             | 296 ++++++++++++++++++
 .../Model/Filesystem/GetFileInfo.php          |  63 ++++
 .../Model/GetAssetFromPath.php                |  11 +-
 .../Model/SynchronizeFiles.php                |  14 +-
 5 files changed, 374 insertions(+), 24 deletions(-)
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php

diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index 87d477507b680..6f1f05a750085 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -16,7 +16,7 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
-use Magento\MediaGallerySynchronization\Model\Filesystem\SplFileInfoFactory;
+use Magento\MediaGallerySynchronization\Model\Filesystem\GetFileInfo;
 use Magento\MediaGallerySynchronization\Model\GetContentHash;
 
 /**
@@ -60,9 +60,9 @@ class CreateAssetFromFile
     private $extractMetadata;
 
     /**
-     * @var SplFileInfoFactory
+     * @var GetFileInfo
      */
-    private $splFileInfoFactory;
+    private $getFileInfo;
 
     /**
      * @param Filesystem $filesystem
@@ -71,7 +71,7 @@ class CreateAssetFromFile
      * @param AssetInterfaceFactory $assetFactory
      * @param GetContentHash $getContentHash
      * @param ExtractMetadataInterface $extractMetadata
-     * @param SplFileInfoFactory $splFileInfoFactory
+     * @param GetFileInfo $getFileInfo
      */
     public function __construct(
         Filesystem $filesystem,
@@ -80,7 +80,7 @@ public function __construct(
         AssetInterfaceFactory $assetFactory,
         GetContentHash $getContentHash,
         ExtractMetadataInterface $extractMetadata,
-        SplFileInfoFactory $splFileInfoFactory
+        GetFileInfo $getFileInfo
     ) {
         $this->filesystem = $filesystem;
         $this->driver = $driver;
@@ -88,7 +88,7 @@ public function __construct(
         $this->assetFactory = $assetFactory;
         $this->getContentHash = $getContentHash;
         $this->extractMetadata = $extractMetadata;
-        $this->splFileInfoFactory = $splFileInfoFactory;
+        $this->getFileInfo = $getFileInfo;
     }
 
     /**
@@ -101,7 +101,7 @@ public function __construct(
     public function execute(string $path): AssetInterface
     {
         $absolutePath = $this->getMediaDirectory()->getAbsolutePath($path);
-        $file = $this->splFileInfoFactory->create($absolutePath);
+        $file = $this->getFileInfo->execute($absolutePath);
         [$width, $height] = getimagesize($absolutePath);
 
         $metadata = $this->extractMetadata->execute($absolutePath);
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
new file mode 100644
index 0000000000000..20acefe4ab034
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
@@ -0,0 +1,296 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model\Filesystem;
+
+/**
+ * Class FileInfo
+ */
+class FileInfo extends \SplFileInfo
+{
+    /**
+     * @var string
+     */
+    private $path;
+
+    /**
+     * @var string
+     */
+    private $filename;
+
+    /**
+     * @var string
+     */
+    private $extension;
+
+    /**
+     * @var $basename
+     */
+    private $basename;
+
+    /**
+     * @var string
+     */
+    private $pathname;
+
+    /**
+     * @var int
+     */
+    private $perms;
+
+    /**
+     * @var int
+     */
+    private $inode;
+
+    /**
+     * @var int
+     */
+    private $size;
+
+    /**
+     * @var int
+     */
+    private $owner;
+
+    /**
+     * @var int
+     */
+    private $group;
+
+    /**
+     * @var int
+     */
+    private $aTime;
+
+    /**
+     * @var int
+     */
+    private $mTime;
+
+    /**
+     * @var int
+     */
+    private $cTime;
+
+    /**
+     * @var string
+     */
+    private $type;
+
+    /**
+     * @var false|string
+     */
+    private $realPath;
+
+    /**
+     * @var \SplFileInfo
+     */
+    private $fileInfo;
+
+    /**
+     * @var \SplFileInfo
+     */
+    private $pathInfo;
+
+    /**
+     * FileInfo constructor.
+     * @param string $file_name
+     * @param string $path
+     * @param string $filename
+     * @param string $extension
+     * @param string $basename
+     * @param string $pathname
+     * @param int $perms
+     * @param int $inode
+     * @param int $size
+     * @param int $owner
+     * @param int $group
+     * @param int $aTime
+     * @param int $mTime
+     * @param int $cTime
+     * @param string $type
+     * @param false|string $realPath
+     * @param \SplFileInfo $fileInfo
+     * @param \SplFileInfo $pathInfo
+     */
+    public function __construct(
+        string $file_name,
+        string $path,
+        string $filename,
+        string $extension,
+        string $basename,
+        string $pathname,
+        int $perms,
+        int $inode,
+        int $size,
+        int $owner,
+        int $group,
+        int $aTime,
+        int $mTime,
+        int $cTime,
+        string $type,
+        $realPath,
+        \SplFileInfo $fileInfo,
+        \SplFileInfo $pathInfo
+    ) {
+        parent::__construct($file_name);
+        $this->path = $path;
+        $this->filename = $filename;
+        $this->extension = $extension;
+        $this->basename = $basename;
+        $this->pathname = $pathname;
+        $this->perms = $perms;
+        $this->inode = $inode;
+        $this->size = $size;
+        $this->owner = $owner;
+        $this->group = $group;
+        $this->aTime = $aTime;
+        $this->mTime = $mTime;
+        $this->cTime = $cTime;
+        $this->type = $type;
+        $this->realPath = $realPath;
+        $this->fileInfo = $fileInfo;
+        $this->pathInfo = $pathInfo;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPath(): string
+    {
+        return $this->path;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFilename(): string
+    {
+        return $this->filename;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getExtension(): string
+    {
+        return $this->extension;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getBasename($suffix = null): string
+    {
+        return $this->basename;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPathname(): string
+    {
+        return $this->pathname;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPerms(): int
+    {
+        return $this->perms;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getInode(): int
+    {
+        return $this->inode;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getSize(): int
+    {
+        return $this->size;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getOwner(): int
+    {
+        return $this->owner;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getGroup(): int
+    {
+        return $this->group;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getATime(): int
+    {
+        return $this->aTime;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getMTime(): int
+    {
+        return $this->mTime;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getCTime(): int
+    {
+        return $this->cTime;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getRealPath()
+    {
+        return $this->realPath;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getFileInfo($class_name = null): \SplFileInfo
+    {
+        return $this->fileInfo;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getPathInfo($class_name = null): \SplFileInfo
+    {
+        return $this->pathInfo;
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
new file mode 100644
index 0000000000000..ef382732275bd
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Model\Filesystem;
+
+use Magento\MediaGallerySynchronization\Model\Filesystem\FileInfoFactory;
+
+/**
+ * Get file information
+ */
+class GetFileInfo
+{
+    /**
+     * @var FileInfoFactory
+     */
+    private $fileInfoFactory;
+
+    /**
+     * GetFileInfo constructor.
+     * @param FileInfoFactory $fileInfoFactory
+     */
+    public function __construct(
+        FileInfoFactory $fileInfoFactory
+    ) {
+        $this->fileInfoFactory = $fileInfoFactory;
+    }
+
+    /**
+     * Get file information based on path provided.
+     *
+     * @param string $path
+     * @return FileInfo
+     */
+    public function execute(string $path): FileInfo
+    {
+        $splFileInfo = new \SplFileInfo($path);
+
+        return $this->fileInfoFactory->create([
+            'file_name' => $path,
+            'path' => $splFileInfo->getPath(),
+            'filename' => $splFileInfo->getFilename(),
+            'extension' => $splFileInfo->getExtension(),
+            'basename' => $splFileInfo->getBasename(),
+            'pathname' => $splFileInfo->getPathname(),
+            'perms' => $splFileInfo->getPerms(),
+            'inode' => $splFileInfo->getInode(),
+            'size' => $splFileInfo->getSize(),
+            'owner' => $splFileInfo->getOwner(),
+            'group' => $splFileInfo->getGroup(),
+            'aTime' => $splFileInfo->getATime(),
+            'mTime' => $splFileInfo->getMTime(),
+            'cTime' => $splFileInfo->getCTime(),
+            'type' => $splFileInfo->getType(),
+            'realPath' => $splFileInfo->getRealPath(),
+            'fileInfo' => $splFileInfo->getFileInfo(),
+            'pathInfo' => $splFileInfo->getPathInfo()
+        ]);
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
index 5e825d57c5ce7..533d814c9f1d0 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
@@ -12,7 +12,6 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
-use Magento\MediaGallerySynchronization\Model\Filesystem\SplFileInfoFactory;
 
 /**
  * Create media asset object based on the file information
@@ -34,27 +33,19 @@ class GetAssetFromPath
      */
     private $createAssetFromFile;
 
-    /**
-     * @var SplFileInfoFactory
-     */
-    private $splFileInfoFactory;
-
     /**
      * @param AssetInterfaceFactory $assetFactory
      * @param GetAssetsByPathsInterface $getMediaGalleryAssetByPath
      * @param CreateAssetFromFile $createAssetFromFile
-     * @param SplFileInfoFactory $splFileInfoFactory
      */
     public function __construct(
         AssetInterfaceFactory $assetFactory,
         GetAssetsByPathsInterface $getMediaGalleryAssetByPath,
-        CreateAssetFromFile $createAssetFromFile,
-        SplFileInfoFactory $splFileInfoFactory
+        CreateAssetFromFile $createAssetFromFile
     ) {
         $this->assetFactory = $assetFactory;
         $this->getAssetsByPaths = $getMediaGalleryAssetByPath;
         $this->createAssetFromFile = $createAssetFromFile;
-        $this->splFileInfoFactory= $splFileInfoFactory;
     }
 
     /**
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php b/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php
index 81e9629f703f3..eebb172e48202 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/SynchronizeFiles.php
@@ -16,7 +16,7 @@
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
 use Magento\MediaGallerySynchronizationApi\Model\ImportFilesInterface;
 use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
-use Magento\MediaGallerySynchronization\Model\Filesystem\SplFileInfoFactory;
+use Magento\MediaGallerySynchronization\Model\Filesystem\GetFileInfo;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -50,9 +50,9 @@ class SynchronizeFiles implements SynchronizeFilesInterface
     private $driver;
 
     /**
-     * @var SplFileInfoFactory
+     * @var GetFileInfo
      */
-    private $splFileInfoFactory;
+    private $getFileInfo;
 
     /**
      * @var ImportFilesInterface
@@ -69,7 +69,7 @@ class SynchronizeFiles implements SynchronizeFilesInterface
      * @param Filesystem $filesystem
      * @param DateTime $date
      * @param LoggerInterface $log
-     * @param SplFileInfoFactory $splFileInfoFactory
+     * @param GetFileInfo $getFileInfo
      * @param GetAssetsByPathsInterface $getAssetsByPaths
      * @param ImportFilesInterface $importFiles
      */
@@ -78,7 +78,7 @@ public function __construct(
         Filesystem $filesystem,
         DateTime $date,
         LoggerInterface $log,
-        SplFileInfoFactory $splFileInfoFactory,
+        GetFileInfo $getFileInfo,
         GetAssetsByPathsInterface $getAssetsByPaths,
         ImportFilesInterface $importFiles
     ) {
@@ -86,7 +86,7 @@ public function __construct(
         $this->filesystem = $filesystem;
         $this->date = $date;
         $this->log = $log;
-        $this->splFileInfoFactory = $splFileInfoFactory;
+        $this->getFileInfo = $getFileInfo;
         $this->getAssetsByPaths = $getAssetsByPaths;
         $this->importFiles = $importFiles;
     }
@@ -150,7 +150,7 @@ private function getFileModificationTime(string $path): string
     {
         return $this->date->gmtDate(
             self::DATE_FORMAT,
-            $this->splFileInfoFactory->create($this->getMediaDirectory()->getAbsolutePath($path))->getMTime()
+            $this->getFileInfo->execute($this->getMediaDirectory()->getAbsolutePath($path))->getMTime()
         );
     }
 

From 8728f337fd17cc920a19bf50c9a60e6c488ad55c Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 01:37:46 +0800
Subject: [PATCH 208/671] magento/adobe-stock-integration#1727: Introduce
 internal class wrapping SplFileInfo - fix static and mftf fails, added
 integration tets

---
 .../Model/Filesystem/FileInfo.php             | 55 +----------
 .../Model/Filesystem/GetFileInfo.php          |  6 +-
 .../Model/Filesystem/GetFileInfoTest.php      | 94 +++++++++++++++++++
 3 files changed, 101 insertions(+), 54 deletions(-)
 create mode 100644 app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php

diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
index 20acefe4ab034..034ae7c0bff5a 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
@@ -8,7 +8,9 @@
 namespace Magento\MediaGallerySynchronization\Model\Filesystem;
 
 /**
- * Class FileInfo
+ * Internal class wrapping \SplFileInfo
+ *
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class FileInfo extends \SplFileInfo
 {
@@ -37,11 +39,6 @@ class FileInfo extends \SplFileInfo
      */
     private $pathname;
 
-    /**
-     * @var int
-     */
-    private $perms;
-
     /**
      * @var int
      */
@@ -87,16 +84,6 @@ class FileInfo extends \SplFileInfo
      */
     private $realPath;
 
-    /**
-     * @var \SplFileInfo
-     */
-    private $fileInfo;
-
-    /**
-     * @var \SplFileInfo
-     */
-    private $pathInfo;
-
     /**
      * FileInfo constructor.
      * @param string $file_name
@@ -105,7 +92,6 @@ class FileInfo extends \SplFileInfo
      * @param string $extension
      * @param string $basename
      * @param string $pathname
-     * @param int $perms
      * @param int $inode
      * @param int $size
      * @param int $owner
@@ -115,8 +101,7 @@ class FileInfo extends \SplFileInfo
      * @param int $cTime
      * @param string $type
      * @param false|string $realPath
-     * @param \SplFileInfo $fileInfo
-     * @param \SplFileInfo $pathInfo
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         string $file_name,
@@ -125,7 +110,6 @@ public function __construct(
         string $extension,
         string $basename,
         string $pathname,
-        int $perms,
         int $inode,
         int $size,
         int $owner,
@@ -134,9 +118,7 @@ public function __construct(
         int $mTime,
         int $cTime,
         string $type,
-        $realPath,
-        \SplFileInfo $fileInfo,
-        \SplFileInfo $pathInfo
+        $realPath
     ) {
         parent::__construct($file_name);
         $this->path = $path;
@@ -144,7 +126,6 @@ public function __construct(
         $this->extension = $extension;
         $this->basename = $basename;
         $this->pathname = $pathname;
-        $this->perms = $perms;
         $this->inode = $inode;
         $this->size = $size;
         $this->owner = $owner;
@@ -154,8 +135,6 @@ public function __construct(
         $this->cTime = $cTime;
         $this->type = $type;
         $this->realPath = $realPath;
-        $this->fileInfo = $fileInfo;
-        $this->pathInfo = $pathInfo;
     }
 
     /**
@@ -198,14 +177,6 @@ public function getPathname(): string
         return $this->pathname;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function getPerms(): int
-    {
-        return $this->perms;
-    }
-
     /**
      * @inheritDoc
      */
@@ -277,20 +248,4 @@ public function getRealPath()
     {
         return $this->realPath;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function getFileInfo($class_name = null): \SplFileInfo
-    {
-        return $this->fileInfo;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getPathInfo($class_name = null): \SplFileInfo
-    {
-        return $this->pathInfo;
-    }
 }
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
index ef382732275bd..e2ffa39d0aba9 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
@@ -44,7 +44,7 @@ public function execute(string $path): FileInfo
             'path' => $splFileInfo->getPath(),
             'filename' => $splFileInfo->getFilename(),
             'extension' => $splFileInfo->getExtension(),
-            'basename' => $splFileInfo->getBasename(),
+            'basename' => $splFileInfo->getBasename('.' . $splFileInfo->getExtension()),
             'pathname' => $splFileInfo->getPathname(),
             'perms' => $splFileInfo->getPerms(),
             'inode' => $splFileInfo->getInode(),
@@ -55,9 +55,7 @@ public function execute(string $path): FileInfo
             'mTime' => $splFileInfo->getMTime(),
             'cTime' => $splFileInfo->getCTime(),
             'type' => $splFileInfo->getType(),
-            'realPath' => $splFileInfo->getRealPath(),
-            'fileInfo' => $splFileInfo->getFileInfo(),
-            'pathInfo' => $splFileInfo->getPathInfo()
+            'realPath' => $splFileInfo->getRealPath()
         ]);
     }
 }
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
new file mode 100644
index 0000000000000..c88a6fe7d39d7
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronization\Test\Integration\Model\Filesystem;
+
+use Magento\MediaGallerySynchronization\Model\Filesystem\GetFileInfo;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Integration test for GetFileInfo
+ */
+class GetFileInfoTest extends TestCase
+{
+    /**
+     * @var GetFileInfo
+     */
+    private $getFileInfo;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->getFileInfo = Bootstrap::getObjectManager()->get(GetFileInfo::class);
+    }
+
+    /**
+     * @dataProvider filesProvider
+     * @param string $file
+     */
+    public function testExecute(
+        string $file
+    ): void {
+
+        $path = $this->getImageFilePath($file);
+
+        $fileInfo = $this->getFileInfo->execute($path);
+        $this->assertNotEmpty($fileInfo->getPath());
+        $this->assertNotEmpty($fileInfo->getFilename());
+        $this->assertNotEmpty($fileInfo->getExtension());
+        $this->assertNotEmpty($fileInfo->getBasename());
+        $this->assertNotEmpty($fileInfo->getPathname());
+        $this->assertNotEmpty($fileInfo->getPerms());
+        $this->assertNotEmpty($fileInfo->getInode());
+        $this->assertNotEmpty($fileInfo->getSize());
+        $this->assertNotEmpty($fileInfo->getOwner());
+        $this->assertNotEmpty($fileInfo->getGroup());
+        $this->assertNotEmpty($fileInfo->getATime());
+        $this->assertNotEmpty($fileInfo->getMTime());
+        $this->assertNotEmpty($fileInfo->getCTime());
+        $this->assertNotEmpty($fileInfo->getType());
+        $this->assertNotEmpty($fileInfo->getRealPath());
+
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                'magento.jpg',
+                'magento_2.jpg'
+            ]
+        ];
+    }
+
+    /**
+     * Return image file path
+     *
+     * @param string $filename
+     * @return string
+     */
+    private function getImageFilePath(string $filename): string
+    {
+        return dirname(__DIR__, 2)
+            . DIRECTORY_SEPARATOR
+            . implode(
+                DIRECTORY_SEPARATOR,
+                [
+                    '_files',
+                    $filename
+                ]
+            );
+    }
+}

From 0cb60017323eca1a107e67c632d0c94228cad3ad Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 12 Aug 2020 03:35:25 +0800
Subject: [PATCH 209/671] magento/adobe-stock-integration#1727: Introduce
 internal class wrapping SplFileInfo - fix static test

---
 .../Test/Integration/Model/Filesystem/GetFileInfoTest.php        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
index c88a6fe7d39d7..4031de4226105 100644
--- a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
@@ -55,7 +55,6 @@ public function testExecute(
         $this->assertNotEmpty($fileInfo->getCTime());
         $this->assertNotEmpty($fileInfo->getType());
         $this->assertNotEmpty($fileInfo->getRealPath());
-
     }
 
     /**

From c0b574c86c08116f871516ed8ca8df88a39077bf Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 13 Aug 2020 18:47:51 +0800
Subject: [PATCH 210/671] magento/adobe-stock-integration#1727: Introduce
 internal class wrapping SplFileInfo - apply requested changes

---
 .../Model/CreateAssetFromFile.php             |   2 +-
 .../Model/Filesystem/FileInfo.php             | 155 +++---------------
 .../Model/Filesystem/GetFileInfo.php          |  11 +-
 .../Model/Filesystem/GetFileInfoTest.php      |  23 +--
 4 files changed, 36 insertions(+), 155 deletions(-)

diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index 6f1f05a750085..b257c3da55c84 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -110,7 +110,7 @@ public function execute(string $path): AssetInterface
             [
                 'id' => null,
                 'path' => $path,
-                'title' => $metadata->getTitle() ?: $file->getBasename('.' . $file->getExtension()),
+                'title' => $metadata->getTitle() ?: $file->getBasename(),
                 'description' => $metadata->getDescription(),
                 'createdAt' => $this->date->date($file->getCTime())->format(self::DATE_FORMAT),
                 'updatedAt' => $this->date->date($file->getMTime())->format(self::DATE_FORMAT),
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
index 034ae7c0bff5a..5e523fd0e905a 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/FileInfo.php
@@ -8,11 +8,9 @@
 namespace Magento\MediaGallerySynchronization\Model\Filesystem;
 
 /**
- * Internal class wrapping \SplFileInfo
- *
- * @SuppressWarnings(PHPMD.TooManyFields)
+ * Class for getting image file information.
  */
-class FileInfo extends \SplFileInfo
+class FileInfo
 {
     /**
      * @var string
@@ -34,36 +32,11 @@ class FileInfo extends \SplFileInfo
      */
     private $basename;
 
-    /**
-     * @var string
-     */
-    private $pathname;
-
-    /**
-     * @var int
-     */
-    private $inode;
-
     /**
      * @var int
      */
     private $size;
 
-    /**
-     * @var int
-     */
-    private $owner;
-
-    /**
-     * @var int
-     */
-    private $group;
-
-    /**
-     * @var int
-     */
-    private $aTime;
-
     /**
      * @var int
      */
@@ -74,71 +47,39 @@ class FileInfo extends \SplFileInfo
      */
     private $cTime;
 
-    /**
-     * @var string
-     */
-    private $type;
-
-    /**
-     * @var false|string
-     */
-    private $realPath;
-
     /**
      * FileInfo constructor.
-     * @param string $file_name
+     *
      * @param string $path
      * @param string $filename
      * @param string $extension
      * @param string $basename
-     * @param string $pathname
-     * @param int $inode
      * @param int $size
-     * @param int $owner
-     * @param int $group
-     * @param int $aTime
      * @param int $mTime
      * @param int $cTime
-     * @param string $type
-     * @param false|string $realPath
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
-        string $file_name,
         string $path,
         string $filename,
         string $extension,
         string $basename,
-        string $pathname,
-        int $inode,
         int $size,
-        int $owner,
-        int $group,
-        int $aTime,
         int $mTime,
-        int $cTime,
-        string $type,
-        $realPath
+        int $cTime
     ) {
-        parent::__construct($file_name);
         $this->path = $path;
         $this->filename = $filename;
         $this->extension = $extension;
         $this->basename = $basename;
-        $this->pathname = $pathname;
-        $this->inode = $inode;
         $this->size = $size;
-        $this->owner = $owner;
-        $this->group = $group;
-        $this->aTime = $aTime;
         $this->mTime = $mTime;
         $this->cTime = $cTime;
-        $this->type = $type;
-        $this->realPath = $realPath;
     }
 
     /**
-     * @inheritDoc
+     * Get path without filename.
+     *
+     * @return string
      */
     public function getPath(): string
     {
@@ -146,7 +87,9 @@ public function getPath(): string
     }
 
     /**
-     * @inheritDoc
+     * Get filename.
+     *
+     * @return string
      */
     public function getFilename(): string
     {
@@ -154,7 +97,9 @@ public function getFilename(): string
     }
 
     /**
-     * @inheritDoc
+     * Get file extension.
+     *
+     * @return string
      */
     public function getExtension(): string
     {
@@ -162,31 +107,19 @@ public function getExtension(): string
     }
 
     /**
-     * @inheritDoc
+     * Get file basename.
+     *
+     * @return string
      */
-    public function getBasename($suffix = null): string
+    public function getBasename(): string
     {
         return $this->basename;
     }
 
     /**
-     * @inheritDoc
-     */
-    public function getPathname(): string
-    {
-        return $this->pathname;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getInode(): int
-    {
-        return $this->inode;
-    }
-
-    /**
-     * @inheritDoc
+     * Get file size.
+     *
+     * @return int
      */
     public function getSize(): int
     {
@@ -194,31 +127,9 @@ public function getSize(): int
     }
 
     /**
-     * @inheritDoc
-     */
-    public function getOwner(): int
-    {
-        return $this->owner;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getGroup(): int
-    {
-        return $this->group;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getATime(): int
-    {
-        return $this->aTime;
-    }
-
-    /**
-     * @inheritDoc
+     * Get last modified time.
+     *
+     * @return int
      */
     public function getMTime(): int
     {
@@ -226,26 +137,12 @@ public function getMTime(): int
     }
 
     /**
-     * @inheritDoc
+     * Get inode change time.
+     *
+     * @return int
      */
     public function getCTime(): int
     {
         return $this->cTime;
     }
-
-    /**
-     * @inheritDoc
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getRealPath()
-    {
-        return $this->realPath;
-    }
 }
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
index e2ffa39d0aba9..8f9080767d6e3 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/Filesystem/GetFileInfo.php
@@ -40,22 +40,13 @@ public function execute(string $path): FileInfo
         $splFileInfo = new \SplFileInfo($path);
 
         return $this->fileInfoFactory->create([
-            'file_name' => $path,
             'path' => $splFileInfo->getPath(),
             'filename' => $splFileInfo->getFilename(),
             'extension' => $splFileInfo->getExtension(),
             'basename' => $splFileInfo->getBasename('.' . $splFileInfo->getExtension()),
-            'pathname' => $splFileInfo->getPathname(),
-            'perms' => $splFileInfo->getPerms(),
-            'inode' => $splFileInfo->getInode(),
             'size' => $splFileInfo->getSize(),
-            'owner' => $splFileInfo->getOwner(),
-            'group' => $splFileInfo->getGroup(),
-            'aTime' => $splFileInfo->getATime(),
             'mTime' => $splFileInfo->getMTime(),
-            'cTime' => $splFileInfo->getCTime(),
-            'type' => $splFileInfo->getType(),
-            'realPath' => $splFileInfo->getRealPath()
+            'cTime' => $splFileInfo->getCTime()
         ]);
     }
 }
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
index 4031de4226105..cc9b70e623d9f 100644
--- a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
@@ -40,21 +40,14 @@ public function testExecute(
         $path = $this->getImageFilePath($file);
 
         $fileInfo = $this->getFileInfo->execute($path);
-        $this->assertNotEmpty($fileInfo->getPath());
-        $this->assertNotEmpty($fileInfo->getFilename());
-        $this->assertNotEmpty($fileInfo->getExtension());
-        $this->assertNotEmpty($fileInfo->getBasename());
-        $this->assertNotEmpty($fileInfo->getPathname());
-        $this->assertNotEmpty($fileInfo->getPerms());
-        $this->assertNotEmpty($fileInfo->getInode());
-        $this->assertNotEmpty($fileInfo->getSize());
-        $this->assertNotEmpty($fileInfo->getOwner());
-        $this->assertNotEmpty($fileInfo->getGroup());
-        $this->assertNotEmpty($fileInfo->getATime());
-        $this->assertNotEmpty($fileInfo->getMTime());
-        $this->assertNotEmpty($fileInfo->getCTime());
-        $this->assertNotEmpty($fileInfo->getType());
-        $this->assertNotEmpty($fileInfo->getRealPath());
+        $expectedResult = new \SplFileInfo($path);
+        $this->assertEquals($expectedResult->getPath(), $fileInfo->getPath());
+        $this->assertEquals($expectedResult->getFilename(), $fileInfo->getFilename());
+        $this->assertEquals($expectedResult->getExtension(), $fileInfo->getExtension());
+        $this->assertEquals($expectedResult->getBasename('.' . $expectedResult->getExtension()), $fileInfo->getBasename());
+        $this->assertEquals($expectedResult->getSize(), $fileInfo->getSize());
+        $this->assertEquals($expectedResult->getMTime(), $fileInfo->getMTime());
+        $this->assertEquals($expectedResult->getCTime(), $fileInfo->getCTime());
     }
 
     /**

From 55a591e8e2574ff29fa3b08eb9926bca45c37c87 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Fri, 14 Aug 2020 10:16:54 +0100
Subject: [PATCH 211/671] Fixed static test

---
 .../Test/Integration/Model/Filesystem/GetFileInfoTest.php    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
index cc9b70e623d9f..6b1e8a676d02b 100644
--- a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/Filesystem/GetFileInfoTest.php
@@ -44,7 +44,10 @@ public function testExecute(
         $this->assertEquals($expectedResult->getPath(), $fileInfo->getPath());
         $this->assertEquals($expectedResult->getFilename(), $fileInfo->getFilename());
         $this->assertEquals($expectedResult->getExtension(), $fileInfo->getExtension());
-        $this->assertEquals($expectedResult->getBasename('.' . $expectedResult->getExtension()), $fileInfo->getBasename());
+        $this->assertEquals(
+            $expectedResult->getBasename('.' . $expectedResult->getExtension()),
+            $fileInfo->getBasename()
+        );
         $this->assertEquals($expectedResult->getSize(), $fileInfo->getSize());
         $this->assertEquals($expectedResult->getMTime(), $fileInfo->getMTime());
         $this->assertEquals($expectedResult->getCTime(), $fileInfo->getCTime());

From 56e97248794de37b954c7ed03216e76e79490af3 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 12:58:32 +0300
Subject: [PATCH 212/671] Fix date timestamp typo

---
 app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
index ff82b990d2a01..7712bc088f518 100644
--- a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
+++ b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
@@ -86,8 +86,8 @@ public function execute(int $id, MetadataInterface $data): void
                 'description' => $data->getDescription() ?? $asset->getDescription(),
                 'source' => $asset->getSource(),
                 'hash' => $asset->getHash(),
-                'created_at' => $asset->getCreatedAt(),
-                'updated_at' => $asset->getUpdatedAt()
+                'createdAt' => $asset->getCreatedAt(),
+                'updatedAt' => $asset->getUpdatedAt()
             ]
         );
 

From 21ac52096c950d1c70c453291431762df358de34 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 13:04:51 +0300
Subject: [PATCH 213/671] Apply correct sort order

---
 .../Magento/MediaGalleryUi/Model/UpdateAsset.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
index 7712bc088f518..f81c0449306da 100644
--- a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
+++ b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
@@ -76,18 +76,18 @@ public function execute(int $id, MetadataInterface $data): void
 
         $updatedAsset = $this->assetFactory->create(
             [
+                'id' => $asset->getId(),
                 'path' => $asset->getPath(),
-                'contentType' => $asset->getContentType(),
+                'title' => $data->getTitle() ?? $asset->getTitle(),
+                'description' => $data->getDescription() ?? $asset->getDescription(),
+                'createdAt' => $asset->getCreatedAt(),
+                'updatedAt' => $asset->getUpdatedAt(),
                 'width' => $asset->getWidth(),
                 'height' => $asset->getHeight(),
                 'size' => $asset->getSize(),
-                'id' => $asset->getId(),
-                'title' => $data->getTitle() ?? $asset->getTitle(),
-                'description' => $data->getDescription() ?? $asset->getDescription(),
-                'source' => $asset->getSource(),
                 'hash' => $asset->getHash(),
-                'createdAt' => $asset->getCreatedAt(),
-                'updatedAt' => $asset->getUpdatedAt()
+                'contentType' => $asset->getContentType(),
+                'source' => $asset->getSource()
             ]
         );
 

From 04d0c921318184391acbd93acf19c97bbca2bb40 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 13:38:02 +0300
Subject: [PATCH 214/671] represent the create/updated time of database record

---
 .../Model/CreateAssetFromFile.php                | 16 ----------------
 .../Magento/MediaGalleryUi/Model/UpdateAsset.php |  2 --
 2 files changed, 18 deletions(-)

diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index b257c3da55c84..80b334733ed43 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -12,7 +12,6 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\Framework\Filesystem\Driver\File;
-use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
@@ -24,11 +23,6 @@
  */
 class CreateAssetFromFile
 {
-    /**
-     * Date format
-     */
-    private const DATE_FORMAT = 'Y-m-d H:i:s';
-
     /**
      * @var Filesystem
      */
@@ -39,11 +33,6 @@ class CreateAssetFromFile
      */
     private $driver;
 
-    /**
-     * @var TimezoneInterface;
-     */
-    private $date;
-
     /**
      * @var AssetInterfaceFactory
      */
@@ -67,7 +56,6 @@ class CreateAssetFromFile
     /**
      * @param Filesystem $filesystem
      * @param File $driver
-     * @param TimezoneInterface $date
      * @param AssetInterfaceFactory $assetFactory
      * @param GetContentHash $getContentHash
      * @param ExtractMetadataInterface $extractMetadata
@@ -76,7 +64,6 @@ class CreateAssetFromFile
     public function __construct(
         Filesystem $filesystem,
         File $driver,
-        TimezoneInterface $date,
         AssetInterfaceFactory $assetFactory,
         GetContentHash $getContentHash,
         ExtractMetadataInterface $extractMetadata,
@@ -84,7 +71,6 @@ public function __construct(
     ) {
         $this->filesystem = $filesystem;
         $this->driver = $driver;
-        $this->date = $date;
         $this->assetFactory = $assetFactory;
         $this->getContentHash = $getContentHash;
         $this->extractMetadata = $extractMetadata;
@@ -112,8 +98,6 @@ public function execute(string $path): AssetInterface
                 'path' => $path,
                 'title' => $metadata->getTitle() ?: $file->getBasename(),
                 'description' => $metadata->getDescription(),
-                'createdAt' => $this->date->date($file->getCTime())->format(self::DATE_FORMAT),
-                'updatedAt' => $this->date->date($file->getMTime())->format(self::DATE_FORMAT),
                 'width' => $width,
                 'height' => $height,
                 'hash' => $this->getHash($path),
diff --git a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
index f81c0449306da..85522c6b07e00 100644
--- a/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
+++ b/app/code/Magento/MediaGalleryUi/Model/UpdateAsset.php
@@ -80,8 +80,6 @@ public function execute(int $id, MetadataInterface $data): void
                 'path' => $asset->getPath(),
                 'title' => $data->getTitle() ?? $asset->getTitle(),
                 'description' => $data->getDescription() ?? $asset->getDescription(),
-                'createdAt' => $asset->getCreatedAt(),
-                'updatedAt' => $asset->getUpdatedAt(),
                 'width' => $asset->getWidth(),
                 'height' => $asset->getHeight(),
                 'size' => $asset->getSize(),

From 0a12e374f2ed0fe06e131ec36f20a9d1b652cb2a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 10 Aug 2020 15:15:44 +0300
Subject: [PATCH 215/671] Cover changes with mftf tests

---
 ...tedAtNotEqualsUpdatedAtTimeActionGroup.xml | 24 +++++++++++++++++++
 ...UploadedImageDateTimeEqualsActionGroup.xml | 24 +++++++++++++++++++
 ...EnhancedMediaGalleryViewDetailsSection.xml |  2 ++
 ...daloneMediaGalleryEditImageDetailsTest.xml |  5 ++++
 4 files changed, 55 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
new file mode 100644
index 0000000000000..248c6de468193
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
@@ -0,0 +1,24 @@
+<?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="AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup">
+        <annotations>
+            <description>Assert that created_at updated_at time NOT equals</description>
+        </annotations>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.createdAtDate}}" stepKey="grabCreatedTime"/>
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.updatedAtDate}}" stepKey="grabModifietTime"/>
+        <assertNotEquals stepKey="verifyContentType">
+            <actualResult type="variable">grabCreatedTime</actualResult>
+            <expectedResult type="variable">grabModifietTime</expectedResult>
+        </assertNotEquals>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml
new file mode 100644
index 0000000000000..f26931f08586f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml
@@ -0,0 +1,24 @@
+<?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="AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup">
+        <annotations>
+            <description>Assert that created_at updated_at time are the same for newly uploaded image </description>
+        </annotations>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.createdAtDate}}" stepKey="grabCreatedTime"/>
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.updatedAtDate}}" stepKey="grabModifietTime"/>
+        <assertEquals stepKey="verifyContentType">
+            <actualResult type="variable">grabCreatedTime</actualResult>
+            <expectedResult type="variable">grabModifietTime</expectedResult>
+        </assertEquals>
+
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
index 048739ed3f81d..e63429677fbae 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
@@ -18,6 +18,8 @@
         <element name="edit" type="button" selector="//div[@class='media-gallery-image-details-modal']//button[contains(@class, 'edit')]"/>
         <element name="delete" type="button" selector="//div[@class='media-gallery-image-details-modal']//button[contains(@class, 'delete')]"/>
         <element name="confirmDelete" type="button" selector=".action-accept"/>
+        <element name="createdAtDate" type="button" selector="//div[@class='attribute']/span[contains(text(), 'Created')]/following-sibling::div"/>
+        <element name="updatedAtDate" type="button" selector="//div[@class='attribute']/span[contains(text(), 'Modified')]/following-sibling::div"/>
         <element name="addImage" type="button" selector=".add-image-action"/>
         <element name="cancel" type="button" selector="#image-details-action-cancel"/>
         <element name="usedInLink" type="button" parameterized="true" selector="//div[@class='attribute']/span[contains(text(), 'Used In')]/following-sibling::div/a[contains(text(), '{{entityName}}')]"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
index ede3a452e4ca5..c5247dc21ec63 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
@@ -29,6 +29,10 @@
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="clickViewDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup" stepKey="verifyCreatedAndUpdatedAtDate" />
+        <wait time="10" stepKey="waitForUpdateTimeToBeGreater"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryEditImageDetailsActionGroup" stepKey="editImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
             <argument name="image" value="UpdatedImageDetails"/>
@@ -40,6 +44,7 @@
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup" stepKey="assertUpdatedAtTimeChanged" />
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
             <argument name="description" value="UpdatedImageDetails.description"/>
         </actionGroup>

From aaa8d64d48cda9b94553e8cb9c392cd41baed02a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 10:23:50 +0300
Subject: [PATCH 216/671] CodeReview suggestions

---
 ...erifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml | 2 +-
 ...dMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml} | 2 +-
 .../AdminStandaloneMediaGalleryEditImageDetailsTest.xml     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/{AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml => AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml} (94%)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
index 248c6de468193..9460d0b339ca4 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup">
+    <actionGroup name="AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup">
         <annotations>
             <description>Assert that created_at updated_at time NOT equals</description>
         </annotations>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml
similarity index 94%
rename from app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml
rename to app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml
index f26931f08586f..076885ddaf8b6 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup">
+    <actionGroup name="AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup">
         <annotations>
             <description>Assert that created_at updated_at time are the same for newly uploaded image </description>
         </annotations>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
index c5247dc21ec63..3fd1eacbf3504 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
@@ -30,8 +30,8 @@
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="clickViewDetails"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryVerifyUploadedImageDateTimeEqualsActionGroup" stepKey="verifyCreatedAndUpdatedAtDate" />
-        <wait time="10" stepKey="waitForUpdateTimeToBeGreater"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup" stepKey="verifyCreatedAndUpdatedAtDate" />
+        <wait time="20" stepKey="waitForUpdateTimeToBeGreater"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryEditImageDetailsActionGroup" stepKey="editImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
@@ -44,7 +44,7 @@
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup" stepKey="assertUpdatedAtTimeChanged" />
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup" stepKey="assertUpdatedAtTimeChanged" />
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
             <argument name="description" value="UpdatedImageDetails.description"/>
         </actionGroup>

From 573276a9645dde42175c4565c0aebd4ab315a6cf Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 10:25:30 +0300
Subject: [PATCH 217/671] Rename file

---
 ...diaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/{AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml => AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml} (100%)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
similarity index 100%
rename from app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml
rename to app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup.xml

From 4f99a9a2ff67416fb82478995a633ebec51e3760 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 11 Aug 2020 10:34:12 +0300
Subject: [PATCH 218/671] Fix flaky bahavior

---
 .../Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
index 3fd1eacbf3504..58c6f32b8d72f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
@@ -31,7 +31,7 @@
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="clickViewDetails"/>
         <actionGroup ref="AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup" stepKey="verifyCreatedAndUpdatedAtDate" />
-        <wait time="20" stepKey="waitForUpdateTimeToBeGreater"/>
+        <wait time="100" stepKey="waitForUpdateTimeToBeGreater"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryEditImageDetailsActionGroup" stepKey="editImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">

From 08b55935a6c5cb51d4ad7aae83cb3ac703c62cde Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 7 Aug 2020 16:26:30 +0800
Subject: [PATCH 219/671] magento/adobe-stock-integration#1711: Use product
 model instead of data object for catalog image helper init

---
 .../Ui/Component/Listing/Columns/Thumbnail.php       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
index efb2ad2f8dae5..7a2662b59d198 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
@@ -6,7 +6,7 @@
 namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
 
 use Magento\Catalog\Helper\Image;
-use Magento\Framework\DataObject;
+use Magento\Catalog\Model\ProductFactory;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Store\Model\Store;
@@ -29,11 +29,17 @@ class Thumbnail extends Column
      */
     private $imageHelper;
 
+    /**
+     * @var ProductFactory
+     */
+    private $productFactory;
+
     /**
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param StoreManagerInterface $storeManager
      * @param Image $image
+     * @param ProductFactory $productFactory
      * @param array $components
      * @param array $data
      */
@@ -42,12 +48,14 @@ public function __construct(
         UiComponentFactory $uiComponentFactory,
         StoreManagerInterface $storeManager,
         Image $image,
+        ProductFactory $productFactory,
         array $components = [],
         array $data = []
     ) {
         parent::__construct($context, $uiComponentFactory, $components, $data);
         $this->imageHelper = $image;
         $this->storeManager = $storeManager;
+        $this->productFactory = $productFactory;
     }
 
     /**
@@ -64,7 +72,7 @@ public function prepareDataSource(array $dataSource)
                 if (isset($item[$fieldName])) {
                     $item[$fieldName . '_src'] = $this->getUrl($item[$fieldName]);
                 } else {
-                    $category = new DataObject($item);
+                    $category = $this->productFactory->create($item);
                     $imageHelper = $this->imageHelper->init($category, 'product_listing_thumbnail');
                     $item[$fieldName . '_src'] = $imageHelper->getUrl();
                 }

From 62b29d37e26ccf431ab7d4abb6009011c32deedc Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 7 Aug 2020 18:36:39 +0800
Subject: [PATCH 220/671] magento/adobe-stock-integration#1711: Use product
 model instead of data object for catalog image helper init - Apply PR
 suggestion

---
 .../Ui/Component/Listing/Columns/Thumbnail.php                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
index 7a2662b59d198..4cacaea0d99bf 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
@@ -72,7 +72,7 @@ public function prepareDataSource(array $dataSource)
                 if (isset($item[$fieldName])) {
                     $item[$fieldName . '_src'] = $this->getUrl($item[$fieldName]);
                 } else {
-                    $category = $this->productFactory->create($item);
+                    $category = $this->productFactory->create(['data' => $item]);
                     $imageHelper = $this->imageHelper->init($category, 'product_listing_thumbnail');
                     $item[$fieldName . '_src'] = $imageHelper->getUrl();
                 }

From 4d5be024b12f21bc1a58132250e2b648505889c3 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 7 Aug 2020 23:33:10 +0800
Subject: [PATCH 221/671] magento/adobe-stock-integration#1711: Use product
 model instead of data object for catalog image helper init - Revised approach
 based from pr suggestion

---
 .../Component/Listing/Columns/Thumbnail.php   |  72 +++++++++++++-----
 .../etc/adminhtml/di.xml                      |   7 ++
 .../web/images/category/placeholder/image.jpg | Bin 0 -> 820 bytes
 3 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/images/category/placeholder/image.jpg

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
index 4cacaea0d99bf..dada8ee7acc19 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Columns/Thumbnail.php
@@ -5,8 +5,9 @@
  */
 namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
 
-use Magento\Catalog\Helper\Image;
-use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\Category\Image;
+use Magento\Catalog\Model\CategoryRepository;
+use Magento\Framework\View\Asset\Repository as AssetRepository;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Store\Model\Store;
@@ -27,19 +28,32 @@ class Thumbnail extends Column
     /**
      * @var Image
      */
-    private $imageHelper;
+    private $categoryImage;
 
     /**
-     * @var ProductFactory
+     * @var CategoryRepository
      */
-    private $productFactory;
+    private $categoryRepository;
 
     /**
+     * @var AssetRepository
+     */
+    private $assetRepository;
+
+    /**
+     * @var string[]
+     */
+    private $defaultPlaceholder;
+
+    /**
+     * Thumbnail constructor.
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param StoreManagerInterface $storeManager
-     * @param Image $image
-     * @param ProductFactory $productFactory
+     * @param Image $categoryImage
+     * @param CategoryRepository $categoryRepository
+     * @param AssetRepository $assetRepository
+     * @param array $defaultPlaceholder
      * @param array $components
      * @param array $data
      */
@@ -47,15 +61,19 @@ public function __construct(
         ContextInterface $context,
         UiComponentFactory $uiComponentFactory,
         StoreManagerInterface $storeManager,
-        Image $image,
-        ProductFactory $productFactory,
+        Image $categoryImage,
+        CategoryRepository $categoryRepository,
+        AssetRepository $assetRepository,
+        array $defaultPlaceholder = [],
         array $components = [],
         array $data = []
     ) {
         parent::__construct($context, $uiComponentFactory, $components, $data);
-        $this->imageHelper = $image;
         $this->storeManager = $storeManager;
-        $this->productFactory = $productFactory;
+        $this->categoryImage = $categoryImage;
+        $this->categoryRepository = $categoryRepository;
+        $this->assetRepository = $assetRepository;
+        $this->defaultPlaceholder = $defaultPlaceholder;
     }
 
     /**
@@ -63,20 +81,34 @@ public function __construct(
      *
      * @param array $dataSource
      * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function prepareDataSource(array $dataSource)
     {
-        if (isset($dataSource['data']['items'])) {
-            $fieldName = $this->getData('name');
-            foreach ($dataSource['data']['items'] as & $item) {
-                if (isset($item[$fieldName])) {
-                    $item[$fieldName . '_src'] = $this->getUrl($item[$fieldName]);
-                } else {
-                    $category = $this->productFactory->create(['data' => $item]);
-                    $imageHelper = $this->imageHelper->init($category, 'product_listing_thumbnail');
-                    $item[$fieldName . '_src'] = $imageHelper->getUrl();
+        if (!isset($dataSource['data']['items'])) {
+            return $dataSource;
+        }
+
+        $fieldName = $this->getData('name');
+        foreach ($dataSource['data']['items'] as & $item) {
+            if (isset($item[$fieldName])) {
+                $item[$fieldName . '_src'] = $this->getUrl($item[$fieldName]);
+                continue;
+            }
+
+            if (isset($item['entity_id'])) {
+                $src = $this->categoryImage->getUrl(
+                    $this->categoryRepository->get($item['entity_id'])
+                );
+
+                if (!empty($src)) {
+                    $item[$fieldName . '_src'] = $src;
+                    continue;
                 }
             }
+
+            $item[$fieldName . '_src'] = $this->assetRepository->getUrl($this->defaultPlaceholder['image']);
         }
 
         return $dataSource;
diff --git a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
index ae01c29928b4a..2aaf5a56cf837 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/etc/adminhtml/di.xml
@@ -38,4 +38,11 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\Thumbnail">
+        <arguments>
+            <argument name="defaultPlaceholder" xsi:type="array">
+                <item name="image" xsi:type="string">Magento_MediaGalleryCatalogUi::images/category/placeholder/image.jpg</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/images/category/placeholder/image.jpg b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/images/category/placeholder/image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0d5ef7e1bd4127242b442957d4f543d7e9e0320e
GIT binary patch
literal 820
zcmex=<NpH&0WUXCHwH!~28I+MWcYuZp@o5wc))}J%y0nJ&cw(Flm%kA1hI_&2N(o7
z7>pQ<m>C5bm;@P_1sVSzVJKr@0Gh?ffCN|=S(%vGxC9uO7+6>s*?5^*A(BA<FtZ4<
z3Mm>2D;WhQ78Z*r8=IIqIu(^PHgDXVyy;NW#7PG~Frt_R(kX}`^8XeC5715~L1sY)
zdxr0g3=X=%;Yw4BeG99LQrGqzdlMh<+Dw2u=+Ts~DvEn%w%iO$l#E`i{lYl<N?mxv
zrUnJI=gU_=y~xP!>vxEG{;H!l`?)%OPo6%iU8eH#(dF3ujaFYBlKorG&bgCyJt3kg
z^}fmV_wq5#tLsj%Wo@W5X3Q!+SYYB@towGmr<<)+2g}m1Yl-g<u5z2Hle4DMq2$yI
z$1{7Q`cCjQ&07@fv(YS2)l+#2heGc`S>;uam`m97&*YcxJH|Zkz=200rfsQ_l~IRY
z7hT_YC+-5vsh^)$KlRwp7qV;V^oe>FGt-{#IkxxKx7!)KH<pIHikekE>Dx#DQme%b
zkKKY7-eWF}InQ~h=b0<dsUEh6(Os*&Ca>7haGL$I{i^>A$C$1$i$62pbw8Q${DYcb
z^ULDzJ`nWx;_tJcbHKc>va0Uoe}<|9M)z7|Z`GAH+;9Fl|7!hX#%xBG7=bdS`}dgk
zbu}M&c3#`SW@V!h6G!Q(sE2ze?|a15Xscmo@voTSp5@b*znA}g&G2WXZeYvlNlUb?
zG<dFW*mCE{?CcE<Ws_!Rs&r}{{i+kupm#R=25-Z*2|Nb`SXgW0WR+G=vGI9(<ciGW
zU)^uZUL=SwKeW>=H|KDmacaz&u*0r8XVY@oZkHX1ZV+Kupuuzim;|aCq&PSm6ja{T
aU%Rit(V)P=#L#g1Pv!paUmfcI-vj^#YZ+<)

literal 0
HcmV?d00001


From febb063333060bcf41b3c572f6d764142b81e3fc Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Tue, 11 Aug 2020 10:15:06 +0800
Subject: [PATCH 222/671] magento/adobe-stock-integration#1711: Use product
 model instead of data object for catalog image helper init - Update MFTF for
 image placeholder verification, update branch

---
 .../AdminAssertCategoryGridPageDetailsActionGroup.xml            | 1 +
 .../Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
index 7875c62f9591d..884fa47152932 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml
@@ -12,6 +12,7 @@
             <description>Assert category grid page basic columns values for default category</description>
         </annotations>
 
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.image('1','image')}}" stepKey="assertImageColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.path('1')}}" stepKey="assertPathColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name('1', 'Default Category')}}" stepKey="assertNameColumn"/>
         <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.displayMode('1', 'PRODUCTS')}}" stepKey="assertDisplayModeColumn"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
index 41bec6f6220a0..db260d85b62ce 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMediaGalleryCatalogUiCategoryGridSection">
+        <element name="image" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{imageName}}')]" parameterized="true"/>
         <element name="path" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Path')]/preceding-sibling::th)]" parameterized="true"/>
         <element name="name" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Name')]/preceding-sibling::th) +1 ]//*[text()='{{categoryName}}']" parameterized="true"/>
         <element name="displayMode" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Display Mode')]/preceding-sibling::th) +1 ]//*[text()='{{productsText}}']" parameterized="true"/>

From d51bc97028544ed8ff4242081e892f584543ce60 Mon Sep 17 00:00:00 2001
From: Shankar Konar <konar.shankar2013@gmail.com>
Date: Fri, 14 Aug 2020 13:58:35 +0530
Subject: [PATCH 223/671] Reversed Store configuration

---
 .../Model/Config/MediaGallery/Yesno.php       | 21 +++++++++++++++++++
 .../MediaGalleryUi/etc/adminhtml/system.xml   |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Model/Config/MediaGallery/Yesno.php

diff --git a/app/code/Magento/MediaGalleryUi/Model/Config/MediaGallery/Yesno.php b/app/code/Magento/MediaGalleryUi/Model/Config/MediaGallery/Yesno.php
new file mode 100644
index 0000000000000..40cf7630d9911
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/Config/MediaGallery/Yesno.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Model\Config\MediaGallery;
+
+class Yesno implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * Options getter
+     *
+     * @return array
+     */
+    public function toOptionArray() :array
+    {
+        return [['value' => 0, 'label' => __('Yes')], ['value' => 1, 'label' => __('No')]];
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
index 77544b42e899a..17aa08b5363ca 100644
--- a/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/adminhtml/system.xml
@@ -9,10 +9,10 @@
     <system>
         <section id="system">
             <group id="media_gallery" translate="label" type="text" sortOrder="1000" showInDefault="1" showInWebsite="0" showInStore="0">
-                <label>Enhanced Media Gallery</label>
+                <label>Media Gallery</label>
                 <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Enabled</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <label>Enable Old Media Gallery</label>
+                    <source_model>Magento\MediaGalleryUi\Model\Config\MediaGallery\Yesno</source_model>
                     <config_path>system/media_gallery/enabled</config_path>
                 </field>
             </group>

From 44b283d4caac160965cc5fa550976c15a744b916 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Mon, 17 Aug 2020 16:18:15 +0300
Subject: [PATCH 224/671] Fix ui-select options placeholders for
 url-filter-applier && Clean cached options for ui-select component after
 closing slide form

---
 ...lleryAssetFilterPlaceHolderActionGroup.xml |  20 +++
 ...diaGalleryCatalogUiCategoryGridSection.xml |   1 +
 ...alleryCatalogUiUsedInProductFilterTest.xml |  10 +-
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml |   3 +
 .../Listing/Filters/UsedInProducts.php        |  68 +++------
 .../Listing/Filters/UsedInBlocks.php          |  66 +++-----
 .../Component/Listing/Filters/UsedInPages.php |  67 +++-----
 .../Controller/Adminhtml/Asset/Search.php     |   2 +-
 ...diaGalleryFilterPlaceholderActionGroup.xml |  20 +++
 ...dminEnhancedMediaGalleryFiltersSection.xml |   1 +
 .../Ui/Component/Listing/Filters/Asset.php    | 143 ++++++++++++++++--
 .../adminhtml/web/js/image/image-actions.js   |   1 +
 .../grid/filters/elements/ui-select.html      |   8 +-
 13 files changed, 266 insertions(+), 144 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceholderActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup.xml
new file mode 100644
index 0000000000000..c9c9a25d8a2a3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup">
+        <annotations>
+            <description>Assert asset filter placeholder value</description>
+        </annotations>
+        <arguments>
+            <argument name="filterPlaceholder" type="string"/>
+        </arguments>
+
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.activeFilterPlaceholder(filterPlaceholder)}}"  stepKey="assertFilterPLaceHolder" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
index db260d85b62ce..ffd3c14c297c3 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -9,6 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMediaGalleryCatalogUiCategoryGridSection">
+        <element name="activeFilterPlaceholder" type="text" selector="//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
         <element name="image" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Image')]/preceding-sibling::th) +1]//img[contains(@src, '{{imageName}}')]" parameterized="true"/>
         <element name="path" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Path')]/preceding-sibling::th)]" parameterized="true"/>
         <element name="name" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Name')]/preceding-sibling::th) +1 ]//*[text()='{{categoryName}}']" parameterized="true"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index d68fd4cb7cca8..74633fbb73542 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -62,12 +62,20 @@
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ImageMetadata.title"/>
         </actionGroup>
+
+        <wait time="10" stepKey="waitForBookmarkToSaveView"/>
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForGridReloaded"/>
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceholderActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="$$product.name$$"/>
+        </actionGroup>
+
         <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
             <argument name="imageName" value="{{ImageMetadata.title}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clikDeleteSelectedButton"/>
         <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
-       
+
    </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index e761ef5cd08ba..7e0fa6c477c45 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -54,6 +54,9 @@
         <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInCategories">
             <argument name="entityName" value="Categories"/>
         </actionGroup>
+        <actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
+        </actionGroup>
         <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
index 254ebd047c954..d86617e12b8f8 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
@@ -80,54 +80,36 @@ public function prepare()
     {
         $options = [];
         $productIds = [];
-        $bookmarks = $this->bookmarkManagement->loadByNamespace($this->context->getNameSpace())->getItems();
-        foreach ($bookmarks as $bookmark) {
-            if ($bookmark->getIdentifier() === 'current') {
-                $applied = $bookmark->getConfig()['current']['filters']['applied'];
-                if (isset($applied[$this->getName()])) {
-                    $productIds = $applied[$this->getName()];
-                }
-            }
+        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
+            'current',
+            $this->context->getNameSpace()
+        );
+        if ($bookmark === null) {
+            parent::prepare();
+            return;
         }
 
-        foreach ($productIds as $id) {
-            $product = $this->productRepository->getById($id);
-            $options[] = [
-                'value' => $id,
-                'label' => $product->getName(),
-                'is_active' => $product->getStatus(),
-                'path' => $product->getSku(),
-                'optgroup' => false
+        $applied = $bookmark->getConfig()['current']['filters']['applied'];
 
-            ];
+        if (isset($applied[$this->getName()])) {
+            $productIds = $applied[$this->getName()];
         }
 
-        $this->wrappedComponent = $this->uiComponentFactory->create(
-            $this->getName(),
-            parent::COMPONENT,
-            [
-                'context' => $this->getContext(),
-                'options' => $options
-            ]
-        );
-
-        $this->wrappedComponent->prepare();
-        $productsFilterJsConfig = array_replace_recursive(
-            $this->getJsConfig($this->wrappedComponent),
-            $this->getJsConfig($this)
-        );
-        $this->setData('js_config', $productsFilterJsConfig);
-
-        $this->setData(
-            'config',
-            array_replace_recursive(
-                (array)$this->wrappedComponent->getData('config'),
-                (array)$this->getData('config')
-            )
-        );
-
-        $this->applyFilter();
-
+        foreach ($productIds as $id) {
+            try {
+                $product = $this->productRepository->getById($id);
+                $options[] = [
+                    'value' => $id,
+                    'label' => $product->getName(),
+                    'is_active' => $product->getStatus(),
+                    'path' => $product->getSku(),
+                    'optgroup' => false
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+        $this->optionsProvider = $options;
         parent::prepare();
     }
 }
diff --git a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
index 09fea24c8a2a9..66f8caa71d70a 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
+++ b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
@@ -80,52 +80,36 @@ public function prepare()
     {
         $options = [];
         $blockIds = [];
-        $bookmarks = $this->bookmarkManagement->loadByNamespace($this->context->getNameSpace())->getItems();
-        foreach ($bookmarks as $bookmark) {
-            if ($bookmark->getIdentifier() === 'current') {
-                $applied = $bookmark->getConfig()['current']['filters']['applied'];
-                if (isset($applied[$this->getName()])) {
-                    $blockIds = $applied[$this->getName()];
-                }
-            }
-        }
-
-        foreach ($blockIds as $id) {
-            $block = $this->blockRepository->getById($id);
-            $options[] = [
-                'value' => $id,
-                'label' => $block->getTitle(),
-                'is_active' => $block->isActive(),
-                'optgroup' => false
-              ];
+        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
+            'current',
+            $this->context->getNameSpace()
+        );
+        if ($bookmark === null) {
+            parent::prepare();
+            return;
         }
 
-        $this->wrappedComponent = $this->uiComponentFactory->create(
-            $this->getName(),
-            parent::COMPONENT,
-            [
-                'context' => $this->getContext(),
-                'options' => $options
-            ]
-        );
+        $applied = $bookmark->getConfig()['current']['filters']['applied'];
 
-        $this->wrappedComponent->prepare();
-        $jsConfig = array_replace_recursive(
-            $this->getJsConfig($this->wrappedComponent),
-            $this->getJsConfig($this)
-        );
-        $this->setData('js_config', $jsConfig);
-
-        $this->setData(
-            'config',
-            array_replace_recursive(
-                (array)$this->wrappedComponent->getData('config'),
-                (array)$this->getData('config')
-            )
-        );
+        if (isset($applied[$this->getName()])) {
+            $blockIds = $applied[$this->getName()];
+        }
 
-        $this->applyFilter();
+        foreach ($blockIds as $id) {
+            try {
+                $block = $this->blockRepository->getById($id);
+                $options[] = [
+                    'value' => $id,
+                    'label' => $block->getTitle(),
+                    'is_active' => $block->isActive(),
+                    'optgroup' => false
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
 
+        $this->optionsProvider = $options;
         parent::prepare();
     }
 }
diff --git a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
index 235a77cdcb8c5..78ab1b63d32d1 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
+++ b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
@@ -80,52 +80,35 @@ public function prepare()
     {
         $options = [];
         $pageIds = [];
-        $bookmarks = $this->bookmarkManagement->loadByNamespace($this->context->getNameSpace())->getItems();
-        foreach ($bookmarks as $bookmark) {
-            if ($bookmark->getIdentifier() === 'current') {
-                $applied = $bookmark->getConfig()['current']['filters']['applied'];
-                if (isset($applied[$this->getName()])) {
-                    $pageIds = $applied[$this->getName()];
-                }
-            }
-        }
-
-        foreach ($pageIds as $id) {
-            $page = $this->pageRepository->getById($id);
-            $options[] = [
-                'value' => $id,
-                'label' => $page->getTitle(),
-                'is_active' => $page->isActive(),
-                'optgroup' => false
-            ];
-        }
-
-        $this->wrappedComponent = $this->uiComponentFactory->create(
-            $this->getName(),
-            parent::COMPONENT,
-            [
-                'context' => $this->getContext(),
-                'options' => $options
-            ]
-        );
-
-        $this->wrappedComponent->prepare();
-        $pagesFilterjsConfig = array_replace_recursive(
-            $this->getJsConfig($this->wrappedComponent),
-            $this->getJsConfig($this)
+        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
+            'current',
+            $this->context->getNameSpace()
         );
-        $this->setData('js_config', $pagesFilterjsConfig);
+        if ($bookmark === null) {
+            parent::prepare();
+             return;
+        }
 
-        $this->setData(
-            'config',
-            array_replace_recursive(
-                (array)$this->wrappedComponent->getData('config'),
-                (array)$this->getData('config')
-            )
-        );
+        $applied = $bookmark->getConfig()['current']['filters']['applied'];
 
-        $this->applyFilter();
+        if (isset($applied[$this->getName()])) {
+            $pageIds = $applied[$this->getName()];
+        }
 
+        foreach ($pageIds as $id) {
+            try {
+                $page = $this->pageRepository->getById($id);
+                $options[] = [
+                    'value' => $id,
+                    'label' => $page->getTitle(),
+                    'is_active' => $page->isActive(),
+                    'optgroup' => false
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+        $this->optionsProvider = $options;
         parent::prepare();
     }
 }
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
index df13250eacb5f..9b6c08edbc86d 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/Search.php
@@ -139,7 +139,7 @@ public function execute()
                     $responseContent['options'][] = [
                         'value' => (string) $asset->getId(),
                         'label' => $asset->getTitle(),
-                        'path' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
+                        'src' => $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath())
                     ];
                     $responseContent['total'] = count($responseContent['options']);
                 }
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceholderActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceholderActionGroup.xml
new file mode 100644
index 0000000000000..db400ff151ae3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceholderActionGroup.xml
@@ -0,0 +1,20 @@
+<?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="AdminAssertMediaGalleryFilterPlaceholderActionGroup">
+        <annotations>
+            <description>Assert asset filter placeholder value</description>
+        </annotations>
+        <arguments>
+            <argument name="filterPlaceholder" type="string"/>
+        </arguments>
+
+        <seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.activeFilterPlaceholder(filterPlaceholder)}}"  stepKey="assertFilterPLaceHolder" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml
index 32b109f1e0483..da9f773d0f75e 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryFiltersSection.xml
@@ -25,5 +25,6 @@
         <element name="searchOptionsFilterOption" type="text" selector="//div[label/span[contains(text(), '{{filterName}}')]]//label[@class='admin__action-multiselect-label']/span[text()='{{optionName}}']" parameterized="true" timeout="30"/>
         <element name="searchOptionsFilterDone" type="button" selector="//div[label/span[contains(text(), '{{filterName}}')]]//button[@data-action='close-advanced-select']" parameterized="true"/>
         <element name="duplicatedFilterCheckbox" type="button" selector="//input[@name='duplicated']"/>
+        <element name="activeFilterValue" type="text" selector="//div[@class='media-gallery-container']//div[@class='admin__current-filters-list-wrap']//li//span[contains(text(), '{{filterPlaceholder}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
index 273cf9e37554b..e8dc232584adb 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
@@ -15,9 +15,13 @@
 use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+use Magento\Ui\Api\BookmarkManagementInterface;
 
 /**
- * Asset  filter
+ * Asset filter
  */
 class Asset extends Select
 {
@@ -27,14 +31,41 @@ class Asset extends Select
     private $getContentIdentities;
 
     /**
+     * @var GetAssetsByIdsInterface
+     */
+    private $getAssetsByIds;
+
+    /**
+     * @var Images
+     */
+    private $images;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @var BookmarkManagementInterface
+     */
+    private $bookmarkManagement;
+
+    /**
+     * Constructor
+     *
      * @param ContextInterface $context
      * @param UiComponentFactory $uiComponentFactory
      * @param FilterBuilder $filterBuilder
      * @param FilterModifier $filterModifier
      * @param OptionSourceInterface $optionsProvider
      * @param GetContentByAssetIdsInterface $getContentIdentities
+     * @param GetAssetsByIdsInterface $getAssetsByIds
+     * @param BookmarkManagementInterface $bookmarkManagement
+     * @param Images $images
+     * @param Storage $storage
      * @param array $components
      * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ContextInterface $context,
@@ -43,6 +74,10 @@ public function __construct(
         FilterModifier $filterModifier,
         OptionSourceInterface $optionsProvider = null,
         GetContentByAssetIdsInterface $getContentIdentities,
+        GetAssetsByIdsInterface $getAssetsByIds,
+        BookmarkManagementInterface $bookmarkManagement,
+        Images $images,
+        Storage $storage,
         array $components = [],
         array $data = []
     ) {
@@ -58,6 +93,89 @@ public function __construct(
             $data
         );
         $this->getContentIdentities = $getContentIdentities;
+        $this->getAssetsByIds = $getAssetsByIds;
+        $this->bookmarkManagement = $bookmarkManagement;
+        $this->images = $images;
+        $this->storage = $storage;
+    }
+
+    /**
+     * Prepare component configuration
+     *
+     * @return void
+     */
+    public function prepare()
+    {
+        $options = [];
+        $assetIds = $this->getAssetIds();
+
+        if (empty($assetIds)) {
+            parent::prepare();
+            return;
+        }
+
+        $assets = $this->getAssetsByIds->execute($assetIds);
+
+        foreach ($assets as $asset) {
+            $assetPath = $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath());
+            $options[] = [
+                'value' => (string) $asset->getId(),
+                'label' => $asset->getTitle(),
+                'src' => $assetPath
+            ];
+        }
+
+        $this->optionsProvider = $options;
+        parent::prepare();
+    }
+
+    /**
+     * Get asset ids from filterData or from bookmarks
+     */
+    private function getAssetIds(): array
+    {
+        $assetIds = [];
+
+        if (isset($this->filterData[$this->getName()])) {
+            $assetIds = $this->filterData[$this->getName()];
+
+            if (!is_array($assetIds)) {
+                $assetIds = $this->stringToArray($assetIds);
+            }
+
+            return $assetIds;
+        }
+
+        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
+            'current',
+            $this->context->getNameSpace()
+        );
+
+        if ($bookmark === null) {
+            return $assetIds;
+        }
+
+        $applied = $bookmark->getConfig()['current']['filters']['applied'];
+
+        if (isset($applied[$this->getName()])) {
+            $assetIds = $applied[$this->getName()];
+        }
+
+        if (!is_array($assetIds)) {
+            $assetIds = $this->stringToArray($assetIds);
+        }
+
+        return $assetIds;
+    }
+
+    /**
+     * Converts string array from url-applier to array
+     *
+     * @param string $string
+     */
+    private function stringToArray(string $string): array
+    {
+        return explode(',', str_replace(['[', ']'], '', $string));
     }
 
     /**
@@ -67,17 +185,20 @@ public function __construct(
      */
     public function applyFilter()
     {
-        if (isset($this->filterData[$this->getName()])) {
-            $ids = is_array($this->filterData[$this->getName()])
-                ? $this->filterData[$this->getName()]
-                : [$this->filterData[$this->getName()]];
-            $filter = $this->filterBuilder->setConditionType('in')
-                    ->setField($this->_data['config']['identityColumn'])
-                    ->setValue($this->getEntityIdsByAsset($ids))
-                    ->create();
-
-            $this->getContext()->getDataProvider()->addFilter($filter);
+        if (!isset($this->filterData[$this->getName()])) {
+            return;
         }
+
+        $assetIds = $this->filterData[$this->getName()];
+        if (!is_array($assetIds)) {
+            $assetIds = $this->stringToArray($assetIds);
+        }
+
+        $filter = $this->filterBuilder->setConditionType('in')
+            ->setField($this->_data['config']['identityColumn'])
+            ->setValue($this->getEntityIdsByAsset($assetIds))
+            ->create();
+        $this->getContext()->getDataProvider()->addFilter($filter);
     }
 
     /**
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
index c7ca95bed863c..dfd4420c701bb 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
@@ -51,6 +51,7 @@ define([
                 return;
             }
 
+            this.mediaGalleryEditDetails().keywordsSelect().cacheOptions.plain = [];
             modalElement.modal('closeModal');
         },
 
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filters/elements/ui-select.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filters/elements/ui-select.html
index cce859f331d9a..a0d21672eafdb 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filters/elements/ui-select.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/grid/filters/elements/ui-select.html
@@ -77,8 +77,7 @@
             </div>
         </if>
         <ul class="admin__action-multiselect-menu-inner _root"
-            event="{mousemove: function(data, event){onMousemove($data, $index(), event)},
-                    scroll: function(data, event){onScrollDown(data, event)}}">
+            event="{scroll: function(data, event){onScrollDown(data, event)}}">
             <each args="{ data: options, as: 'option'}">
                 <li class="admin__action-multiselect-menu-inner-item _root"
                     css="{ _parent: $data.optgroup }"
@@ -108,9 +107,8 @@
                         </if>
                         <label class="admin__action-multiselect-label">
                             <span text="option.label"></span>
-                            <img if="$parent.getPath(option)"
-                                 class="admin__action-multiselect-item-path"
-                                 attr="{ src: option.path }"/>
+                            <img class="admin__action-multiselect-item-path"
+                                 attr="{ src: option.src }"/>
                         </label>
                     </div>
                     <if args="$data.optgroup">

From a01b8ced36db6bcf1498c60dddc0a8c4c4846356 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 5 Aug 2020 19:16:31 +0800
Subject: [PATCH 225/671] magento/magento2#1703: The deleted tags are not
 removed from Tags drop-down until the web page is refreshed - replaced
 outdated keywords after saving new details

---
 .../view/adminhtml/web/js/image/image-actions.js       |  4 +++-
 .../view/adminhtml/web/js/image/image-edit.js          | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
index dfd4420c701bb..3ae4fc049db4d 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
@@ -87,7 +87,8 @@ define([
                 form = modalElement.find('#image-edit-details-form'),
                 imageId = this.imageModel().getSelected().id,
                 keywords = this.mediaGalleryEditDetails().selectedKeywords(),
-                imageDetails = this.mediaGalleryImageDetails();
+                imageDetails = this.mediaGalleryImageDetails(),
+                imageEditDetails = this.mediaGalleryEditDetails();
 
             if (form.validation('isValid')) {
                 saveDetails(
@@ -99,6 +100,7 @@ define([
                     this.closeModal();
                     this.imageModel().reloadGrid();
                     imageDetails.removeCached(imageId);
+                    imageEditDetails.removeCached(imageId, keywords);
 
                     if (imageDetails.isActive()) {
                         imageDetails.showImageDetailsById(imageId);
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
index c31bc848bdc70..e142fb12aa96a 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
@@ -223,6 +223,16 @@ define([
             }
 
             return true;
+        },
+
+        /**
+         * Remove cached image details in edit form
+         *
+         * @param {String} id
+         * @param {String} tags
+         */
+        removeCached: function (id, tags) {
+            this.images[id].tags = tags;
         }
     });
 });

From 3b479e833e5585a3e3ea0a69e7f91d7ad156580a Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Mon, 10 Aug 2020 22:03:50 +0800
Subject: [PATCH 226/671] magento/magento2#1703: The deleted tags are not
 removed from Tags drop-down until the web page is refreshed - covered MFTF
 test

---
 ...ancedMediaGalleryVerifyUpdatedTagsTest.xml | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
new file mode 100644
index 0000000000000..3672f582b0877
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEnhancedMediaGalleryVerifyUpdatedTagsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1703"/>
+            <title value="User checks if the deleted tags are removed from Edit page, Tags field"/>
+            <stories value="User checks if the deleted tags are removed from Edit page, Tags field"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5064888"/>
+            <description value="User checks if changes made on the tags are updated from Edit page, Tags field"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
+        </after>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
+        <actionGroup ref="AdminMediaGalleryEditAssetAddKeywordActionGroup" stepKey="setKeywords">
+            <argument name="keyword" value="UpdatedImageDetails.keyword"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyAddedKeywords">
+            <argument name="keywords" value="UpdatedImageDetails.keyword"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyMetadataKeywords">
+            <argument name="keywords" value="ImageMetadata.keywords"/>
+        </actionGroup>
+    </test>
+</tests>

From 2ef490f0f8d0d93a6c980d173453daf605d64719 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Tue, 11 Aug 2020 21:19:45 +0800
Subject: [PATCH 227/671] magento/magento2#1703: The deleted tags are not
 removed from Tags drop-down until the web page is refreshed - covered MFTF
 test

---
 .../AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
index 3672f582b0877..db59369638da9 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
@@ -5,7 +5,6 @@
   * See COPYING.txt for license details.
   */
 -->
-
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminEnhancedMediaGalleryVerifyUpdatedTagsTest">
         <annotations>
@@ -26,8 +25,9 @@
             <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsDeleteActionGroup" stepKey="deleteImage"/>
         </after>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
-            <argument name="image" value="ImageUpload"/>
+            <argument name="image" value="ImageUpload3"/>
         </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
         <actionGroup ref="AdminMediaGalleryEditAssetAddKeywordActionGroup" stepKey="setKeywords">
             <argument name="keyword" value="UpdatedImageDetails.keyword"/>
@@ -35,6 +35,12 @@
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
+        <actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="verifyUpdateImageOnTheGrid">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyAddedKeywords">
             <argument name="keywords" value="UpdatedImageDetails.keyword"/>
         </actionGroup>

From a8a3f56d4bf94611418690257c1afdc15dbbaa3c Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 12 Aug 2020 01:06:45 +0800
Subject: [PATCH 228/671] magento/magento2#1703: The deleted tags are not
 removed from Tags drop-down until the web page is refreshed - covered MFTF
 test

---
 .../Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml | 6 ------
 .../view/adminhtml/web/js/image/image-actions.js            | 2 +-
 .../view/adminhtml/web/js/image/image-edit.js               | 5 ++---
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
index db59369638da9..4abb819bed215 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
@@ -35,12 +35,6 @@
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
-        <actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="verifyUpdateImageOnTheGrid">
-            <argument name="image" value="UpdatedImageDetails"/>
-        </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
-            <argument name="image" value="UpdatedImageDetails"/>
-        </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyAddedKeywords">
             <argument name="keywords" value="UpdatedImageDetails.keyword"/>
         </actionGroup>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
index 3ae4fc049db4d..ea4de9e1feefa 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-actions.js
@@ -100,7 +100,7 @@ define([
                     this.closeModal();
                     this.imageModel().reloadGrid();
                     imageDetails.removeCached(imageId);
-                    imageEditDetails.removeCached(imageId, keywords);
+                    imageEditDetails.removeCached(imageId);
 
                     if (imageDetails.isActive()) {
                         imageDetails.showImageDetailsById(imageId);
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
index e142fb12aa96a..e1404a16d7125 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/image/image-edit.js
@@ -229,10 +229,9 @@ define([
          * Remove cached image details in edit form
          *
          * @param {String} id
-         * @param {String} tags
          */
-        removeCached: function (id, tags) {
-            this.images[id].tags = tags;
+        removeCached: function (id) {
+            delete this.images[id];
         }
     });
 });

From 465ed0b645b22d14643feb2ca4432458aa0387b2 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Wed, 12 Aug 2020 18:10:46 +0800
Subject: [PATCH 229/671] magento/magento2#1703: The deleted tags are not
 removed from Tags drop-down until the web page is refreshed - added verify
 removal of keyword MFTF test

---
 ...yVerifyRemovedImageKeywordsActionGroup.xml | 25 +++++++++++++++++++
 ...lleryEditAssetRemoveKeywordActionGroup.xml | 21 ++++++++++++++++
 ...EnhancedMediaGalleryEditDetailsSection.xml |  1 +
 ...ancedMediaGalleryVerifyUpdatedTagsTest.xml | 11 ++++++--
 4 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml
new file mode 100644
index 0000000000000..b94fbf369ef01
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml
@@ -0,0 +1,25 @@
+<?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="AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup">
+        <annotations>
+            <description>Verifies removed image keywords on the View Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="keywords"/>
+        </arguments>
+
+        <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.keywords}}" stepKey="grabKeywords"/>
+        <assertStringNotContainsString stepKey="verifyKeywords">
+            <actualResult type="variable">grabKeywords</actualResult>
+            <expectedResult type="string">{{keywords}}</expectedResult>
+        </assertStringNotContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml
new file mode 100644
index 0000000000000..7bba4fd637189
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="AdminMediaGalleryEditAssetRemoveKeywordActionGroup">
+        <annotations>
+            <description>Remove Keywords on the Edit Details panel</description>
+        </annotations>
+        <arguments>
+            <argument name="selectedKeywords"/>
+        </arguments>
+
+        <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.removeSelectedKeyword(selectedKeywords)}}" stepKey="removeKeyword"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
index b8e2f698ccfe8..7456db0b4d988 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
@@ -14,6 +14,7 @@
         <element name="description" type="textarea" selector="#description"/>
         <element name="newKeyword" type="input" selector="[data-ui-id='keyword']"/>
         <element name="addNewKeyword" type="input" selector="[data-ui-id='add-keyword']"/>
+        <element name="removeSelectedKeyword" type="button" selector="//span[contains(text(), '{{selectedKeywords}}')]/following-sibling::button[@data-action='remove-selected-item']" parameterized="true"/>
         <element name="cancel" type="button" selector="#image-details-action-cancel"/>
         <element name="save" type="button" selector="#image-details-action-save"/>
     </section>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
index 4abb819bed215..9571d49a88130 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
@@ -38,8 +38,15 @@
         <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyAddedKeywords">
             <argument name="keywords" value="UpdatedImageDetails.keyword"/>
         </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageKeywordsActionGroup" stepKey="verifyMetadataKeywords">
-            <argument name="keywords" value="ImageMetadata.keywords"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="updateImageDetails"/>
+        <actionGroup ref="AdminMediaGalleryEditAssetRemoveKeywordActionGroup" stepKey="removeKeywords">
+            <argument name="selectedKeywords" value="UpdatedImageDetails.keyword"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveUpdatedImage">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup" stepKey="verifyRemovedKeywords">
+            <argument name="keywords" value="UpdatedImageDetails.keyword"/>
         </actionGroup>
     </test>
 </tests>

From adb86c6ec0a0186e556f284dc1d350b2e3cce547 Mon Sep 17 00:00:00 2001
From: yolouiese <honeymay@abovethefray.io>
Date: Fri, 14 Aug 2020 20:06:50 +0800
Subject: [PATCH 230/671] magento/magento2#1703: The deleted tags are not
 removed from Tags drop-down until the web page is refreshed - added requested
 changes

---
 .../AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml  | 4 ++--
 ...edMediaGalleryAssetDetailsKeywordsAbsentActionGroup.xml} | 6 +++---
 .../Section/AdminEnhancedMediaGalleryEditDetailsSection.xml | 2 +-
 .../Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/{AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml => AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup.xml} (73%)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml
index 7bba4fd637189..b2ce726b3bd6c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryEditAssetRemoveKeywordActionGroup.xml
@@ -13,9 +13,9 @@
             <description>Remove Keywords on the Edit Details panel</description>
         </annotations>
         <arguments>
-            <argument name="selectedKeywords"/>
+            <argument name="keyword" type="string"/>
         </arguments>
 
-        <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.removeSelectedKeyword(selectedKeywords)}}" stepKey="removeKeyword"/>
+        <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.removeSelectedKeyword(keyword)}}" stepKey="removeKeyword"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup.xml
similarity index 73%
rename from app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml
rename to app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup.xml
index b94fbf369ef01..be9c7e939103d 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup.xml
@@ -8,12 +8,12 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup">
+    <actionGroup name="AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup">
         <annotations>
-            <description>Verifies removed image keywords on the View Details panel</description>
+            <description>Verifies that the passed comma-separated list of keywords are not present on the View Details panel</description>
         </annotations>
         <arguments>
-            <argument name="keywords"/>
+            <argument name="keywords" type="string"/>
         </arguments>
 
         <grabTextFrom selector="{{AdminEnhancedMediaGalleryViewDetailsSection.keywords}}" stepKey="grabKeywords"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
index 7456db0b4d988..b0bed4563003e 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
@@ -14,7 +14,7 @@
         <element name="description" type="textarea" selector="#description"/>
         <element name="newKeyword" type="input" selector="[data-ui-id='keyword']"/>
         <element name="addNewKeyword" type="input" selector="[data-ui-id='add-keyword']"/>
-        <element name="removeSelectedKeyword" type="button" selector="//span[contains(text(), '{{selectedKeywords}}')]/following-sibling::button[@data-action='remove-selected-item']" parameterized="true"/>
+        <element name="removeSelectedKeyword" type="button" selector="//span[contains(text(), '{{keyword}}')]/following-sibling::button[@data-action='remove-selected-item']" parameterized="true"/>
         <element name="cancel" type="button" selector="#image-details-action-cancel"/>
         <element name="save" type="button" selector="#image-details-action-save"/>
     </section>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
index 9571d49a88130..f47d6d9202c05 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyUpdatedTagsTest.xml
@@ -40,13 +40,13 @@
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="updateImageDetails"/>
         <actionGroup ref="AdminMediaGalleryEditAssetRemoveKeywordActionGroup" stepKey="removeKeywords">
-            <argument name="selectedKeywords" value="UpdatedImageDetails.keyword"/>
+            <argument name="keyword" value="{{UpdatedImageDetails.keyword}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveUpdatedImage">
             <argument name="image" value="UpdatedImageDetails"/>
         </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryVerifyRemovedImageKeywordsActionGroup" stepKey="verifyRemovedKeywords">
-            <argument name="keywords" value="UpdatedImageDetails.keyword"/>
+        <actionGroup ref="AssetAdminEnhancedMediaGalleryAssetDetailsKeywordsAbsentActionGroup" stepKey="verifyRemovedKeywords">
+            <argument name="keywords" value="{{UpdatedImageDetails.keyword}}"/>
         </actionGroup>
     </test>
 </tests>

From 268382f762b82a5da256accc3d50bafdc70dddbc Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 19 Aug 2020 16:15:22 +0300
Subject: [PATCH 231/671] magento/magento2#29226: [B2B] Add possibility to use
 "Login as Customer" functionality for Company Admin.

---
 .../Block/Adminhtml/ConfirmationPopup.php                    | 5 +++--
 .../view/adminhtml/web/js/not-allowed-popup.js               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
index 538ef3111fe43..646a0df296101 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Block/Adminhtml/ConfirmationPopup.php
@@ -8,9 +8,10 @@
 namespace Magento\LoginAsCustomerAdminUi\Block\Adminhtml;
 
 use Magento\Backend\Block\Template;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\LoginAsCustomerAdminUi\Ui\Customer\Component\ConfirmationPopup\Options;
+use Magento\LoginAsCustomerApi\Api\ConfigInterface;
 use Magento\Store\Ui\Component\Listing\Column\Store\Options as StoreOptions;
 
 /**
@@ -61,7 +62,7 @@ public function __construct(
         $this->storeOptions = $storeOptions;
         $this->config = $config;
         $this->json = $json;
-        $this->options = $options;
+        $this->options = $options ?? ObjectManager::getInstance()->get(Options::class);
     }
 
     /**
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
index 59d8dd4a7ed49..2e54a249c5be6 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
@@ -35,7 +35,7 @@ define([
                     modalClass: 'confirm lac-confirm',
                     buttons: [
                         {
-                            text: $t('Cancel'),
+                            text: $t('Close'),
                             class: 'action-secondary action-dismiss',
 
                             /**

From c129d31741819d1cac2919e2ec38031e802e35d7 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Wed, 19 Aug 2020 15:17:55 -0500
Subject: [PATCH 232/671] MQE-2271: Release 3.1.0 Delivery Composer +
 staticRuleset update

---
 composer.json                           |   2 +-
 composer.lock                           | 636 +++++++++++++++++++++---
 dev/tests/acceptance/staticRuleset.json |   3 +-
 3 files changed, 571 insertions(+), 70 deletions(-)

diff --git a/composer.json b/composer.json
index 25be12b5bb72f..1f91e7b8594a1 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.16.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "^3.0",
+        "magento/magento2-functional-testing-framework": "^3.1",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
diff --git a/composer.lock b/composer.lock
index c2eed9d87cc00..5b7e6c3da431a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0b51badfd1978bb34febd90226af9e27",
+    "content-hash": "b5562151b3be7e921e3ebc8080da557f",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -206,6 +206,16 @@
                 "ssl",
                 "tls"
             ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-08T08:27:21+00:00"
         },
         {
@@ -1346,12 +1356,6 @@
                 "BSD-3-Clause"
             ],
             "description": "Replace zendframework and zfcampus packages with their Laminas Project equivalents.",
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-05-20T13:45:39+00:00"
         },
         {
@@ -3319,12 +3323,6 @@
                 "laminas",
                 "zf"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-05-20T16:45:56+00:00"
         },
         {
@@ -3564,16 +3562,6 @@
                 "logging",
                 "psr-3"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-22T07:31:27+00:00"
         },
         {
@@ -4366,16 +4354,6 @@
                 "parser",
                 "validator"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-30T19:05:18+00:00"
         },
         {
@@ -7337,6 +7315,555 @@
             ],
             "time": "2020-06-27T23:57:46+00:00"
         },
+        {
+            "name": "hoa/consistency",
+            "version": "1.17.05.02",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Consistency.git",
+                "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f",
+                "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/exception": "~1.0",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "hoa/stream": "~1.0",
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Consistency\\": "."
+                },
+                "files": [
+                    "Prelude.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Consistency library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "autoloader",
+                "callable",
+                "consistency",
+                "entity",
+                "flex",
+                "keyword",
+                "library"
+            ],
+            "time": "2017-05-02T12:18:12+00:00"
+        },
+        {
+            "name": "hoa/console",
+            "version": "3.17.05.02",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Console.git",
+                "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Console/zipball/e231fd3ea70e6d773576ae78de0bdc1daf331a66",
+                "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0",
+                "hoa/exception": "~1.0",
+                "hoa/file": "~1.0",
+                "hoa/protocol": "~1.0",
+                "hoa/stream": "~1.0",
+                "hoa/ustring": "~4.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "suggest": {
+                "ext-pcntl": "To enable hoa://Event/Console/Window:resize.",
+                "hoa/dispatcher": "To use the console kit.",
+                "hoa/router": "To use the console kit."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Console\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Console library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "autocompletion",
+                "chrome",
+                "cli",
+                "console",
+                "cursor",
+                "getoption",
+                "library",
+                "option",
+                "parser",
+                "processus",
+                "readline",
+                "terminfo",
+                "tput",
+                "window"
+            ],
+            "time": "2017-05-02T12:26:19+00:00"
+        },
+        {
+            "name": "hoa/event",
+            "version": "1.17.01.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Event.git",
+                "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54",
+                "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Event\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Event library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "event",
+                "library",
+                "listener",
+                "observer"
+            ],
+            "time": "2017-01-13T15:30:50+00:00"
+        },
+        {
+            "name": "hoa/exception",
+            "version": "1.17.01.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Exception.git",
+                "reference": "091727d46420a3d7468ef0595651488bfc3a458f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f",
+                "reference": "091727d46420a3d7468ef0595651488bfc3a458f",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Exception\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Exception library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "exception",
+                "library"
+            ],
+            "time": "2017-01-16T07:53:27+00:00"
+        },
+        {
+            "name": "hoa/file",
+            "version": "1.17.07.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/File.git",
+                "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca",
+                "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0",
+                "hoa/exception": "~1.0",
+                "hoa/iterator": "~2.0",
+                "hoa/stream": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\File\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\File library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "Socket",
+                "directory",
+                "file",
+                "finder",
+                "library",
+                "link",
+                "temporary"
+            ],
+            "time": "2017-07-11T07:42:15+00:00"
+        },
+        {
+            "name": "hoa/iterator",
+            "version": "2.17.01.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Iterator.git",
+                "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc",
+                "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Iterator\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Iterator library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "iterator",
+                "library"
+            ],
+            "time": "2017-01-10T10:34:47+00:00"
+        },
+        {
+            "name": "hoa/protocol",
+            "version": "1.17.01.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Protocol.git",
+                "reference": "5c2cf972151c45f373230da170ea015deecf19e2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2",
+                "reference": "5c2cf972151c45f373230da170ea015deecf19e2",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Protocol\\": "."
+                },
+                "files": [
+                    "Wrapper.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Protocol library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "library",
+                "protocol",
+                "resource",
+                "stream",
+                "wrapper"
+            ],
+            "time": "2017-01-14T12:26:10+00:00"
+        },
+        {
+            "name": "hoa/stream",
+            "version": "1.17.02.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Stream.git",
+                "reference": "3293cfffca2de10525df51436adf88a559151d82"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82",
+                "reference": "3293cfffca2de10525df51436adf88a559151d82",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0",
+                "hoa/exception": "~1.0",
+                "hoa/protocol": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Stream\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Stream library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "Context",
+                "bucket",
+                "composite",
+                "filter",
+                "in",
+                "library",
+                "out",
+                "protocol",
+                "stream",
+                "wrapper"
+            ],
+            "time": "2017-02-21T16:01:06+00:00"
+        },
+        {
+            "name": "hoa/ustring",
+            "version": "4.17.01.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Ustring.git",
+                "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0",
+                "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "suggest": {
+                "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().",
+                "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Ustring\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Ustring library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "library",
+                "search",
+                "string",
+                "unicode"
+            ],
+            "time": "2017-01-16T07:08:25+00:00"
+        },
         {
             "name": "jms/metadata",
             "version": "1.7.0",
@@ -7709,16 +8236,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699"
+                "reference": "8a106ea029f222f4354854636861273c7577bee9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8d98efa7434a30ab9e82ef128c430ef8e3a50699",
-                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8a106ea029f222f4354854636861273c7577bee9",
+                "reference": "8a106ea029f222f4354854636861273c7577bee9",
                 "shasum": ""
             },
             "require": {
@@ -7736,6 +8263,7 @@
                 "ext-intl": "*",
                 "ext-json": "*",
                 "ext-openssl": "*",
+                "hoa/console": "~3.0",
                 "monolog/monolog": "^1.17",
                 "mustache/mustache": "~2.5",
                 "php": "^7.3",
@@ -7795,7 +8323,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-07-09T21:26:19+00:00"
+            "time": "2020-08-19T19:57:27+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -8817,20 +9345,6 @@
                 "MIT"
             ],
             "description": "PHPStan - PHP Static Analysis Tool",
-            "funding": [
-                {
-                    "url": "https://github.com/ondrejmirtes",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpstan",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-05T12:55:44+00:00"
         },
         {
@@ -9120,12 +9634,6 @@
             "keywords": [
                 "timer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-04-20T06:00:37+00:00"
         },
         {
@@ -9181,6 +9689,7 @@
                     "type": "github"
                 }
             ],
+            "abandoned": true,
             "time": "2020-06-27T06:36:25+00:00"
         },
         {
@@ -9269,16 +9778,6 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-22T13:54:05+00:00"
         },
         {
@@ -9786,6 +10285,7 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "abandoned": true,
             "time": "2020-02-08T06:07:58+00:00"
         },
         {
diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json
index 74fe3469e353b..82cc9dfe74152 100644
--- a/dev/tests/acceptance/staticRuleset.json
+++ b/dev/tests/acceptance/staticRuleset.json
@@ -2,6 +2,7 @@
     "tests": [
         "actionGroupArguments",
         "deprecatedEntityUsage",
-        "annotations"
+        "annotations",
+        "pauseActionUsage"
     ]
 }

From e9c14e2da95817a92372b927543507513aca38c1 Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Wed, 19 Aug 2020 17:24:52 +0300
Subject: [PATCH 233/671] Revert "Add validation phone field on checkout page"

---
 .../Block/Checkout/LayoutProcessor.php        |  3 --
 ...rontOnePageCheckoutPhoneValidationTest.xml | 44 -------------------
 .../frontend/layout/checkout_index_index.xml  |  3 --
 .../Customer/Test/Mftf/Data/AddressData.xml   |  8 ++--
 4 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml

diff --git a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
index 4c84ea5ae764f..16450ec6ff2c2 100644
--- a/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
+++ b/app/code/Magento/Checkout/Block/Checkout/LayoutProcessor.php
@@ -351,9 +351,6 @@ private function getBillingAddressComponent($paymentCode, $elements)
                                 ],
                             ],
                             'telephone' => [
-                                'validation' => [
-                                    'validate-phoneStrict' => 0,
-                                ],
                                 'config' => [
                                     'tooltip' => [
                                         'description' => __('For delivery questions.'),
diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
deleted file mode 100644
index b001128fee906..0000000000000
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontOnePageCheckoutPhoneValidationTest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontOnePageCheckoutPhoneValidationTest">
-        <annotations>
-            <features value="Checkout"/>
-            <stories value="Checkout validation phone field"/>
-            <title value="Validate phone field on checkout page"/>
-            <description value="Validate phone field on checkout page, field must not contain alphabetical symbols"/>
-            <severity value="MAJOR" />
-            <testCaseId value="MC-35292"/>
-        </annotations>
-        <before>
-            <createData entity="_defaultCategory" stepKey="createCategory"/>
-            <createData entity="ApiSimpleProduct" stepKey="createProduct">
-                <requiredEntity createDataKey="createCategory"/>
-            </createData>
-        </before>
-        <after>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
-        </after>
-
-        <actionGroup ref="StorefrontNavigateCategoryPageActionGroup" stepKey="openCategoryPageOnFrontend">
-            <argument name="category" value="$createCategory$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontAddSimpleProductToCartActionGroup" stepKey="addToCartFromStorefrontProductPage">
-            <argument name="product" value="$$createProduct$$"/>
-        </actionGroup>
-
-        <actionGroup ref="StorefrontOpenCheckoutPageActionGroup" stepKey="guestGoToCheckout"/>
-
-        <fillField userInput="Sample text" selector="{{CheckoutShippingSection.telephone}}" stepKey="enterAlphabeticalSymbols"/>
-        <see userInput="Please enter a valid phone number. For example (123) 456-7890 or 123-456-7890." selector="{{CheckoutShippingSection.addressFieldValidationError}}" stepKey="checkPhoneFieldValidationIsPassed"/>
-    </test>
-</tests>
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index f087c04d1dfe3..289200b83dc2b 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -223,9 +223,6 @@
                                                                         </item>
                                                                     </item>
                                                                     <item name="telephone" xsi:type="array">
-                                                                        <item name="validation" xsi:type="array">
-                                                                            <item name="validate-phoneStrict" xsi:type="number">0</item>
-                                                                        </item>
                                                                         <item name="config" xsi:type="array">
                                                                             <item name="tooltip" xsi:type="array">
                                                                                 <item name="description" xsi:type="string" translate="true">For delivery questions.</item>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index 695fc138e592b..e31be78185aaf 100644
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -19,7 +19,7 @@
             <item>Bld D</item>
         </array>
         <data key="company">Magento</data>
-        <data key="telephone">123-456-7890</data>
+        <data key="telephone">1234568910</data>
         <data key="fax">1234568910</data>
         <data key="postcode">78729</data>
         <data key="city">Austin</data>
@@ -172,7 +172,7 @@
         <data key="city">London</data>
         <data key="postcode">SE1 7RW</data>
         <data key="country_id">GB</data>
-        <data key="telephone">444-444-4444</data>
+        <data key="telephone">444-44-444-44</data>
     </entity>
     <entity name="US_Address_Utah" type="address">
         <data key="firstname">John</data>
@@ -227,7 +227,7 @@
         <data key="firstname">John</data>
         <data key="lastname">Doe</data>
         <data key="company">Magento</data>
-        <data key="telephone">888-777-7890</data>
+        <data key="telephone">0123456789-02134567</data>
         <array key="street">
             <item>172, Westminster Bridge Rd</item>
             <item>7700 xyz street</item>
@@ -305,7 +305,7 @@
         <data key="firstname">Jane</data>
         <data key="lastname">Miller</data>
         <data key="company">Magento</data>
-        <data key="telephone">123-456-7899</data>
+        <data key="telephone">44 20 7123 1234</data>
         <array key="street">
             <item>1 London Bridge Street</item>
         </array>

From 8d427e919f2a7ed66a52b4f9721fc9874f445010 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Wed, 19 Aug 2020 16:07:13 -0500
Subject: [PATCH 234/671] MC-34841: [GraphQL] Free Payment is returned on
 Address change (No Tax state to Tax enabled state )

---
 app/code/Magento/Payment/Model/Method/Free.php               | 2 +-
 app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Payment/Model/Method/Free.php b/app/code/Magento/Payment/Model/Method/Free.php
index a02fa4b18d5e1..1df2f942c885a 100644
--- a/app/code/Magento/Payment/Model/Method/Free.php
+++ b/app/code/Magento/Payment/Model/Method/Free.php
@@ -103,7 +103,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
         return parent::isAvailable(
             $quote
         ) && null !== $quote && $this->priceCurrency->round(
-            $quote->getGrandTotal()
+            $quote->collectTotals()->getGrandTotal()
         ) == 0;
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
index 9fc69a87c5303..4e643f313de18 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
@@ -99,6 +99,9 @@ public function testIsAvailable($grandTotal, $isActive, $notEmptyQuote, $result)
         $quote = null;
         if ($notEmptyQuote) {
             $quote = $this->createMock(Quote::class);
+            $quote->expects($this->once())
+                ->method('collectTotals')
+                ->willReturn($quote);
             $quote->expects($this->any())
                 ->method('__call')
                 ->with('getGrandTotal')

From b532d4e46dd6eaa21ffdc94e67e27afd404b4ec7 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 20 Aug 2020 12:49:35 +0300
Subject: [PATCH 235/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - MFTF tests fix.

---
 ...romCustomerPageManualChooseActionGroup.xml |  6 ++---
 ...oginAsCustomerConfirmationModalSection.xml |  2 +-
 ...CustomerManualChooseStoreCodeInUrlTest.xml |  4 +--
 .../AdminLoginAsCustomerManualChooseTest.xml  | 25 +++++++++++++------
 ...sCustomerSeeSpecialPriceOnCategoryTest.xml |  3 ---
 5 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
index 44ef227a34257..dc953061ca433 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
@@ -14,15 +14,15 @@
         </annotations>
         <arguments>
             <argument name="customerId" type="string"/>
-            <argument name="storeViewName" type="string" defaultValue="default"/>
+            <argument name="storeName" type="string" defaultValue="default"/>
         </arguments>
 
         <amOnPage url="{{AdminEditCustomerPage.url(customerId)}}" stepKey="gotoCustomerPage"/>
         <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminCustomerMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store" stepKey="seeModal"/>
-         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
-        <selectOption selector="{{AdminLoginAsCustomerConfirmationModalSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
+        <selectOption selector="{{AdminLoginAsCustomerConfirmationModalSection.store}}" userInput="{{storeName}}" stepKey="selectStore"/>
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
         <switchToNextTab stepKey="switchToNewTab"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
index f400ba02a5392..96a9ed6a77f90 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
@@ -9,6 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminLoginAsCustomerConfirmationModalSection">
-        <element name="storeView" type="select" selector="//select[@id='lac-confirmation-popup-store-id']"/>
+        <element name="store" type="select" selector="//select[@id='lac-confirmation-popup-store-id']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
index bd61b359f5bf6..4f888e33ac801 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
@@ -29,8 +29,8 @@
                 command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}"
                 stepKey="disableAddStoreCodeToUrls" after="enableLoginAsCustomerAutoDetection"/>
         </after>
-        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeCustomStoreCodeInUrl" after="assertCustomStoreView">
-            <argument name="storeCode" value="{{customStore.code}}"/>
+        <actionGroup ref="AssertStorefrontStoreCodeInUrlActionGroup" stepKey="seeCustomStoreViewCodeInUrl" after="assertCustomStoreView">
+            <argument name="storeCode" value="{{customStoreEN.code}}"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index 4853d4d69382f..5f706a814eb71 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -18,9 +18,6 @@
                 value="Verify admin user can directly login into customer account to Custom store view when Store View To Login In = Manual Choose"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
-            <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/issues/58"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
@@ -30,11 +27,23 @@
                         stepKey="enableLoginAsCustomerManualChoose"/>
             <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView"/>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createCustomStore">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstCustomStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondCustomStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
         </before>
         <after>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteCustomStoreView">
-                <argument name="customStore" value="customStore"/>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStoreGroup.name"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
@@ -49,7 +58,7 @@
         <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup"
                      stepKey="loginAsCustomerFromCustomerPage">
             <argument name="customerId" value="$$createCustomer.id$$"/>
-            <argument name="storeViewName" value="{{customStore.name}}"/>
+            <argument name="storeName" value="{{customStoreGroup.name}}"/>
         </actionGroup>
 
         <!-- Assert Customer logged on on custom store view -->
@@ -58,7 +67,7 @@
             <argument name="customerEmail" value="$$createCustomer.email$$"/>
         </actionGroup>
         <actionGroup ref="StorefrontAssertCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
-            <argument name="storeViewName" value="{{customStore.name}}"/>
+            <argument name="storeViewName" value="{{customStoreEN.name}}"/>
         </actionGroup>
 
         <!-- Log out Customer and close tab -->
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
index 3e70da8f8158d..c0d7d26816fa2 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/StorefrontLoginAsCustomerSeeSpecialPriceOnCategoryTest.xml
@@ -16,9 +16,6 @@
             <description value="Login as customer sees special prices on category"/>
             <severity value="CRITICAL"/>
             <group value="login_as_customer"/>
-            <skip>
-                <issueId value="https://github.com/magento/magento2-login-as-customer/pull/193"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"

From 520e8abf8a31b05cfd57da7c08539161466b7fad Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 20 Aug 2020 16:55:02 +0300
Subject: [PATCH 236/671] magento/magento2-login-as-customer#58: If multiple
 stores exist under a specific website, user is logged into the default
 website for that store - pop-up options update.

---
 .../Component/ConfirmationPopup/Options.php        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index c11337bbc5fe8..4ec2bed41c799 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -124,9 +124,10 @@ private function generateCurrentOptions(int $customerId): array
             foreach ($websiteCollection as $website) {
                 $groups = $this->fillStoreGroupOptions($website, $customer);
                 if (!empty($groups)) {
+                    $code = $website->getCode();
                     $name = $this->sanitizeName($website->getName());
-                    $options[$name]['label'] = $name;
-                    $options[$name]['value'] = array_values($groups);
+                    $options[$code]['label'] = $name;
+                    $options[$code]['value'] = $groups;
                 }
             }
         }
@@ -154,11 +155,12 @@ private function fillStoreGroupOptions(Website $website, CustomerInterface $cust
             if ($group->getWebsiteId() == $websiteId) {
                 $storeViewIds = $group->getStoreIds();
                 if (!empty($storeViewIds)) {
+                    $code = $group->getCode();
                     $name = $this->sanitizeName($group->getName());
-                    $groups[$name]['label'] = str_repeat(' ', 4) . $name;
-                    $groups[$name]['value'] = array_values($storeViewIds)[0];
-                    $groups[$name]['disabled'] = !$isGlobalScope && $customerWebsiteId !== $websiteId;
-                    $groups[$name]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
+                    $groups[$code]['label'] = str_repeat(' ', 4) . $name;
+                    $groups[$code]['value'] = array_values($storeViewIds)[0];
+                    $groups[$code]['disabled'] = !$isGlobalScope && $customerWebsiteId !== $websiteId;
+                    $groups[$code]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
                 }
             }
         }

From 568385f9e35ce4bc4b2580e67eb69eba83ccdfdf Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 20 Aug 2020 10:28:30 +0300
Subject: [PATCH 237/671] improve test

---
 .../Customer/Controller/AccountTest.php       | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
index c2e55029cab13..5527a39ce0507 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php
@@ -22,15 +22,17 @@
 use Magento\Store\Model\StoreManager;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
 use Magento\TestFramework\Mail\Template\TransportBuilderMock;
 use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
 use Magento\Theme\Controller\Result\MessagePlugin;
 use PHPUnit\Framework\Constraint\StringContains;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AccountTest extends \Magento\TestFramework\TestCase\AbstractController
+class AccountTest extends AbstractController
 {
     /**
      * @var TransportBuilderMock
@@ -54,9 +56,8 @@ protected function setUp(): void
      */
     protected function login($customerId)
     {
-        /** @var \Magento\Customer\Model\Session $session */
-        $session = Bootstrap::getObjectManager()
-            ->get(\Magento\Customer\Model\Session::class);
+        /** @var Session $session */
+        $session = Bootstrap::getObjectManager()->get(Session::class);
         $session->loginById($customerId);
     }
 
@@ -148,8 +149,8 @@ public function testCreatepasswordActionWithSession()
         $customer->setData('confirmation', 'confirmation');
         $customer->save();
 
-        /** @var \Magento\Customer\Model\Session $customer */
-        $session = Bootstrap::getObjectManager()->get(\Magento\Customer\Model\Session::class);
+        /** @var Session $customer */
+        $session = Bootstrap::getObjectManager()->get(Session::class);
         $session->setRpToken($token);
         $session->setRpCustomerId($customer->getId());
 
@@ -404,18 +405,16 @@ public function testEditAction()
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode(), $body);
         $this->assertStringContainsString('<div class="field field-name-firstname required">', $body);
         // Verify the password check box is not checked
-        $expectedString = <<<EXPECTED_HTML
-<input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1"
-                   title="Change&#x20;Password"
-                 class="checkbox" />
-EXPECTED_HTML;
-        $this->assertStringContainsString($expectedString, $body);
+        $checkboxXpath = '//input[@type="checkbox"][@name="change_password"][@id="change-password"][not (@checked)]' .
+            '[@data-role="change-password"][@value="1"][@title="Change Password"][@class="checkbox"]';
+
+        $this->assertEquals(1, Xpath::getElementsCountForXpath($checkboxXpath, $body));
     }
 
     /**
      * @magentoDataFixture Magento/Customer/_files/customer.php
      */
-    public function testChangePasswordEditAction()
+    public function testChangePasswordEditAction(): void
     {
         $this->login(1);
 
@@ -425,12 +424,11 @@ public function testChangePasswordEditAction()
         $this->assertEquals(200, $this->getResponse()->getHttpResponseCode(), $body);
         $this->assertStringContainsString('<div class="field field-name-firstname required">', $body);
         // Verify the password check box is checked
-        $expectedString = <<<EXPECTED_HTML
-<input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1"
-                   title="Change&#x20;Password"
-                 checked="checked" class="checkbox" />
-EXPECTED_HTML;
-        $this->assertStringContainsString($expectedString, $body);
+        $checkboxXpath = '//input[@type="checkbox"][@name="change_password"][@id="change-password"]' .
+            '[@data-role="change-password"][@value="1"][@title="Change Password"][@checked="checked"]' .
+            '[@class="checkbox"]';
+
+        $this->assertEquals(1, Xpath::getElementsCountForXpath($checkboxXpath, $body));
     }
 
     /**

From f610c71350428f01c7de1b49b245dfa45e6a5c74 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 20 Aug 2020 13:47:09 -0500
Subject: [PATCH 238/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - added store config and modified schema

---
 .../Magento/WishlistGraphQl/etc/graphql/di.xml  | 17 +++++++++++++++++
 .../Magento/WishlistGraphQl/etc/schema.graphqls | 12 ++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/WishlistGraphQl/etc/graphql/di.xml

diff --git a/app/code/Magento/WishlistGraphQl/etc/graphql/di.xml b/app/code/Magento/WishlistGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..4d4ce9458fb6c
--- /dev/null
+++ b/app/code/Magento/WishlistGraphQl/etc/graphql/di.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="magento_wishlist_general_is_enabled" xsi:type="string">wishlist/general/active</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 430e77cc45e96..5fc7ef33f3e22 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -40,8 +40,8 @@ type Mutation {
 }
 
 input WishlistItemInput @doc(description: "Defines the items to add to a wish list") {
-    sku: String @doc(description: "The SKU of the product to add. For complex product types, specify the child product SKU")
-    quantity: Float @doc(description: "The amount or number of items to add")
+    sku: String! @doc(description: "The SKU of the product to add. For complex product types, specify the child product SKU")
+    quantity: Float! @doc(description: "The amount or number of items to add")
     parent_sku: String @doc(description: "For complex product types, the SKU of the parent product")
     selected_options: [ID!] @doc(description: "An array of strings corresponding to options the customer selected")
     entered_options: [EnteredOptionInput!] @doc(description: "An array of options that the customer entered")
@@ -58,8 +58,8 @@ type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's
 }
 
 input WishlistItemUpdateInput @doc(description: "Defines updates to items in a wish list") {
-    wishlist_item_id: ID @doc(description: "The ID of the wishlist item to update")
-    quantity: Float @doc(description: "The new amount or number of this item")
+    wishlist_item_id: ID! @doc(description: "The ID of the wishlist item to update")
+    quantity: Float! @doc(description: "The new amount or number of this item")
     description: String @doc(description: "Describes the update")
     selected_options: [ID!] @doc(description: "An array of strings corresponding to options the customer selected")
     entered_options: [EnteredOptionInput!] @doc(description: "An array of options that the customer entered")
@@ -79,3 +79,7 @@ enum WishListUserInputErrorType {
     PRODUCT_NOT_FOUND
     UNDEFINED
 }
+
+type StoreConfig {
+    magento_wishlist_general_is_enabled: String @doc(description: "Wishlist functionality status: enabled/disabled")
+}

From e55b271e2acbf933e91b560ce007fd9de2b5992e Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 20 Aug 2020 14:33:48 -0500
Subject: [PATCH 239/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - description change

---
 app/code/Magento/WishlistGraphQl/etc/schema.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 5fc7ef33f3e22..31bf32fa5ebcf 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -81,5 +81,5 @@ enum WishListUserInputErrorType {
 }
 
 type StoreConfig {
-    magento_wishlist_general_is_enabled: String @doc(description: "Wishlist functionality status: enabled/disabled")
+    magento_wishlist_general_is_enabled: String @doc(description: "Indicates whether wishlists are enabled (1) or disabled (0)")
 }

From eb8b56531f1b2af7e3c49660ffe2d1cc122f855d Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Thu, 20 Aug 2020 17:24:25 -0500
Subject: [PATCH 240/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - Added fix for erroring out on no quantity

---
 .../Model/Resolver/UpdateProductsInWishlist.php          | 9 +++++++--
 app/code/Magento/WishlistGraphQl/etc/schema.graphqls     | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index c6ede66fc2b1b..53c4e26d26124 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -101,7 +101,7 @@ public function resolve(
         }
 
         $wishlistItems = $args['wishlistItems'];
-        $wishlistItems = $this->getWishlistItems($wishlistItems);
+        $wishlistItems = $this->getWishlistItems($wishlistItems, $wishlist);
         $wishlistOutput = $this->updateProductsInWishlist->execute($wishlist, $wishlistItems);
 
         if (count($wishlistOutput->getErrors()) !== count($wishlistItems)) {
@@ -126,14 +126,19 @@ function (Error $error) {
      * Get DTO wishlist items
      *
      * @param array $wishlistItemsData
+     * @param Wishlist $wishlist
      *
      * @return array
      */
-    private function getWishlistItems(array $wishlistItemsData): array
+    private function getWishlistItems(array $wishlistItemsData, Wishlist $wishlist): array
     {
         $wishlistItems = [];
 
         foreach ($wishlistItemsData as $wishlistItemData) {
+            if (!isset($wishlistItemData['quantity'])) {
+                $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
+                $wishlistItemData['quantity'] = (float) $wishlistItem->getQty();
+            }
             $wishlistItems[] = (new WishlistItemFactory())->create($wishlistItemData);
         }
 
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index 31bf32fa5ebcf..bf46b269e6421 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -59,7 +59,7 @@ type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's
 
 input WishlistItemUpdateInput @doc(description: "Defines updates to items in a wish list") {
     wishlist_item_id: ID! @doc(description: "The ID of the wishlist item to update")
-    quantity: Float! @doc(description: "The new amount or number of this item")
+    quantity: Float @doc(description: "The new amount or number of this item")
     description: String @doc(description: "Describes the update")
     selected_options: [ID!] @doc(description: "An array of strings corresponding to options the customer selected")
     entered_options: [EnteredOptionInput!] @doc(description: "An array of options that the customer entered")

From 11619df5f58fe65c9d8b81ec61d1e7e5ce4b2a50 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 20 Aug 2020 18:38:07 -0500
Subject: [PATCH 241/671] MC-36838: Cannot checkout with automatic customer
 group assignment

---
 .../Frontend/Quote/Address/CollectTotalsObserver.php        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index a1228903e2323..ccac95b3c0401 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -135,8 +135,10 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             $address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
             $quote->setCustomerGroupId($groupId);
             $this->customerSession->setCustomerGroupId($groupId);
-            $customer->setGroupId($groupId);
-            $quote->setCustomer($customer);
+            if ($customer->getId() !== null) {
+                $customer->setGroupId($groupId);
+                $quote->setCustomer($customer);
+            }
         }
     }
 }

From ed29f16c821bfeb62620c0bbd276d36ec5b08556 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 20 Aug 2020 20:31:59 -0500
Subject: [PATCH 242/671] MC-36838: Cannot checkout with automatic customer
 group assignment

---
 .../GraphQl/Quote/Guest/PlaceOrderTest.php    | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
index f1aa4f02a6922..72d35fdd51b96 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/PlaceOrderTest.php
@@ -7,7 +7,7 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Exception;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Registry;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -56,7 +56,10 @@ protected function setUp(): void
         $this->orderCollectionFactory = $objectManager->get(CollectionFactory::class);
         $this->orderRepository = $objectManager->get(OrderRepositoryInterface::class);
         $this->orderFactory = $objectManager->get(OrderFactory::class);
-        $this->registry = Bootstrap::getObjectManager()->get(Registry::class);
+        $this->registry = $objectManager->get(Registry::class);
+        /** @var ScopeConfigInterface $scopeConfig */
+        $scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+        $scopeConfig->clean();
     }
 
     /**
@@ -68,6 +71,7 @@ protected function setUp(): void
      * @magentoConfigFixture default_store payment/cashondelivery/active 1
      * @magentoConfigFixture default_store payment/checkmo/active 1
      * @magentoConfigFixture default_store payment/purchaseorder/active 1
+     * @magentoConfigFixture default_store customer/create_account/auto_group_assign 0
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
@@ -94,6 +98,42 @@ public function testPlaceOrder()
     }
 
     /**
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoConfigFixture default_store carriers/flatrate/active 1
+     * @magentoConfigFixture default_store carriers/tablerate/active 1
+     * @magentoConfigFixture default_store carriers/freeshipping/active 1
+     * @magentoConfigFixture default_store payment/banktransfer/active 1
+     * @magentoConfigFixture default_store payment/cashondelivery/active 1
+     * @magentoConfigFixture default_store payment/checkmo/active 1
+     * @magentoConfigFixture default_store payment/purchaseorder/active 1
+     * @magentoConfigFixture default_store customer/create_account/auto_group_assign 1
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/set_guest_email.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_billing_address.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_flatrate_shipping_method.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_checkmo_payment_method.php
+     */
+    public function testPlaceOrderWithAutoGroup()
+    {
+        $reservedOrderId = 'test_quote';
+        $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute($reservedOrderId);
+
+        $query = $this->getQuery($maskedQuoteId);
+        $response = $this->graphQlMutation($query);
+
+        self::assertArrayHasKey('placeOrder', $response);
+        self::assertArrayHasKey('order_number', $response['placeOrder']['order']);
+        self::assertEquals($reservedOrderId, $response['placeOrder']['order']['order_number']);
+        $orderIncrementId = $response['placeOrder']['order']['order_number'];
+        $order = $this->orderFactory->create();
+        $order->loadByIncrementId($orderIncrementId);
+        $this->assertNotEmpty($order->getEmailSent());
+    }
+
+    /**
+     * @magentoConfigFixture default_store customer/create_account/auto_group_assign 0
      */
     public function testPlaceOrderIfCartIdIsEmpty()
     {
@@ -115,6 +155,7 @@ public function testPlaceOrderIfCartIdIsEmpty()
      * @magentoConfigFixture default_store payment/cashondelivery/active 1
      * @magentoConfigFixture default_store payment/checkmo/active 1
      * @magentoConfigFixture default_store payment/purchaseorder/active 1
+     * @magentoConfigFixture default_store customer/create_account/auto_group_assign 0
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/guest/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php
@@ -268,6 +309,7 @@ public function testPlaceOrderWithOutOfStockProduct()
      * @magentoConfigFixture default_store payment/cashondelivery/active 1
      * @magentoConfigFixture default_store payment/checkmo/active 1
      * @magentoConfigFixture default_store payment/purchaseorder/active 1
+     * @magentoConfigFixture default_store customer/create_account/auto_group_assign 0
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
      * @magentoApiDataFixture Magento/GraphQl/Quote/_files/set_new_shipping_address.php

From 814396fd3ae8647a03abbbeca169b85b5d02de40 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 20 Aug 2020 22:15:52 -0500
Subject: [PATCH 243/671] MC-36838: Cannot checkout with automatic customer
 group assignment

---
 .../Frontend/Quote/Address/CollectTotalsObserverTest.php     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index 1920b088b1c0e..d5cef5896c335 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -269,7 +269,7 @@ public function testDispatchWithDefaultCustomerGroupId()
         $this->quoteMock->expects($this->once())
             ->method('getCustomerGroupId')
             ->willReturn('customerGroupId');
-        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
+        $this->customerMock->expects($this->exactly(2))->method('getId')->willReturn('1');
         $this->groupManagementMock->expects($this->once())
             ->method('getDefaultGroup')
             ->willReturn($this->groupInterfaceMock);
@@ -329,6 +329,7 @@ public function testDispatchWithCustomerCountryInEU()
             ->method('setPrevQuoteCustomerGroupId')
             ->with('customerGroupId');
 
+        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
         $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
         $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
         $this->customerDataFactoryMock->expects($this->any())
@@ -436,6 +437,8 @@ public function testDispatchWithEmptyShippingAddress()
             ->method('setPrevQuoteCustomerGroupId')
             ->with('customerGroupId');
 
+        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
+
         $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
         $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
         $this->customerDataFactoryMock->expects($this->any())

From f52921e5adc0c99e2f5658642ad828f2bb7a5d8a Mon Sep 17 00:00:00 2001
From: Valerii Naida <vnayda@adobe.com>
Date: Fri, 21 Aug 2020 09:24:30 -0500
Subject: [PATCH 244/671] magento2/issues/29687: Revert @api annotation in
 Magento\LoginAsCustomerAssistance\Block\Adminhtml\NotAllowedPopup

---
 .../Model/ResourceModel/SaveAuthenticationData.php              | 2 +-
 .../Block/Adminhtml/NotAllowedPopup.php                         | 2 --
 .../Magento/Test/Integrity/_files/whitelist/public_code.txt     | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/_files/whitelist/public_code.txt

diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
index 23d707d151487..10d110c8ddf0b 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
@@ -41,10 +41,10 @@ class SaveAuthenticationData implements SaveAuthenticationDataInterface
     private $random;
 
     /**
-     * @param EncryptorInterface $encryptor
      * @param ResourceConnection $resourceConnection
      * @param DateTime $dateTime
      * @param Random $random
+     * @param EncryptorInterface $encryptor
      */
     public function __construct(
         ResourceConnection $resourceConnection,
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index 547be1de5a008..f0f4eba026733 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -13,8 +13,6 @@
 
 /**
  * Pop-up for Login as Customer button then Login as Customer is not allowed.
- *
- * @api
  */
 class NotAllowedPopup extends Template
 {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/whitelist/public_code.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/whitelist/public_code.txt
new file mode 100644
index 0000000000000..e48bfda936545
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/whitelist/public_code.txt
@@ -0,0 +1 @@
+Magento\LoginAsCustomerAssistance\Block\Adminhtml\NotAllowedPopup

From 0ce373e9d2c859ef64de040ee62756a3f0ad6a05 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Fri, 21 Aug 2020 12:31:30 -0500
Subject: [PATCH 245/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - Added validation for quantity ,description fix
 and schema description update,

---
 .../Wishlist/Model/Wishlist/UpdateProductsInWishlist.php      | 3 +++
 .../Model/Resolver/UpdateProductsInWishlist.php               | 4 ++++
 app/code/Magento/WishlistGraphQl/etc/schema.graphqls          | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
index 4abcada138362..4455b118e7a5e 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
@@ -95,6 +95,9 @@ private function updateItemInWishlist(Wishlist $wishlist, WishlistItemData $wish
             $wishlistItem = $this->wishlistItemFactory->create();
             $this->wishlistItemResource->load($wishlistItem, $wishlistItemData->getId());
             $wishlistItem->setDescription($wishlistItemData->getDescription());
+            if ($wishlistItemData->getQuantity() == 0) {
+                throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
+            }
             $resultItem = $wishlist->updateItem($wishlistItem, $options);
 
             if (is_string($resultItem)) {
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index 53c4e26d26124..1d0d7f8b61dc0 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -139,6 +139,10 @@ private function getWishlistItems(array $wishlistItemsData, Wishlist $wishlist):
                 $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
                 $wishlistItemData['quantity'] = (float) $wishlistItem->getQty();
             }
+            if (!isset($wishlistItemData['description'])) {
+                $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
+                $wishlistItemData['description'] = $wishlistItem->getDescription();
+            }
             $wishlistItems[] = (new WishlistItemFactory())->create($wishlistItemData);
         }
 
diff --git a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
index bf46b269e6421..2992f851cf328 100644
--- a/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/WishlistGraphQl/etc/schema.graphqls
@@ -60,7 +60,7 @@ type RemoveProductsFromWishlistOutput @doc(description: "Contains the customer's
 input WishlistItemUpdateInput @doc(description: "Defines updates to items in a wish list") {
     wishlist_item_id: ID! @doc(description: "The ID of the wishlist item to update")
     quantity: Float @doc(description: "The new amount or number of this item")
-    description: String @doc(description: "Describes the update")
+    description: String @doc(description: "Customer-entered comments about the item")
     selected_options: [ID!] @doc(description: "An array of strings corresponding to options the customer selected")
     entered_options: [EnteredOptionInput!] @doc(description: "An array of options that the customer entered")
 }

From 250e3d9f58fd2ab4ae753f6ecd75dee2e1af17e9 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 21 Aug 2020 19:56:41 -0500
Subject: [PATCH 246/671] MC-34841: free-payment

---
 app/code/Magento/Payment/Model/Method/Free.php       |  2 +-
 .../Payment/Test/Unit/Model/Method/FreeTest.php      |  3 ---
 .../Model/Cart/SetShippingAddressesOnCart.php        | 12 +++++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Payment/Model/Method/Free.php b/app/code/Magento/Payment/Model/Method/Free.php
index 1df2f942c885a..a02fa4b18d5e1 100644
--- a/app/code/Magento/Payment/Model/Method/Free.php
+++ b/app/code/Magento/Payment/Model/Method/Free.php
@@ -103,7 +103,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
         return parent::isAvailable(
             $quote
         ) && null !== $quote && $this->priceCurrency->round(
-            $quote->collectTotals()->getGrandTotal()
+            $quote->getGrandTotal()
         ) == 0;
     }
 
diff --git a/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php b/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
index 4e643f313de18..9fc69a87c5303 100644
--- a/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
+++ b/app/code/Magento/Payment/Test/Unit/Model/Method/FreeTest.php
@@ -99,9 +99,6 @@ public function testIsAvailable($grandTotal, $isActive, $notEmptyQuote, $result)
         $quote = null;
         if ($notEmptyQuote) {
             $quote = $this->createMock(Quote::class);
-            $quote->expects($this->once())
-                ->method('collectTotals')
-                ->willReturn($quote);
             $quote->expects($this->any())
                 ->method('__call')
                 ->with('getGrandTotal')
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index e959c19a7cbe4..644c0569cc195 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -10,6 +10,7 @@
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteRepository;
 
 /**
  * Set single shipping address for a specified shopping cart
@@ -26,16 +27,23 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
      */
     private $getShippingAddress;
 
+    /**
+     * @var QuoteRepository
+     */
+    private $quoteRepository;
+
     /**
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      * @param GetShippingAddress $getShippingAddress
      */
     public function __construct(
         AssignShippingAddressToCart $assignShippingAddressToCart,
-        GetShippingAddress $getShippingAddress
+        GetShippingAddress $getShippingAddress,
+        QuoteRepository $quoteRepository
     ) {
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
         $this->getShippingAddress = $getShippingAddress;
+        $this->quoteRepository = $quoteRepository;
     }
 
     /**
@@ -70,5 +78,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
             throw $e;
         }
         $this->assignShippingAddressToCart->execute($cart, $shippingAddress);
+        // trigger quote re-evaluation after address change
+        $this->quoteRepository->save($cart);
     }
 }

From 97ed9c404be74f986619605e84146d4d554581e5 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 21 Aug 2020 23:24:25 -0500
Subject: [PATCH 247/671] MC-34841: free-payment

---
 .../QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index 644c0569cc195..0f350be78a945 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -35,6 +35,7 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
     /**
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      * @param GetShippingAddress $getShippingAddress
+     * @param QuoteRepository $quoteRepository
      */
     public function __construct(
         AssignShippingAddressToCart $assignShippingAddressToCart,

From 73760de6f54c4d0976b09c44567a3b79853fb42e Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Sun, 23 Aug 2020 17:03:21 -0500
Subject: [PATCH 248/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - Added validation for quantity in add products wo
 wishlist mutation

---
 .../Wishlist/Model/Wishlist/AddProductsToWishlist.php     | 3 +++
 .../Model/Resolver/UpdateProductsInWishlist.php           | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
index 7acfb503a5ad0..c8eb98b938573 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
@@ -113,6 +113,9 @@ private function addItemToWishlist(Wishlist $wishlist, WishlistItem $wishlistIte
         }
 
         try {
+            if ($wishlistItem->getQuantity() == 0) {
+                throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
+            }
             $options = $this->buyRequestBuilder->build($wishlistItem, (int) $product->getId());
             $result = $wishlist->addNewItem($product, $options);
 
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index 1d0d7f8b61dc0..d9e431223b642 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -137,11 +137,15 @@ private function getWishlistItems(array $wishlistItemsData, Wishlist $wishlist):
         foreach ($wishlistItemsData as $wishlistItemData) {
             if (!isset($wishlistItemData['quantity'])) {
                 $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
-                $wishlistItemData['quantity'] = (float) $wishlistItem->getQty();
+                if (isset($wishlistItem)) {
+                    $wishlistItemData['quantity'] = (float) $wishlistItem->getQty();
+                }
             }
             if (!isset($wishlistItemData['description'])) {
                 $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
-                $wishlistItemData['description'] = $wishlistItem->getDescription();
+                if (isset($wishlistItem)) {
+                    $wishlistItemData['description'] = $wishlistItem->getDescription();
+                }
             }
             $wishlistItems[] = (new WishlistItemFactory())->create($wishlistItemData);
         }

From 482357d0fdbb62a5f2572131a46392cd5a175ab4 Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Sun, 23 Aug 2020 22:53:12 -0500
Subject: [PATCH 249/671] MC-36897: [GraphQl] Issues with updating wishlist
 quantity. Adding Recommended Store config changes

- added tests to cover bugs
---
 .../UpdateProductsFromWishlistTest.php        | 96 +++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
index 9a9cd424e54ca..900ae1ce16441 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
@@ -57,6 +57,57 @@ public function testUpdateSimpleProductFromWishlist(): void
         self::assertEquals($description, $wishlistResponse['items'][0]['description']);
     }
 
+    /**
+     * update the wishlist by setting an qty = 0
+     *
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Wishlist/_files/wishlist_with_simple_product.php
+     */
+    public function testUpdateProductInWishlistWithZeroQty()
+    {
+        $wishlist = $this->getWishlist();
+        $wishlistId = $wishlist['customer']['wishlist']['id'];
+        $wishlistItem = $wishlist['customer']['wishlist']['items'][0];
+        $qty = 0;
+        $description = 'Description for zero quantity';
+        $updateWishlistQuery = $this->getQuery((int) $wishlistId, (int) $wishlistItem['id'], $qty, $description);
+        $response = $this->graphQlMutation($updateWishlistQuery, [], '', $this->getHeaderMap());
+        self::assertEquals(1, $response['updateProductsInWishlist']['wishlist']['items_count']);
+        self::assertNotEmpty($response['updateProductsInWishlist']['wishlist']['items'], 'empty wish list items');
+        self::assertCount(1, $response['updateProductsInWishlist']['wishlist']['items']);
+        self::assertArrayHasKey('user_errors', $response['updateProductsInWishlist']);
+        self::assertCount(1, $response['updateProductsInWishlist']['user_errors']);
+        $message = 'The quantity of a wish list item cannot be 0';
+        self::assertEquals(
+            $message,
+            $response['updateProductsInWishlist']['user_errors'][0]['message']
+        );
+    }
+
+    /**
+     * update the wishlist by setting qty to a valid value and no description
+     *
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Wishlist/_files/wishlist_with_simple_product.php
+     */
+    public function testUpdateProductWithValidQtyAndNoDescription()
+    {
+        $wishlist = $this->getWishlist();
+        $wishlistId = $wishlist['customer']['wishlist']['id'];
+        $wishlistItem = $wishlist['customer']['wishlist']['items'][0];
+        $qty = 2;
+        $updateWishlistQuery = $this->getQueryWithNoDescription((int) $wishlistId, (int) $wishlistItem['id'], $qty);
+        $response = $this->graphQlMutation($updateWishlistQuery, [], '', $this->getHeaderMap());
+        self::assertEquals(1, $response['updateProductsInWishlist']['wishlist']['items_count']);
+        self::assertNotEmpty($response['updateProductsInWishlist']['wishlist']['items'], 'empty wish list items');
+        self::assertCount(1, $response['updateProductsInWishlist']['wishlist']['items']);
+        $itemsInWishlist = $response['updateProductsInWishlist']['wishlist']['items'][0];
+        self::assertEquals($qty, $itemsInWishlist['qty']);
+        self::assertEquals('simple-1', $itemsInWishlist['product']['sku']);
+    }
+
     /**
      * Authentication header map
      *
@@ -121,6 +172,51 @@ private function getQuery(
 MUTATION;
     }
 
+    /**
+     * Returns GraphQl mutation string
+     *
+     * @param int $wishlistId
+     * @param int $wishlistItemId
+     * @param int $qty
+     *
+     * @return string
+     */
+    private function getQueryWithNoDescription(
+        int $wishlistId,
+        int $wishlistItemId,
+        int $qty
+    ): string {
+        return <<<MUTATION
+mutation {
+  updateProductsInWishlist(
+    wishlistId: {$wishlistId},
+    wishlistItems: [
+      {
+        wishlist_item_id: "{$wishlistItemId}"
+        quantity: {$qty}
+
+      }
+    ]
+) {
+    user_errors {
+      code
+      message
+    }
+    wishlist {
+      id
+      sharing_code
+      items_count
+      items {
+        id
+        qty
+        product{sku name}
+      }
+    }
+  }
+}
+MUTATION;
+    }
+
     /**
      * Get wishlist result
      *

From db80d11594ec72e8b29b8c83b4022218933cff45 Mon Sep 17 00:00:00 2001
From: Hwashiang Yu <hwyu@adobe.com>
Date: Mon, 24 Aug 2020 09:44:50 -0500
Subject: [PATCH 250/671] MC-36490: Template preview update

- Updated template preview for email and newsletter module
- Updated preview template tests
---
 .../Block/Adminhtml/Template/Preview.php      |  1 +
 .../Magento/Email/Model/AbstractTemplate.php  |  9 +++-
 .../PrepareDraftCustomTemplateActionGroup.xml | 25 ++++++++++
 .../Test/Mftf/Data/EmailTemplateData.xml      |  6 +++
 ...mplatePreviewAsDraftWithDirectivesTest.xml | 47 +++++++++++++++++++
 .../Test/AdminEmailTemplatePreviewTest.xml    |  1 +
 ...EmailTemplatePreviewWithDirectivesTest.xml | 45 ++++++++++++++++++
 .../Block/Adminhtml/Queue/Preview.php         |  1 +
 .../Block/Adminhtml/Template/Preview.php      |  1 +
 .../templates/preview/iframeswitcher.phtml    |  2 +-
 .../Magento/Email/Model/TemplateTest.php      | 41 +++++++++++++++-
 .../Adminhtml/Template/DropTest.php           | 43 +++++++++++++++++
 .../Magento/Newsletter/Model/TemplateTest.php |  2 +
 13 files changed, 221 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Email/Test/Mftf/ActionGroup/PrepareDraftCustomTemplateActionGroup.xml
 create mode 100644 app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewAsDraftWithDirectivesTest.xml
 create mode 100644 app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewWithDirectivesTest.xml
 create mode 100644 dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/Template/DropTest.php

diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
index ec5596e2194a1..58fa4a1d318ff 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Preview.php
@@ -67,6 +67,7 @@ protected function _toHtml()
             $template->setTemplateType($request->getParam('type'));
             $template->setTemplateText($request->getParam('text'));
             $template->setTemplateStyles($request->getParam('styles'));
+            $template->setData('is_legacy', false);
         }
 
         \Magento\Framework\Profiler::start($this->profilerName);
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index c697734b9df0f..1a05f88d8fa8f 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -361,8 +361,15 @@ public function getProcessedTemplate(array $variables = [])
         $variables = $this->addEmailVariables($variables, $storeId);
         $processor->setVariables($variables);
 
+        // Type        legacy  id      strict
+        // db legacy   true    numeric false
+        // db new      false   numeric true
+        // filesystem  false   string  false
+        // preview     false   null    true
+        $isLegacy = $this->getData('is_legacy');
+        $templateId = $this->getTemplateId();
         $previousStrictMode = $processor->setStrictMode(
-            !$this->getData('is_legacy') && is_numeric($this->getTemplateId())
+            !$isLegacy && (is_numeric($templateId) || empty($templateId))
         );
 
         try {
diff --git a/app/code/Magento/Email/Test/Mftf/ActionGroup/PrepareDraftCustomTemplateActionGroup.xml b/app/code/Magento/Email/Test/Mftf/ActionGroup/PrepareDraftCustomTemplateActionGroup.xml
new file mode 100644
index 0000000000000..72c7a3ee8e4ca
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/ActionGroup/PrepareDraftCustomTemplateActionGroup.xml
@@ -0,0 +1,25 @@
+<?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="PrepareDraftCustomTemplateActionGroup" extends="CreateNewTemplateActionGroup">
+        <arguments>
+            <argument name="template" defaultValue="EmailTemplate"/>
+        </arguments>
+        <remove keyForRemoval="selectValueFromTemplateDropDown"/>
+        <remove keyForRemoval="clickLoadTemplateButton"/>
+        <remove keyForRemoval="clickSaveTemplateButton"/>
+        <remove keyForRemoval="waitForSuccessMessage"/>
+        <remove keyForRemoval="seeSuccessMessage"/>
+
+        <fillField selector="{{AdminEmailTemplateEditSection.templateSubject}}" userInput="{{template.templateSubject}}" after="fillTemplateNameField" stepKey="fillTemplateSubject"/>
+        <fillField selector="{{AdminEmailTemplateEditSection.templateText}}" userInput="{{template.templateText}}" after="fillTemplateSubject" stepKey="fillTemplateText"/>
+    </actionGroup>
+
+</actionGroups>
diff --git a/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
index 7f28e2241761b..06aff6ed6ab7e 100644
--- a/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
+++ b/app/code/Magento/Email/Test/Mftf/Data/EmailTemplateData.xml
@@ -13,4 +13,10 @@
         <data key="templateSubject" unique="suffix">Template Subject_</data>
         <data key="templateText" unique="suffix">Template Text_</data>
     </entity>
+    <entity name="EmailTemplateWithDirectives" type="template">
+        <data key="templateName" unique="suffix">Template</data>
+        <data key="templateSubject" unique="suffix">Template Subject_</data>
+        <data key="templateText">Template {{var this.template_id}}:{{var this.getData(template_id)}} Text</data>
+        <data key="expectedTemplate">Template : Text</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewAsDraftWithDirectivesTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewAsDraftWithDirectivesTest.xml
new file mode 100644
index 0000000000000..f61a0bba91046
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewAsDraftWithDirectivesTest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEmailTemplatePreviewAsDraftWithDirectivesTest">
+        <annotations>
+            <features value="Email"/>
+            <stories value="Create email template with directives and preview as draft"/>
+            <title value="Check email template preview with directives and preview as draft"/>
+            <description value="Check if email template preview works correctly with directives in draft mode"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-23058"/>
+            <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
+            <stories value="Email Template Preview"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="PrepareDraftCustomTemplateActionGroup" stepKey="createDraftTemplate">
+            <argument name="template" value="EmailTemplateWithDirectives"/>
+        </actionGroup>
+
+        <click selector="{{AdminEmailTemplateEditSection.previewTemplateButton}}" stepKey="clickPreviewTemplate"/>
+        <switchToNextTab stepKey="switchToPreviewTab"/>
+        <seeInCurrentUrl url="{{AdminEmailTemplatePreviewPage.url}}" stepKey="seePreviewInUrl"/>
+        <seeElement selector="{{AdminEmailTemplatePreviewSection.iframe}}" stepKey="seeIframeOnPage"/>
+        <switchToIFrame userInput="preview_iframe" stepKey="switchToIframe"/>
+        <waitForPageLoad stepKey="waitForPreviewLoaded"/>
+
+        <actionGroup ref="AssertEmailTemplateContentActionGroup" stepKey="assertContent">
+            <argument name="expectedContent" value="{{EmailTemplateWithDirectives.expectedTemplate}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewTest.xml
index 0d9ca6a2c195a..22e70b72e5401 100644
--- a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewTest.xml
+++ b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewTest.xml
@@ -18,6 +18,7 @@
             <testCaseId value="MC-15794"/>
             <useCaseId value="MC-11050"/>
             <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
         </annotations>
 
         <before>
diff --git a/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewWithDirectivesTest.xml b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewWithDirectivesTest.xml
new file mode 100644
index 0000000000000..7683591e8f37f
--- /dev/null
+++ b/app/code/Magento/Email/Test/Mftf/Test/AdminEmailTemplatePreviewWithDirectivesTest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEmailTemplatePreviewWithDirectivesTest">
+        <annotations>
+            <features value="Email"/>
+            <stories value="Create email template with directives"/>
+            <title value="Check email template preview with directives"/>
+            <description value="Check if email template preview works correctly with directives"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="MC-23058"/>
+            <group value="email"/>
+            <group value="WYSIWYGDisabled"/>
+            <stories value="Email Template Preview"/>
+        </annotations>
+
+        <before>
+            <!--Login to Admin Area-->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
+        </before>
+
+        <after>
+            <!--Delete created Template-->
+            <actionGroup ref="DeleteEmailTemplateActionGroup" stepKey="deleteTemplate"/>
+            <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clearFilters"/>
+            <!--Logout from Admin Area-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+        </after>
+
+        <actionGroup ref="CreateCustomTemplateActionGroup" stepKey="createTemplate">
+            <argument name="template" value="EmailTemplateWithDirectives"/>
+        </actionGroup>
+        <actionGroup ref="PreviewEmailTemplateActionGroup" stepKey="previewTemplate"/>
+        <actionGroup ref="AssertEmailTemplateContentActionGroup" stepKey="assertContent">
+            <argument name="expectedContent" value="{{EmailTemplateWithDirectives.expectedTemplate}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
index 69512775f4e93..2ede548b5ebd8 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Queue/Preview.php
@@ -56,6 +56,7 @@ protected function loadTemplate(\Magento\Newsletter\Model\Template $template, $i
         $template->setTemplateType($queue->getNewsletterType());
         $template->setTemplateText($queue->getNewsletterText());
         $template->setTemplateStyles($queue->getNewsletterStyles());
+        $template->setData('is_legacy', false);
 
         return $this;
     }
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
index 58a904248e978..1eb1c0ff4a15a 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Preview.php
@@ -65,6 +65,7 @@ protected function _toHtml()
             $template->setTemplateType($previewData['type']);
             $template->setTemplateText($previewData['text']);
             $template->setTemplateStyles($previewData['styles']);
+            $template->setData('is_legacy', false);
         }
 
         \Magento\Framework\Profiler::start($this->profilerName);
diff --git a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
index 62b368b8911f8..99342fd9d81ba 100644
--- a/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
+++ b/app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml
@@ -22,7 +22,7 @@
         frameborder="0"
         title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
         width="100%"
-        sandbox="allow-forms allow-pointer-lock"
+        sandbox="allow-forms allow-pointer-lock allow-same-origin"
     >
 
     </iframe>
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index f09a0429979ba..3617c467da659 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -75,7 +75,11 @@ protected function mockModel($filesystem = null)
         $this->objectManager->get(\Magento\Framework\App\State::class)->setAreaCode('frontend');
 
         $this->model->expects($this->any())->method('_getMail')->willReturnCallback([$this, 'getMail']);
-        $this->model->setSenderName('sender')->setSenderEmail('sender@example.com')->setTemplateSubject('Subject');
+        $this->model
+            ->setSenderName('sender')
+            ->setSenderEmail('sender@example.com')
+            ->setTemplateSubject('Subject')
+            ->setTemplateId('abc');
     }
 
     /**
@@ -120,6 +124,7 @@ public function testLoadDefault()
     public function testGetProcessedTemplate()
     {
         $this->mockModel();
+        $this->model->setTemplateId(null);
         $this->objectManager->get(\Magento\Framework\App\AreaList::class)
             ->getArea(Area::AREA_FRONTEND)
             ->load();
@@ -416,6 +421,40 @@ public function testLegacyTemplateLoadedFromDbIsFilteredInLegacyMode()
         self::assertEquals('1 - some_unique_code - 1 - some_unique_code', $this->model->getProcessedTemplate());
     }
 
+    /**
+     * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
+     * @magentoComponentsDir Magento/Email/Model/_files/design
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     */
+    public function testPreviewTemplateIsFilteredInStrictMode()
+    {
+        $this->mockModel();
+
+        $this->setUpThemeFallback(BackendFrontNameResolver::AREA_CODE);
+
+        $this->model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
+        $template = '{{var store.isSaveAllowed()}} - {{template config_path="design/email/footer_template"}}';
+        $this->model->setTemplateText($template);
+
+        $template = $this->objectManager->create(\Magento\Email\Model\Template::class);
+        $templateData = [
+            'is_legacy' => '0',
+            'template_code' => 'some_unique_code',
+            'template_type' => TemplateTypesInterface::TYPE_HTML,
+            'template_text' => '{{var this.template_code}}'
+                . ' - {{var store.isSaveAllowed()}} - {{var this.getTemplateCode()}}',
+        ];
+        $template->setData($templateData);
+        $template->save();
+
+        // Store the ID of the newly created template in the system config so that this template will be loaded
+        $this->objectManager->get(\Magento\Framework\App\Config\MutableScopeConfigInterface::class)
+            ->setValue('design/email/footer_template', $template->getId(), ScopeInterface::SCOPE_STORE, 'fixturestore');
+
+        self::assertEquals('1 - some_unique_code -  - some_unique_code', $this->model->getProcessedTemplate());
+    }
+
     /**
      * Ensure that the template_styles variable contains styles from either <!--@styles @--> or the "Template Styles"
      * textarea in backend, depending on whether template was loaded from filesystem or DB.
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/Template/DropTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/Template/DropTest.php
new file mode 100644
index 0000000000000..5ad8d1c3328a6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Controller/Adminhtml/Template/DropTest.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Newsletter\Controller\Adminhtml\Template;
+
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\Newsletter\Model\Template;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+class DropTest extends AbstractBackendController
+{
+    public function testDefaultTemplateAction()
+    {
+        $website = $this->_objectManager
+            ->get(StoreManagerInterface::class)
+            ->getWebsite();
+
+        $storeId = $website->getDefaultStore()
+            ->getId();
+
+        /** @var $formKey FormKey */
+        $formKey = $this->_objectManager->get(FormKey::class);
+        $post = [
+            'form_key' => $formKey->getFormKey(),
+            'type' => Template::TYPE_HTML,
+            'preview_store_id' => $storeId,
+            'text' => 'Template {{var this.template_id}}:{{var this.getData(template_id)}} Text'
+        ];
+        $this->getRequest()->setPostValue($post);
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
+        $this->dispatch('backend/newsletter/template/drop');
+        $this->assertStringContainsString(
+            'Template : Text',
+            $this->getResponse()->getBody()
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
index 6c594690d536a..bd6f68fbfb704 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/Model/TemplateTest.php
@@ -147,6 +147,7 @@ public function testLegacyTemplateFromDbLoadsInLegacyMode()
         $this->_model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
         $templateText = '{{var store.isSaveAllowed()}} - {{template config_path="foobar"}}';
         $this->_model->setTemplateText($templateText);
+        $this->_model->setTemplateId('abc');
 
         $template = $objectManager->create(\Magento\Email\Model\Template::class);
         $templateData = [
@@ -184,6 +185,7 @@ public function testTemplateFromDbLoadsInStrictMode()
         $this->_model->setTemplateType(TemplateTypesInterface::TYPE_HTML);
         $templateText = '{{var store.isSaveAllowed()}} - {{template config_path="foobar"}}';
         $this->_model->setTemplateText($templateText);
+        $this->_model->setTemplateId('abc');
 
         $template = $objectManager->create(\Magento\Email\Model\Template::class);
         $templateData = [

From 67544444dffe09822669b9ed3e6a469d474c5545 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 24 Aug 2020 17:50:03 +0100
Subject: [PATCH 251/671] Added JS to copy mobile account menu back

---
 app/design/frontend/Magento/blank/Magento_Theme/web/js/theme.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/design/frontend/Magento/blank/Magento_Theme/web/js/theme.js b/app/design/frontend/Magento/blank/Magento_Theme/web/js/theme.js
index e4edd3bd8662c..87aceb0b00036 100644
--- a/app/design/frontend/Magento/blank/Magento_Theme/web/js/theme.js
+++ b/app/design/frontend/Magento/blank/Magento_Theme/web/js/theme.js
@@ -16,5 +16,7 @@ define([
         container: '#maincontent'
     });
 
+    $('.panel.header > .header.links').clone().appendTo('#store\\.links');
+
     keyboardHandler.apply();
 });

From 4ac627ec52ff144288312ed28db112aed69b0f0d Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Mon, 24 Aug 2020 11:52:08 -0500
Subject: [PATCH 252/671] MC-36897: [GraphQl] Issues with updating wishlist
 quantity. Adding Recommended Store config changes

- added tests to cover bugs
---
 .../GraphQl/Wishlist/CustomerWishlistTest.php | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
index 0a8e1757a2ce2..b4c8d3149f527 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
@@ -124,6 +124,78 @@ public function testGuestCannotGetWishlist()
         $this->graphQlQuery($query);
     }
 
+    /**
+     * Add product to wishlist with quantity 0
+     * 
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/product_simple_duplicated.php
+     */
+    public function testAddProductToWishlistWithZeroQty()
+    {
+        $customerWishlistQuery =
+            <<<QUERY
+{
+  customer {
+    wishlist {
+      id
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery(
+            $customerWishlistQuery,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+        $qty = 0;
+        $sku = 'simple-1';
+        $wishlistId = $response['customer']['wishlist']['id'];
+        $addProductToWishlistQuery =
+            <<<QUERY
+mutation{
+   addProductsToWishlist(
+     wishlistId:{$wishlistId}
+     wishlistItems:[
+      {
+        sku:"{$sku}"
+        quantity:{$qty}
+      }
+    ])
+  {
+     wishlist{
+     id
+     items_count
+     items{product{name sku} description qty}
+    }
+    user_errors{code message}
+  }
+}
+
+QUERY;
+        $addToWishlistResponse = $this->graphQlMutation(
+            $addProductToWishlistQuery,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+        $this->assertArrayHasKey('user_errors', $addToWishlistResponse['addProductsToWishlist']);
+        $this->assertCount(1, $addToWishlistResponse['addProductsToWishlist']['user_errors']);
+        $this->assertEmpty($addToWishlistResponse['addProductsToWishlist']['wishlist']['items']);
+        $this->assertEquals(
+            0,
+            $addToWishlistResponse['addProductsToWishlist']['wishlist']['items_count'],
+            'Count is greater than 0'
+        );
+        $message = 'The quantity of a wish list item cannot be 0';
+        $this->assertEquals(
+            $message,
+            $addToWishlistResponse['addProductsToWishlist']['user_errors'][0]['message']
+        );
+    }
+
     /**
      * @magentoConfigFixture default_store wishlist/general/active 0
      * @magentoApiDataFixture Magento/Customer/_files/customer.php

From 1b08a0c5cef7eca5f7075f6c0c06589aad5c926a Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Mon, 24 Aug 2020 14:25:08 -0500
Subject: [PATCH 253/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - Added validation for disabled product.

---
 .../Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php | 4 ++++
 .../Wishlist/Model/Wishlist/UpdateProductsInWishlist.php      | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
index c8eb98b938573..f2eeb0a59b0c4 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
@@ -8,6 +8,7 @@
 namespace Magento\Wishlist\Model\Wishlist;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
@@ -116,6 +117,9 @@ private function addItemToWishlist(Wishlist $wishlist, WishlistItem $wishlistIte
             if ($wishlistItem->getQuantity() == 0) {
                 throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
             }
+            if ($product->getStatus() == Status::STATUS_DISABLED) {
+                throw new LocalizedException(__("The product is disabled"));
+            }
             $options = $this->buyRequestBuilder->build($wishlistItem, (int) $product->getId());
             $result = $wishlist->addNewItem($product, $options);
 
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
index 4455b118e7a5e..1b2bd1e271ff0 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Wishlist\Model\Wishlist;
 
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Wishlist\Model\Item as WishlistItem;
 use Magento\Wishlist\Model\ItemFactory as WishlistItemFactory;
@@ -98,6 +99,9 @@ private function updateItemInWishlist(Wishlist $wishlist, WishlistItemData $wish
             if ($wishlistItemData->getQuantity() == 0) {
                 throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
             }
+            if ($wishlistItem->getProduct()->getStatus() == Status::STATUS_DISABLED) {
+                throw new LocalizedException(__("The product is disabled"));
+            }
             $resultItem = $wishlist->updateItem($wishlistItem, $options);
 
             if (is_string($resultItem)) {

From 048a489eec2e8fa55cdcd452990bffab0f07b04b Mon Sep 17 00:00:00 2001
From: Deepty Thampy <dthampy@adobe.com>
Date: Mon, 24 Aug 2020 15:32:38 -0500
Subject: [PATCH 254/671] MC-36897: [GraphQl] Issues with updating wishlist
 quantity. Adding Recommended Store config changes

- added tests to cover bug fix
---
 .../GraphQl/Wishlist/CustomerWishlistTest.php | 74 ++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
index b4c8d3149f527..dcbb550d66d62 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
@@ -126,7 +126,7 @@ public function testGuestCannotGetWishlist()
 
     /**
      * Add product to wishlist with quantity 0
-     * 
+     *
      * @magentoConfigFixture default_store wishlist/general/active 1
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Catalog/_files/product_simple_duplicated.php
@@ -196,6 +196,78 @@ public function testAddProductToWishlistWithZeroQty()
         );
     }
 
+    /**
+     * Add disabled product to wishlist
+     *
+     * @magentoConfigFixture default_store wishlist/general/active 1
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/Catalog/_files/simple_product_disabled.php
+     */
+    public function testAddProductToWishlistWithDisabledProduct()
+    {
+        $customerWishlistQuery =
+            <<<QUERY
+{
+  customer {
+    wishlist {
+      id
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery(
+            $customerWishlistQuery,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+        $qty = 2;
+        $sku = 'product_disabled';
+        $wishlistId = $response['customer']['wishlist']['id'];
+        $addProductToWishlistQuery =
+            <<<QUERY
+mutation{
+   addProductsToWishlist(
+     wishlistId:{$wishlistId}
+     wishlistItems:[
+      {
+        sku:"{$sku}"
+        quantity:{$qty}
+      }
+    ])
+  {
+     wishlist{
+     id
+     items_count
+     items{product{name sku} description qty}
+    }
+    user_errors{code message}
+  }
+}
+
+QUERY;
+        $addToWishlistResponse = $this->graphQlMutation(
+            $addProductToWishlistQuery,
+            [],
+            '',
+            $this->getCustomerAuthHeaders('customer@example.com', 'password')
+        );
+        $this->assertArrayHasKey('user_errors', $addToWishlistResponse['addProductsToWishlist']);
+        $this->assertCount(1, $addToWishlistResponse['addProductsToWishlist']['user_errors']);
+        $this->assertEmpty($addToWishlistResponse['addProductsToWishlist']['wishlist']['items']);
+        $this->assertEquals(
+            0,
+            $addToWishlistResponse['addProductsToWishlist']['wishlist']['items_count'],
+            'Count is greater than 0'
+        );
+        $message = 'The product is disabled';
+        $this->assertEquals(
+            $message,
+            $addToWishlistResponse['addProductsToWishlist']['user_errors'][0]['message']
+        );
+    }
+
     /**
      * @magentoConfigFixture default_store wishlist/general/active 0
      * @magentoApiDataFixture Magento/Customer/_files/customer.php

From e9f6eed8312051cb4d3cddda6b229591a5bf6b18 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 25 Aug 2020 13:34:43 -0500
Subject: [PATCH 255/671] MC-36977: [GraphQL] Add storeConfig attributes for
 product reviews - Added store config

---
 .../Magento/ReviewGraphQl/etc/graphql/di.xml    | 17 +++++++++++++++++
 .../Magento/ReviewGraphQl/etc/schema.graphqls   |  5 +++++
 2 files changed, 22 insertions(+)
 create mode 100644 app/code/Magento/ReviewGraphQl/etc/graphql/di.xml

diff --git a/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml b/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..34e309f0b151a
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\StoreGraphQl\Model\Resolver\Store\StoreConfigDataProvider">
+        <arguments>
+            <argument name="extendedConfigData" xsi:type="array">
+                <item name="product_reviews_enabled" xsi:type="string">catalog/review/active</item>
+                <item name="allow_guests_to_write_product_reviews" xsi:type="string">catalog/review/allow_guest</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
index 14b4fc60e8b09..171033d55ed73 100644
--- a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -76,3 +76,8 @@ input ProductReviewRatingInput {
     id: String! @doc(description: "Base64 encoded rating ID.")
     value_id: String! @doc(description: "Base 64 encoded rating value id.")
 }
+
+type StoreConfig @doc(description: "The type contains information about a store config") {
+    product_reviews_enabled : String @doc(description: "Indicates whether product reviews are enabled. Possible values: 1 (Yes) and 0 (No)")
+    allow_guests_to_write_product_reviews : String @doc(description: "Indicates whether guest users can write product reviews. Possible values: 1 (Yes) and 0 (No)")
+}

From 377d01d070f228c7e1d1df8bbf7d7cc5a41a3a1f Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 25 Aug 2020 17:50:55 -0500
Subject: [PATCH 256/671] MC-36977: [GraphQL] Add storeConfig attributes for
 product reviews - remove base 64 references

---
 app/code/Magento/ReviewGraphQl/etc/schema.graphqls | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
index 171033d55ed73..e7b1926f46202 100644
--- a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -39,13 +39,13 @@ type ProductReviewRatingsMetadata {
 }
 
 type ProductReviewRatingMetadata {
-    id: String! @doc(description: "Base64 encoded rating ID.")
+    id: String! @doc(description: "An encoded rating ID.")
     name: String! @doc(description: "The label assigned to an aspect of a product that is being rated, such as quality or price")
     values: [ProductReviewRatingValueMetadata!]! @doc(description: "List of product review ratings sorted by position.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingValueMetadata")
 }
 
 type ProductReviewRatingValueMetadata {
-    value_id: String! @doc(description: "Base 64 encoded rating value id.")
+    value_id: String! @doc(description: "An encoded rating value id.")
     value: String! @doc(description: "e.g Good, Perfect, 3, 4, 5")
 }
 
@@ -73,8 +73,8 @@ input CreateProductReviewInput {
 }
 
 input ProductReviewRatingInput {
-    id: String! @doc(description: "Base64 encoded rating ID.")
-    value_id: String! @doc(description: "Base 64 encoded rating value id.")
+    id: String! @doc(description: "An encoded rating ID.")
+    value_id: String! @doc(description: "An encoded rating value id.")
 }
 
 type StoreConfig @doc(description: "The type contains information about a store config") {

From e848f129ec06210de7e0b0b30a3326e852e3e0de Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 25 Aug 2020 19:21:56 -0500
Subject: [PATCH 257/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - static fix

---
 .../Model/Resolver/UpdateProductsInWishlist.php               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index d9e431223b642..42b8cd576f7c8 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -137,13 +137,13 @@ private function getWishlistItems(array $wishlistItemsData, Wishlist $wishlist):
         foreach ($wishlistItemsData as $wishlistItemData) {
             if (!isset($wishlistItemData['quantity'])) {
                 $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
-                if (isset($wishlistItem)) {
+                if ($wishlistItem !== null) {
                     $wishlistItemData['quantity'] = (float) $wishlistItem->getQty();
                 }
             }
             if (!isset($wishlistItemData['description'])) {
                 $wishlistItem = $wishlist->getItem($wishlistItemData['wishlist_item_id']);
-                if (isset($wishlistItem)) {
+                if ($wishlistItem !== null) {
                     $wishlistItemData['description'] = $wishlistItem->getDescription();
                 }
             }

From a152e8ee76a1a617c6b2f0afb5d17f3ef037d9d3 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 26 Aug 2020 12:53:21 -0500
Subject: [PATCH 258/671] MC-36977: [GraphQL] Add storeConfig attributes for
 product reviews - updated schema description

---
 app/code/Magento/ReviewGraphQl/etc/schema.graphqls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
index e7b1926f46202..709e25598a737 100644
--- a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -46,7 +46,7 @@ type ProductReviewRatingMetadata {
 
 type ProductReviewRatingValueMetadata {
     value_id: String! @doc(description: "An encoded rating value id.")
-    value: String! @doc(description: "e.g Good, Perfect, 3, 4, 5")
+    value: String! @doc(description: "A ratings scale, such as the number of stars awarded")
 }
 
 type Customer {

From c94a2f80bf5615f4961256dd0dad511f3ecd8bf9 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 26 Aug 2020 14:06:49 -0500
Subject: [PATCH 259/671] MC-34841: free-payment

---
 .../Model/Cart/SetShippingAddressesOnCart.php             | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index 0f350be78a945..71740488c4cea 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,6 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
@@ -35,16 +36,17 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
     /**
      * @param AssignShippingAddressToCart $assignShippingAddressToCart
      * @param GetShippingAddress $getShippingAddress
-     * @param QuoteRepository $quoteRepository
+     * @param QuoteRepository|null $quoteRepository
      */
     public function __construct(
         AssignShippingAddressToCart $assignShippingAddressToCart,
         GetShippingAddress $getShippingAddress,
-        QuoteRepository $quoteRepository
+        QuoteRepository $quoteRepository = null
     ) {
         $this->assignShippingAddressToCart = $assignShippingAddressToCart;
         $this->getShippingAddress = $getShippingAddress;
-        $this->quoteRepository = $quoteRepository;
+        $this->quoteRepository = $quoteRepository
+            ?? ObjectManager::getInstance()->get(QuoteRepository::class);
     }
 
     /**

From 306cb001d7cbf41a84bebcb74a56f433d5871aa1 Mon Sep 17 00:00:00 2001
From: Soumya Unnikrishnan <sunnikri@adobe.com>
Date: Wed, 26 Aug 2020 14:47:57 -0500
Subject: [PATCH 260/671] MQE-2271: Release 3.1.0 Delivery Composer update

---
 composer.json | 2 +-
 composer.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 1f91e7b8594a1..25be12b5bb72f 100644
--- a/composer.json
+++ b/composer.json
@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.16.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "^3.1",
+        "magento/magento2-functional-testing-framework": "^3.0",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
diff --git a/composer.lock b/composer.lock
index 5b7e6c3da431a..36a42d0c750df 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b5562151b3be7e921e3ebc8080da557f",
+    "content-hash": "197f0388c574f9d40555a95634e439e0",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",

From e24f416600748abe9b6dffc4c9a1112d69a4de7a Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 26 Aug 2020 16:20:49 -0500
Subject: [PATCH 261/671] MC-36897: [GraphQl] Store config and schema
 modifications for Wishlist - review fix

---
 .../Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php   | 2 +-
 .../Wishlist/Model/Wishlist/UpdateProductsInWishlist.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
index f2eeb0a59b0c4..088805ffe76ac 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/AddProductsToWishlist.php
@@ -114,7 +114,7 @@ private function addItemToWishlist(Wishlist $wishlist, WishlistItem $wishlistIte
         }
 
         try {
-            if ($wishlistItem->getQuantity() == 0) {
+            if ((int)$wishlistItem->getQuantity() === 0) {
                 throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
             }
             if ($product->getStatus() == Status::STATUS_DISABLED) {
diff --git a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
index 1b2bd1e271ff0..e3f2cd760a1fb 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist/UpdateProductsInWishlist.php
@@ -96,7 +96,7 @@ private function updateItemInWishlist(Wishlist $wishlist, WishlistItemData $wish
             $wishlistItem = $this->wishlistItemFactory->create();
             $this->wishlistItemResource->load($wishlistItem, $wishlistItemData->getId());
             $wishlistItem->setDescription($wishlistItemData->getDescription());
-            if ($wishlistItemData->getQuantity() == 0) {
+            if ((int)$wishlistItemData->getQuantity() === 0) {
                 throw new LocalizedException(__("The quantity of a wish list item cannot be 0"));
             }
             if ($wishlistItem->getProduct()->getStatus() == Status::STATUS_DISABLED) {

From 977f6ff611743addcb59dfc436c229c477c0ecc9 Mon Sep 17 00:00:00 2001
From: Tu Nguyen <tuna@ecommage.com>
Date: Thu, 27 Aug 2020 19:15:54 +0700
Subject: [PATCH 262/671] Add some common font weight variable

update


update
---
 lib/web/css/source/lib/variables/_typography.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/web/css/source/lib/variables/_typography.less b/lib/web/css/source/lib/variables/_typography.less
index 205b1fa9c7a3b..e357b6969dbfd 100644
--- a/lib/web/css/source/lib/variables/_typography.less
+++ b/lib/web/css/source/lib/variables/_typography.less
@@ -39,11 +39,15 @@
 @font-size__xs: floor(.75 * @font-size__base); // 11px
 
 //  Weights
+@font-weight__hairline: 100;
+@font-weight__extralight: 200;
 @font-weight__light: 300;
 @font-weight__regular: 400;
 @font-weight__heavier: 500;
 @font-weight__semibold: 600;
 @font-weight__bold: 700;
+@font-weight__extrabold: 800;
+@font-weight__heavy: 900;
 
 //  Styles
 @font-style__base: normal;

From 4787c826f7d1a38fe2844114fceb84f34a6ef1cb Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 27 Aug 2020 16:56:08 +0300
Subject: [PATCH 263/671] magento/magento2#29752: Stores are not shown in
 "Login as Customer: Select Store" modal window on order view page

---
 .../Component/ConfirmationPopup/Options.php   | 71 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 4ec2bed41c799..865d4f0bc12e2 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -10,9 +10,14 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Config\Share;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\Escaper;
+use Magento\Sales\Api\CreditmemoRepositoryInterface;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\System\Store as SystemStore;
 use Magento\Store\Model\Website;
@@ -52,25 +57,61 @@ class Options implements OptionSourceInterface
      */
     private $options;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var ShipmentRepositoryInterface
+     */
+    private $shipmentRepository;
+
+    /**
+     * @var CreditmemoRepositoryInterface
+     */
+    private $creditmemoRepository;
+
     /**
      * @param CustomerRepositoryInterface $customerRepository
      * @param Escaper $escaper
      * @param RequestInterface $request
      * @param Share $share
      * @param SystemStore $systemStore
+     * @param OrderRepositoryInterface|null $orderRepository
+     * @param InvoiceRepositoryInterface|null $invoiceRepository
+     * @param ShipmentRepositoryInterface|null $shipmentRepository
+     * @param CreditmemoRepositoryInterface|null $creditmemoRepository
      */
     public function __construct(
         CustomerRepositoryInterface $customerRepository,
         Escaper $escaper,
         RequestInterface $request,
         Share $share,
-        SystemStore $systemStore
+        SystemStore $systemStore,
+        ?OrderRepositoryInterface $orderRepository = null,
+        ?InvoiceRepositoryInterface $invoiceRepository = null,
+        ?ShipmentRepositoryInterface $shipmentRepository = null,
+        ?CreditmemoRepositoryInterface $creditmemoRepository = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->escaper = $escaper;
         $this->request = $request;
         $this->share = $share;
         $this->systemStore = $systemStore;
+        $this->orderRepository = $orderRepository
+            ?? ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+        $this->invoiceRepository = $invoiceRepository
+            ?? ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
+        $this->shipmentRepository = $shipmentRepository
+            ?? ObjectManager::getInstance()->get(ShipmentRepositoryInterface::class);
+        $this->creditmemoRepository = $creditmemoRepository
+            ?? ObjectManager::getInstance()->get(CreditmemoRepositoryInterface::class);
     }
 
     /**
@@ -82,7 +123,7 @@ public function toOptionArray(): array
             return $this->options;
         }
 
-        $customerId = (int)$this->request->getParam('id');
+        $customerId = $this->getCustomerId();
         $this->options = $this->generateCurrentOptions($customerId);
 
         return $this->options;
@@ -167,4 +208,30 @@ private function fillStoreGroupOptions(Website $website, CustomerInterface $cust
 
         return $groups;
     }
+
+    /**
+     * Get Customer id from request param.
+     *
+     * @return int
+     */
+    private function getCustomerId(): int
+    {
+        $customerId = $this->request->getParam('id');
+        if (!$customerId) {
+            $orderId = $this->request->getParam('order_id');
+            $shipmentId = $this->request->getParam('shipment_id');
+            $creditmemoId = $this->request->getParam('creditmemo_id');
+            $invoiceId = $this->request->getParam('invoice_id');
+            if ($invoiceId) {
+                $orderId = $this->invoiceRepository->get($invoiceId)->getOrderId();
+            } elseif ($shipmentId) {
+                $orderId = $this->shipmentRepository->get($shipmentId)->getOrderId();
+            } elseif ($creditmemoId) {
+                $orderId = $this->creditmemoRepository->get($creditmemoId)->getOrderId();
+            }
+            $customerId = $this->orderRepository->get($orderId)->getCustomerId();
+        }
+
+        return (int)$customerId;
+    }
 }

From 9f8130417b55da9a94ff58fb0d7b1adc6cae17c0 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 27 Aug 2020 17:14:20 +0300
Subject: [PATCH 264/671] Revert "magento/magento2#29752: Stores are not shown
 in "Login as Customer: Select Store" modal window on order view page"

This reverts commit 4787c826
---
 .../Component/ConfirmationPopup/Options.php   | 71 +------------------
 1 file changed, 2 insertions(+), 69 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 865d4f0bc12e2..4ec2bed41c799 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -10,14 +10,9 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Config\Share;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\Escaper;
-use Magento\Sales\Api\CreditmemoRepositoryInterface;
-use Magento\Sales\Api\InvoiceRepositoryInterface;
-use Magento\Sales\Api\OrderRepositoryInterface;
-use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\System\Store as SystemStore;
 use Magento\Store\Model\Website;
@@ -57,61 +52,25 @@ class Options implements OptionSourceInterface
      */
     private $options;
 
-    /**
-     * @var OrderRepositoryInterface
-     */
-    private $orderRepository;
-
-    /**
-     * @var InvoiceRepositoryInterface
-     */
-    private $invoiceRepository;
-
-    /**
-     * @var ShipmentRepositoryInterface
-     */
-    private $shipmentRepository;
-
-    /**
-     * @var CreditmemoRepositoryInterface
-     */
-    private $creditmemoRepository;
-
     /**
      * @param CustomerRepositoryInterface $customerRepository
      * @param Escaper $escaper
      * @param RequestInterface $request
      * @param Share $share
      * @param SystemStore $systemStore
-     * @param OrderRepositoryInterface|null $orderRepository
-     * @param InvoiceRepositoryInterface|null $invoiceRepository
-     * @param ShipmentRepositoryInterface|null $shipmentRepository
-     * @param CreditmemoRepositoryInterface|null $creditmemoRepository
      */
     public function __construct(
         CustomerRepositoryInterface $customerRepository,
         Escaper $escaper,
         RequestInterface $request,
         Share $share,
-        SystemStore $systemStore,
-        ?OrderRepositoryInterface $orderRepository = null,
-        ?InvoiceRepositoryInterface $invoiceRepository = null,
-        ?ShipmentRepositoryInterface $shipmentRepository = null,
-        ?CreditmemoRepositoryInterface $creditmemoRepository = null
+        SystemStore $systemStore
     ) {
         $this->customerRepository = $customerRepository;
         $this->escaper = $escaper;
         $this->request = $request;
         $this->share = $share;
         $this->systemStore = $systemStore;
-        $this->orderRepository = $orderRepository
-            ?? ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
-        $this->invoiceRepository = $invoiceRepository
-            ?? ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
-        $this->shipmentRepository = $shipmentRepository
-            ?? ObjectManager::getInstance()->get(ShipmentRepositoryInterface::class);
-        $this->creditmemoRepository = $creditmemoRepository
-            ?? ObjectManager::getInstance()->get(CreditmemoRepositoryInterface::class);
     }
 
     /**
@@ -123,7 +82,7 @@ public function toOptionArray(): array
             return $this->options;
         }
 
-        $customerId = $this->getCustomerId();
+        $customerId = (int)$this->request->getParam('id');
         $this->options = $this->generateCurrentOptions($customerId);
 
         return $this->options;
@@ -208,30 +167,4 @@ private function fillStoreGroupOptions(Website $website, CustomerInterface $cust
 
         return $groups;
     }
-
-    /**
-     * Get Customer id from request param.
-     *
-     * @return int
-     */
-    private function getCustomerId(): int
-    {
-        $customerId = $this->request->getParam('id');
-        if (!$customerId) {
-            $orderId = $this->request->getParam('order_id');
-            $shipmentId = $this->request->getParam('shipment_id');
-            $creditmemoId = $this->request->getParam('creditmemo_id');
-            $invoiceId = $this->request->getParam('invoice_id');
-            if ($invoiceId) {
-                $orderId = $this->invoiceRepository->get($invoiceId)->getOrderId();
-            } elseif ($shipmentId) {
-                $orderId = $this->shipmentRepository->get($shipmentId)->getOrderId();
-            } elseif ($creditmemoId) {
-                $orderId = $this->creditmemoRepository->get($creditmemoId)->getOrderId();
-            }
-            $customerId = $this->orderRepository->get($orderId)->getCustomerId();
-        }
-
-        return (int)$customerId;
-    }
 }

From d60cbb9ed28d4b307cd2b82721e0f19e501134b4 Mon Sep 17 00:00:00 2001
From: Bartosz Kubicki <bartosz.kubicki@lizardmedia.pl>
Date: Fri, 21 Feb 2020 17:11:00 +0100
Subject: [PATCH 265/671] Fix for numeric argument conversion

---
 .../Framework/Amqp/Topology/ArgumentProcessor.php  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
index caa5db4e7ef5c..2a7b6b939853f 100644
--- a/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
+++ b/lib/internal/Magento/Framework/Amqp/Topology/ArgumentProcessor.php
@@ -1,10 +1,15 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\Amqp\Topology;
 
+use InvalidArgumentException;
+
 /**
  * @deprecated 100.0.0
  * see: https://github.com/php-amqplib/php-amqplib/issues/405
@@ -17,22 +22,23 @@ trait ArgumentProcessor
      * @param array $arguments
      * @return array
      */
-    public function processArguments($arguments)
+    public function processArguments($arguments): array
     {
         $output = [];
         foreach ($arguments as $key => $value) {
             if (is_array($value)) {
                 $output[$key] = ['A', $value];
-            } elseif (is_int($value)) {
-                $output[$key] = ['I', $value];
+            } elseif (is_numeric($value)) {
+                $output[$key] = ['I', (int) $value];
             } elseif (is_bool($value)) {
                 $output[$key] = ['t', $value];
             } elseif (is_string($value)) {
                 $output[$key] = ['S', $value];
             } else {
-                throw new \InvalidArgumentException('Unknown argument type ' . gettype($value));
+                throw new InvalidArgumentException('Unknown argument type ' . gettype($value));
             }
         }
+
         return $output;
     }
 }

From 6db35d819919d05720333425989b83b0582e8aa7 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Fri, 28 Aug 2020 17:47:22 +0100
Subject: [PATCH 266/671] Applied fix for Stores are not shown in Login as
 Customer

---
 .../Component/ConfirmationPopup/Options.php   | 71 ++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 4ec2bed41c799..865d4f0bc12e2 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -10,9 +10,14 @@
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Model\Config\Share;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\Escaper;
+use Magento\Sales\Api\CreditmemoRepositoryInterface;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Store\Model\Group;
 use Magento\Store\Model\System\Store as SystemStore;
 use Magento\Store\Model\Website;
@@ -52,25 +57,61 @@ class Options implements OptionSourceInterface
      */
     private $options;
 
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var ShipmentRepositoryInterface
+     */
+    private $shipmentRepository;
+
+    /**
+     * @var CreditmemoRepositoryInterface
+     */
+    private $creditmemoRepository;
+
     /**
      * @param CustomerRepositoryInterface $customerRepository
      * @param Escaper $escaper
      * @param RequestInterface $request
      * @param Share $share
      * @param SystemStore $systemStore
+     * @param OrderRepositoryInterface|null $orderRepository
+     * @param InvoiceRepositoryInterface|null $invoiceRepository
+     * @param ShipmentRepositoryInterface|null $shipmentRepository
+     * @param CreditmemoRepositoryInterface|null $creditmemoRepository
      */
     public function __construct(
         CustomerRepositoryInterface $customerRepository,
         Escaper $escaper,
         RequestInterface $request,
         Share $share,
-        SystemStore $systemStore
+        SystemStore $systemStore,
+        ?OrderRepositoryInterface $orderRepository = null,
+        ?InvoiceRepositoryInterface $invoiceRepository = null,
+        ?ShipmentRepositoryInterface $shipmentRepository = null,
+        ?CreditmemoRepositoryInterface $creditmemoRepository = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->escaper = $escaper;
         $this->request = $request;
         $this->share = $share;
         $this->systemStore = $systemStore;
+        $this->orderRepository = $orderRepository
+            ?? ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+        $this->invoiceRepository = $invoiceRepository
+            ?? ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
+        $this->shipmentRepository = $shipmentRepository
+            ?? ObjectManager::getInstance()->get(ShipmentRepositoryInterface::class);
+        $this->creditmemoRepository = $creditmemoRepository
+            ?? ObjectManager::getInstance()->get(CreditmemoRepositoryInterface::class);
     }
 
     /**
@@ -82,7 +123,7 @@ public function toOptionArray(): array
             return $this->options;
         }
 
-        $customerId = (int)$this->request->getParam('id');
+        $customerId = $this->getCustomerId();
         $this->options = $this->generateCurrentOptions($customerId);
 
         return $this->options;
@@ -167,4 +208,30 @@ private function fillStoreGroupOptions(Website $website, CustomerInterface $cust
 
         return $groups;
     }
+
+    /**
+     * Get Customer id from request param.
+     *
+     * @return int
+     */
+    private function getCustomerId(): int
+    {
+        $customerId = $this->request->getParam('id');
+        if (!$customerId) {
+            $orderId = $this->request->getParam('order_id');
+            $shipmentId = $this->request->getParam('shipment_id');
+            $creditmemoId = $this->request->getParam('creditmemo_id');
+            $invoiceId = $this->request->getParam('invoice_id');
+            if ($invoiceId) {
+                $orderId = $this->invoiceRepository->get($invoiceId)->getOrderId();
+            } elseif ($shipmentId) {
+                $orderId = $this->shipmentRepository->get($shipmentId)->getOrderId();
+            } elseif ($creditmemoId) {
+                $orderId = $this->creditmemoRepository->get($creditmemoId)->getOrderId();
+            }
+            $customerId = $this->orderRepository->get($orderId)->getCustomerId();
+        }
+
+        return (int)$customerId;
+    }
 }

From 1eb24b7e33c9e08cde7fb73801685b3941696453 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 16:34:56 +0300
Subject: [PATCH 267/671] Fix flaky behavior with mftf test

---
 .../ActionGroup/AdminEditCategoryInGridPageActionGroup.xml | 7 ++++++-
 .../AdminMediaGalleryCatalogUiCategoryGridSection.xml      | 2 +-
 .../AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
index ccdebccab4e65..50ee9e890ad20 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminEditCategoryInGridPageActionGroup.xml
@@ -11,7 +11,12 @@
         <annotations>
             <description>Clicks the Edit action from the Media Gallery Category Grid</description>
         </annotations>
-        <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.edit('2', 'Edit')}}" stepKey="clickOnCategoryRow"/>
+
+         <arguments>
+            <argument name="categoryName" type="string"/>
+        </arguments>
+
+        <click selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.edit(categoryName, 'Edit')}}" stepKey="clickOnCategoryRow"/>
         <waitForPageLoad time="30" stepKey="waitForCategoryDetailsPageLoad"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
index ffd3c14c297c3..9e90f2c463adc 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml
@@ -17,6 +17,6 @@
         <element name="products" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Products')]/preceding-sibling::th) +1 ]//*[text()='{{productsQty}}']" parameterized="true"/>
         <element name="inMenu" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//*[text()='{{inMenuValue}}']" parameterized="true"/>
         <element name="enabled" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//*[text()='{{enabledValue}}']" parameterized="true"/>
-        <element name="edit" type="button" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{edit}}']" parameterized="true"/>
+        <element name="edit" type="button" selector="//tr[td//text()[contains(., '{{categoryName}}')]]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{actionButton}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
index b20f63a005279..2a606d8ab6a9e 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
@@ -26,7 +26,9 @@
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
         </after>
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
-        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem"/>
+        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem">
+            <argument name="categoryName" value="$$category.name$$"/>
+        </actionGroup>
         <actionGroup ref="AdminAssertCategoryPageTitleActionGroup" stepKey="assertCategoryByName"/>
    </test>
 </tests>

From 9009ebadba824d4d7f164b103745b108497d6f9b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 15:13:59 +0300
Subject: [PATCH 268/671] cut long folders name to avoid styles issue

---
 .../Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
index f0998a3e120f2..c152330a39bbd 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
@@ -84,8 +84,9 @@ private function getDirectories(): array
             }
 
             $pathArray = explode('/', $path);
+            $displayName = strlen(end($pathArray)) > 50 ? substr(end($pathArray),0,50)."..." : end($pathArray);
             $directories[] = [
-                'data' => count($pathArray) > 0 ? end($pathArray) : $path,
+                'data' => count($pathArray) > 0 ? $displayName : $path,
                 'attr' => ['id' => $path],
                 'metadata' => [
                     'path' => $path

From 65caa40c13c650d8517a31b699ba189a6c2919f5 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 18 Aug 2020 15:51:17 +0300
Subject: [PATCH 269/671] Correctly apply filters from url-applier do avoid
 dropping other filters

---
 .../Ui/view/base/web/js/grid/url-filter-applier.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index 1f870e9e819a1..ab985c51449e8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -5,8 +5,9 @@
 
 define([
     'uiComponent',
-    'underscore'
-], function (Component, _) {
+    'underscore',
+    'jquery'
+], function (Component, _, $) {
     'use strict';
 
     return Component.extend({
@@ -36,7 +37,9 @@ define([
          * Apply filter
          */
         apply: function () {
-            var urlFilter = this.getFilterParam(this.searchString);
+            var urlFilter = this.getFilterParam(this.searchString),
+                applied,
+                filters = {};
 
             if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {
@@ -47,8 +50,9 @@ define([
             }
 
             if (Object.keys(urlFilter).length) {
-                this.filterComponent().setData(urlFilter, false);
-                this.filterComponent().apply();
+                applied = this.filterComponent().get('applied');
+                filters = $.extend(true, urlFilter, applied);
+                this.filterComponent().set('applied', filters);
             }
         },
 

From 9bf9072670c9cf9dfe46b210ecadbfbe2557e3a1 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 14:35:23 +0300
Subject: [PATCH 270/671] Cover long folder names in media gallery with mftf
 test

---
 .../Model/Directories/GetFolderTree.php       |  6 ++-
 .../Mftf/Data/AdminMediaGalleryFolderData.xml |  2 +
 ...iaGalleryCreateFolderWithLongNamesTest.xml | 43 +++++++++++++++++++
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
index c152330a39bbd..f297d027c13e1 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
@@ -17,6 +17,8 @@
  */
 class GetFolderTree
 {
+    private const NAME_LENGTH = 50;
+
     /**
      * @var Filesystem
      */
@@ -84,7 +86,9 @@ private function getDirectories(): array
             }
 
             $pathArray = explode('/', $path);
-            $displayName = strlen(end($pathArray)) > 50 ? substr(end($pathArray),0,50)."..." : end($pathArray);
+            $displayName = strlen(end($pathArray)) > self::NAME_LENGTH ?
+                         substr(end($pathArray),0, self::NAME_LENGTH) . "..." :
+                         end($pathArray);
             $directories[] = [
                 'data' => count($pathArray) > 0 ? $displayName : $path,
                 'attr' => ['id' => $path],
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
index e4149acdf58d1..d67c019397ec1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
@@ -13,5 +13,7 @@
     </entity>
     <entity name="AdminMediaGalleryFolderInvalidData">
         <data key="name">,.?/:;'[{]}|~`!@#$%^*()_=+</data>
+        <data key="longName">mediagallerylongfoldernamemediagallerylongfoldername54</data>
+        <data key="cutedName">mediagallerylongfoldernamemediagallerylongfolderna...</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml
new file mode 100644
index 0000000000000..c76790e164298
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryCreateFolderWithLongNamesTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1758"/>
+            <stories value="Create new folder with long names in Media Gallery"/>
+            <title value="Create new folder with long names in Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4456547"/>
+            <description value="Creating, deleting new folder functionality in Media Gallery"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        </before>
+
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithNotValidName">
+            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.longName}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="AssertFolderName">
+            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.cutedName}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+
+
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
+            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.cutedName}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder">
+            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.cutedName}}"/>
+        </actionGroup>
+    </test>
+</tests>

From 3c4588d06a9c5864a6e9418a47be196edaa83569 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 15:32:11 +0300
Subject: [PATCH 271/671] Cover filters functionality

---
 ...aGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index 7e0fa6c477c45..fd669926c2f09 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -60,5 +60,14 @@
         <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Asset"/>
+            <argument name="optionName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
+
    </test>
 </tests>

From 03746d7cd2396567f80fedd23bdecdc34cfe2b53 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 15:56:27 +0300
Subject: [PATCH 272/671] Cover url-filter-applier issue with mftf test

---
 ...leryCatalogUiVerifyUsedInLinkCategoryGridTest.xml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index fd669926c2f09..58c270687ab34 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -60,14 +60,16 @@
         <actionGroup ref="AdminMediaGalleryAssertCategoryNameInCategoryGridActionGroup" stepKey="assertCategoryInGrid">
             <argument name="categoryName" value="$$category.name$$"/>
         </actionGroup>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPageToVerifyIfFilterCanBeApplied"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
-        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setAssetFilter">
             <argument name="filterName" value="Asset"/>
-            <argument name="optionName" value="{{ImageMetadata.title}}"/>
+            <argument name="optionName" value="{{UpdatedImageDetails.title}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
-
+        <actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterAppliedAfterUrlFilterApplier">
+            <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
+        </actionGroup>
    </test>
 </tests>

From 3d23bad4eeae1e29fa51625abfb0a03ce7575d15 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 16:31:09 +0300
Subject: [PATCH 273/671] Correct jasmine tests && fix static tests

---
 .../Model/Directories/GetFolderTree.php       |  2 +-
 .../base/js/grid/url-filter-applier.test.js   | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
index f297d027c13e1..9dba5ec8433af 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
@@ -87,7 +87,7 @@ private function getDirectories(): array
 
             $pathArray = explode('/', $path);
             $displayName = strlen(end($pathArray)) > self::NAME_LENGTH ?
-                         substr(end($pathArray),0, self::NAME_LENGTH) . "..." :
+                         substr(end($pathArray), 0 , self::NAME_LENGTH) . "..." :
                          end($pathArray);
             $directories[] = [
                 'data' => count($pathArray) > 0 ? $displayName : $path,
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
index a3d49e382de51..71ca60ef9077f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
@@ -5,14 +5,16 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'Magento_Ui/js/grid/url-filter-applier'
-], function (UrlFilterApplier) {
+    'Magento_Ui/js/grid/url-filter-applier',
+    'jquery'
+], function (UrlFilterApplier, $) {
     'use strict';
 
     describe('Magento_Ui/js/grid/url-filter-applier', function () {
         var urlFilterApplierObj,
             filterComponentMock = {
-                setData: jasmine.createSpy(),
+                set: jasmine.createSpy(),
+                get: jasmine.createSpy(),
                 apply: jasmine.createSpy()
             };
 
@@ -64,11 +66,14 @@ define([
             it('applies url filter on filter component', function () {
                 urlFilterApplierObj.searchString = '?filters[name]=test&filters[qty]=1';
                 urlFilterApplierObj.apply();
-                expect(urlFilterApplierObj.filterComponent().setData).toHaveBeenCalledWith({
-                    'name': 'test',
-                    'qty': '1'
-                }, false);
-                expect(urlFilterApplierObj.filterComponent().apply).toHaveBeenCalled();
+                expect(urlFilterApplierObj.filterComponent().get).toHaveBeenCalled();
+                expect(urlFilterApplierObj.filterComponent().set).toHaveBeenCalledWith(
+                    'applied',
+                    {
+                        'name': 'test',
+                        'qty': '1'
+                    }
+                );
             });
         });
     });

From a3a8947c1614d4518df86262982fd4a44acbedee Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 18:11:45 +0300
Subject: [PATCH 274/671] static tests fix

---
 .../MediaGalleryUi/Model/Directories/GetFolderTree.php       | 2 +-
 .../code/Magento/Ui/base/js/grid/url-filter-applier.test.js  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
index 9dba5ec8433af..54c3cac5ecd13 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
@@ -87,7 +87,7 @@ private function getDirectories(): array
 
             $pathArray = explode('/', $path);
             $displayName = strlen(end($pathArray)) > self::NAME_LENGTH ?
-                         substr(end($pathArray), 0 , self::NAME_LENGTH) . "..." :
+                         substr(end($pathArray), 0, self::NAME_LENGTH) . "..." :
                          end($pathArray);
             $directories[] = [
                 'data' => count($pathArray) > 0 ? $displayName : $path,
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
index 71ca60ef9077f..1e63f9f61f6d1 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/url-filter-applier.test.js
@@ -5,9 +5,8 @@
 
 /*eslint max-nested-callbacks: 0*/
 define([
-    'Magento_Ui/js/grid/url-filter-applier',
-    'jquery'
-], function (UrlFilterApplier, $) {
+    'Magento_Ui/js/grid/url-filter-applier'
+], function (UrlFilterApplier) {
     'use strict';
 
     describe('Magento_Ui/js/grid/url-filter-applier', function () {

From 2d44b78fedfdd7e89838e1f8ac6772efe2d8611f Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 14:08:10 +0300
Subject: [PATCH 275/671] Add ablility to scroll folders in case when we have a
 lot of included one by one folders revert cutting folders from backend

---
 .../Model/Directories/GetFolderTree.php              |  7 +------
 .../view/adminhtml/web/css/source/_module.less       | 12 +++++++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
index 54c3cac5ecd13..f0998a3e120f2 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
@@ -17,8 +17,6 @@
  */
 class GetFolderTree
 {
-    private const NAME_LENGTH = 50;
-
     /**
      * @var Filesystem
      */
@@ -86,11 +84,8 @@ private function getDirectories(): array
             }
 
             $pathArray = explode('/', $path);
-            $displayName = strlen(end($pathArray)) > self::NAME_LENGTH ?
-                         substr(end($pathArray), 0, self::NAME_LENGTH) . "..." :
-                         end($pathArray);
             $directories[] = [
-                'data' => count($pathArray) > 0 ? $displayName : $path,
+                'data' => count($pathArray) > 0 ? end($pathArray) : $path,
                 'attr' => ['id' => $path],
                 'metadata' => [
                     'path' => $path
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index fc8bd49126d8e..b1e7966a3cfb4 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -170,8 +170,9 @@
             height: 30px;
             margin: 1px;
             padding-left: 6px;
+            padding-right: 10px;
             padding-top: 6px;
-            width: 100%;
+            width: max-content;
         }
 
         .jstree-default .jstree-clicked {
@@ -272,8 +273,17 @@
         }
 
         .media-directory-container {
+            &::-webkit-scrollbar {
+                background: transparent;
+                width: 0px;
+            }
+            -ms-overflow-style: none;
             float: left;
+            max-width: 50%;
+            overflow-x: scroll;
+            overflow-y: hidden;
             padding-right: 40px;
+            scrollbar-width: none;
         }
 
         .media-gallery-image-block {

From d7b1ba6fdcd117222f11a0762b71aab0048d1ba3 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 14:10:19 +0300
Subject: [PATCH 276/671] Rever foders tests as it can't be veryfied by mftf
 tests

---
 .../Mftf/Data/AdminMediaGalleryFolderData.xml |  2 -
 ...iaGalleryCreateFolderWithLongNamesTest.xml | 43 -------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
index d67c019397ec1..e4149acdf58d1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminMediaGalleryFolderData.xml
@@ -13,7 +13,5 @@
     </entity>
     <entity name="AdminMediaGalleryFolderInvalidData">
         <data key="name">,.?/:;'[{]}|~`!@#$%^*()_=+</data>
-        <data key="longName">mediagallerylongfoldernamemediagallerylongfoldername54</data>
-        <data key="cutedName">mediagallerylongfoldernamemediagallerylongfolderna...</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml
deleted file mode 100644
index c76790e164298..0000000000000
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryCreateFolderWithLongNamesTest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryCreateFolderWithLongNamesTest">
-        <annotations>
-            <features value="MediaGallery"/>
-            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1758"/>
-            <stories value="Create new folder with long names in Media Gallery"/>
-            <title value="Create new folder with long names in Media Gallery"/>
-            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1054245/scenarios/4456547"/>
-            <description value="Creating, deleting new folder functionality in Media Gallery"/>
-            <severity value="CRITICAL"/>
-            <group value="media_gallery_ui"/>
-        </annotations>
-        <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-        </before>
-
-        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
-        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolderWithNotValidName">
-            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.longName}}"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="AssertFolderName">
-            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.cutedName}}"/>
-        </actionGroup>
-        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-
-
-        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder">
-            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.cutedName}}"/>
-        </actionGroup>
-        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder">
-            <argument name="name" value="{{AdminMediaGalleryFolderInvalidData.cutedName}}"/>
-        </actionGroup>
-    </test>
-</tests>

From 95d7d605038aedb621b96253529035ebdb9f0399 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 17:09:45 +0300
Subject: [PATCH 277/671] fix static tests

---
 .../MediaGalleryUi/view/adminhtml/web/css/source/_module.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index b1e7966a3cfb4..2b26fc19945d6 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -275,7 +275,7 @@
         .media-directory-container {
             &::-webkit-scrollbar {
                 background: transparent;
-                width: 0px;
+                width: 0;
             }
             -ms-overflow-style: none;
             float: left;

From 84525d2f230afab81da627558ed97746ff7e3bbb Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 13:21:02 +0300
Subject: [PATCH 278/671] update style to match mockups

---
 .../view/adminhtml/web/css/source/_module.less           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index 2b26fc19945d6..16a2453b8b542 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -274,16 +274,17 @@
 
         .media-directory-container {
             &::-webkit-scrollbar {
-                background: transparent;
-                width: 0;
+                background-color: @color-media-gallery-checkbox-background;
+            }
+            &::-webkit-scrollbar-thumb {
+                background-color: @color-masonry-grey;
             }
-            -ms-overflow-style: none;
             float: left;
             max-width: 50%;
             overflow-x: scroll;
             overflow-y: hidden;
             padding-right: 40px;
-            scrollbar-width: none;
+            scrollbar-color: @color-masonry-grey @color-media-gallery-checkbox-background;
         }
 
         .media-gallery-image-block {

From d4586540e117f55ed1e9262173b85d9c276b6ab5 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 13:40:52 +0300
Subject: [PATCH 279/671] cFix colors

---
 .../view/adminhtml/web/css/source/_module.less              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index 16a2453b8b542..05cdf1d440833 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -18,7 +18,7 @@
 @color-media-gallery-buttons-border: #adadad;
 @color-media-gallery-buttons-text: #514943;
 @color-media-gallery-checkbox-background: #eee;
-
+@color-media-gallery-scrollbar-background: white;
 & when (@media-common = true) {
 
     .media-gallery-delete-image-action,
@@ -274,7 +274,7 @@
 
         .media-directory-container {
             &::-webkit-scrollbar {
-                background-color: @color-media-gallery-checkbox-background;
+                background-color: @color-media-gallery-scrollbar-background;
             }
             &::-webkit-scrollbar-thumb {
                 background-color: @color-masonry-grey;
@@ -284,7 +284,7 @@
             overflow-x: scroll;
             overflow-y: hidden;
             padding-right: 40px;
-            scrollbar-color: @color-masonry-grey @color-media-gallery-checkbox-background;
+            scrollbar-color: @color-masonry-grey @color-media-gallery-scrollbar-background;
         }
 
         .media-gallery-image-block {

From a83fc986c3cd778391d56ec77ea334f0d15bf31e Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 14:20:18 +0300
Subject: [PATCH 280/671] Fix static CSS tests

---
 .../MediaGalleryUi/view/adminhtml/web/css/source/_module.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index 05cdf1d440833..df005319a50d4 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -18,7 +18,7 @@
 @color-media-gallery-buttons-border: #adadad;
 @color-media-gallery-buttons-text: #514943;
 @color-media-gallery-checkbox-background: #eee;
-@color-media-gallery-scrollbar-background: white;
+@color-media-gallery-scrollbar-background: #FFFFFF;
 & when (@media-common = true) {
 
     .media-gallery-delete-image-action,

From 5fa10d29cc92b68be2789f5740484bc9eb53432b Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 15:11:07 +0300
Subject: [PATCH 281/671] again css static tests

---
 .../MediaGalleryUi/view/adminhtml/web/css/source/_module.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index df005319a50d4..b4529ac9296b1 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -18,7 +18,7 @@
 @color-media-gallery-buttons-border: #adadad;
 @color-media-gallery-buttons-text: #514943;
 @color-media-gallery-checkbox-background: #eee;
-@color-media-gallery-scrollbar-background: #FFFFFF;
+@color-media-gallery-scrollbar-background: #ffffff;
 & when (@media-common = true) {
 
     .media-gallery-delete-image-action,

From 568a73cffb155cffc352a8f599089ce36de9b651 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 16:33:48 +0300
Subject: [PATCH 282/671] css static test fix !!

---
 .../MediaGalleryUi/view/adminhtml/web/css/source/_module.less   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
index b4529ac9296b1..6b3cd610f0348 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/css/source/_module.less
@@ -18,7 +18,7 @@
 @color-media-gallery-buttons-border: #adadad;
 @color-media-gallery-buttons-text: #514943;
 @color-media-gallery-checkbox-background: #eee;
-@color-media-gallery-scrollbar-background: #ffffff;
+@color-media-gallery-scrollbar-background: #fff;
 & when (@media-common = true) {
 
     .media-gallery-delete-image-action,

From ce9e0321afe1358b509627ab3937d345f0b18a5a Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 18:27:42 +0300
Subject: [PATCH 283/671] Remove product name assertion as other tests can
 leave some active filters on product grid

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index fea4436446da2..d4047cbe51722 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -33,7 +33,6 @@
 
         <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$createSimpleProduct.name$" stepKey="navigateToProductGridWithFilters"/>
         <waitForPageLoad stepKey="waitForProductGrid"/>
-        <see selector="{{AdminProductGridSection.productGridNameProduct($createSimpleProduct.name$)}}" userInput="$createSimpleProduct.name$" stepKey="seeProduct"/>
         <waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForEnabledFilters"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $createSimpleProduct.name$" stepKey="seeProductNameFilter"/>

From c44a7d9a506896623711df6624e5724571095682 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Fri, 21 Aug 2020 19:03:57 +0300
Subject: [PATCH 284/671] Add ablility to ovveride same filter woth url
 applier, fix unstable mftf test

---
 .../Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml  | 5 +++--
 .../Magento/Ui/view/base/web/js/grid/url-filter-applier.js   | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
index d4047cbe51722..2eda7b8d02481 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductGridUrlFilterApplierTest.xml
@@ -31,10 +31,11 @@
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
         </after>
 
-        <amOnPage url="{{AdminProductIndexPage.url}}?filters[name]=$createSimpleProduct.name$" stepKey="navigateToProductGridWithFilters"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}?filters[sku]=$createSimpleProduct.sku$" stepKey="navigateToProductGridWithFilters"/>
         <waitForPageLoad stepKey="waitForProductGrid"/>
+        <see selector="{{AdminProductGridSection.productGridNameProduct($createSimpleProduct.name$)}}" userInput="$createSimpleProduct.name$" stepKey="seeProduct"/>
         <waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForEnabledFilters"/>
         <seeElement selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="seeEnabledFilters"/>
-        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="Name: $createSimpleProduct.name$" stepKey="seeProductNameFilter"/>
+        <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="SKU: $createSimpleProduct.sku$" stepKey="seeProductNameFilter"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index ab985c51449e8..be9044143c5a4 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -39,7 +39,7 @@ define([
         apply: function () {
             var urlFilter = this.getFilterParam(this.searchString),
                 applied,
-                filters = {};
+                filters;
 
             if (_.isUndefined(this.filterComponent())) {
                 setTimeout(function () {
@@ -51,7 +51,7 @@ define([
 
             if (Object.keys(urlFilter).length) {
                 applied = this.filterComponent().get('applied');
-                filters = $.extend(true, urlFilter, applied);
+                filters = $.extend({}, applied, urlFilter);
                 this.filterComponent().set('applied', filters);
             }
         },

From ac3892f185e056e4e236d90045273b26438406ef Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 18:02:41 +0300
Subject: [PATCH 285/671] Correctly revert default view after mass image
 deletion

---
 .../view/adminhtml/web/js/grid/massaction/massactions.js      | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
index 4f09854005f23..7799bc00f958c 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
@@ -141,9 +141,7 @@ define([
                             if (response.status === 'canceled') {
                                 return;
                             }
-                            this.imageModel().selected({});
-                            this.massActionMode(false);
-                            this.switchMode();
+                            $(window).trigger('terminateMassAction.MediaGallery');
                         }.bind(this));
                     }
                 }.bind(this));

From a8e3da4f2dd961f7d36f36d4ece80c7673c447de Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Wed, 19 Aug 2020 19:10:54 +0300
Subject: [PATCH 286/671] Fix bindings

---
 .../view/adminhtml/web/js/grid/massaction/massactions.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
index 7799bc00f958c..03e82e65b5db5 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/massaction/massactions.js
@@ -142,7 +142,7 @@ define([
                                 return;
                             }
                             $(window).trigger('terminateMassAction.MediaGallery');
-                        }.bind(this));
+                        });
                     }
                 }.bind(this));
             }

From 2c6465f011a567b296bbdb24c14aa766cb6facfb Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 20 Aug 2020 10:01:00 +0300
Subject: [PATCH 287/671] Cover changes with mftf test

---
 ...lleryAssertMassActionModeNotActiveActionGroup.xml |  2 +-
 ...minEnhancedMediaGalleryDeleteImagesInBulkTest.xml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml
index a691f65387e8e..1ec2004b22f24 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeNotActiveActionGroup.xml
@@ -12,8 +12,8 @@
         <annotations>
             <description>Asserts that massaction mode is terminated</description>
         </annotations>
-       
 
+        <dontSeeElement selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="verifyAddSelectedButtonNotVisible"/>
         <dontSeeElement selector="{{AdminEnhancedMediaGalleryMassActionSection.totalSelected}}" stepKey="verifyTeminateMassAction"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
index 94831b039b53a..63c0fbfeefbbf 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDeleteImagesInBulkTest.xml
@@ -19,9 +19,17 @@
             <group value="media_gallery_ui"/>
         </annotations>
         <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+            <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+                <argument name="category" value="$$category$$"/>
+            </actionGroup>
+            <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
         </before>
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
             <argument name="image" value="ImageUpload"/>
         </actionGroup>
@@ -34,7 +42,7 @@
             <argument name="imageName" value="{{ImageUpload.fileName}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryDisableMassactionModeActionGroup" stepKey="disableMassActionMode"/>
-        
+
         <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
             <argument name="imageName" value="{{ImageUpload.fileName}}"/>

From 83c25bd4b41585c19b7b7aeb8267e4460542644f Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 18 Aug 2020 23:25:22 +0800
Subject: [PATCH 288/671] magento/adobe-stock-integration#1387: Uncaught
 TypeError: Cannot read property 'complete' of undefined appears in dev
 console if save Previewed image as a new View and open this View on another
 page - created separate function for loading of image data in preview

---
 .../base/web/js/grid/columns/image-preview.js | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
index d675bd7a60ab5..8a9df56562a15 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -128,8 +128,6 @@ define([
          * @param {Object} record
          */
         show: function (record) {
-            var img;
-
             if (record._rowIndex === this.visibleRecord()) {
                 this.hide();
 
@@ -141,19 +139,31 @@ define([
             this._selectRow(record.rowNumber || null);
             this.visibleRecord(record._rowIndex);
 
-            img = $(this.previewImageSelector + ' img');
+            this.lastOpenedImage(record._rowIndex);
+            this.updateImageData();
+        },
 
-            if (img.get(0).complete) {
-                this.updateHeight();
-                this.scrollToPreview();
+        /**
+         * Update image data
+         */
+        updateImageData: function () {
+            var img = $(this.previewImageSelector + ' img');
+
+            if (!img.get(0)) {
+                setTimeout(function () {
+                    this.updateImageData();
+                }.bind(this), 100);
             } else {
-                img.load(function () {
+                if (img.get(0).complete) {
                     this.updateHeight();
                     this.scrollToPreview();
-                }.bind(this));
+                } else {
+                    img.load(function () {
+                        this.updateHeight();
+                        this.scrollToPreview();
+                    }.bind(this));
+                }
             }
-
-            this.lastOpenedImage(record._rowIndex);
         },
 
         /**

From 5be78ca35dc7e5d005f98f503d9cba5b1a000f33 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 19 Aug 2020 18:47:36 +0800
Subject: [PATCH 289/671] magento/adobe-stock-integration#1387: Uncaught
 TypeError: Cannot read property 'complete' of undefined appears in dev
 console if save Previewed image as a new View and open this View on another
 page - suggested modifications

---
 .../base/web/js/grid/columns/image-preview.js | 30 ++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
index 8a9df56562a15..047e2cbae666b 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -32,7 +32,8 @@ define([
             listens: {
                 '${ $.provider }:params.filters': 'hide',
                 '${ $.provider }:params.search': 'hide',
-                '${ $.provider }:params.paging': 'hide'
+                '${ $.provider }:params.paging': 'hide',
+                '${ $.provider }:data.items': 'updateDisplayedRecord'
             },
             exports: {
                 height: '${ $.parentName }.thumbnail_url:previewHeight'
@@ -48,6 +49,22 @@ define([
             this._super();
             $(document).on('keydown', this.handleKeyDown.bind(this));
 
+            this.lastOpenedImage.subscribe(function (newValue) {
+                if (newValue === false && _.isNull(this.visibleRecord())) {
+                    return;
+                }
+                if (newValue === this.visibleRecord()) {
+                    return;
+                }
+
+                if (newValue === false) {
+                    this.hide();
+                    return;
+                }
+
+                this.show(this.masonry().rows()[newValue]);
+            }.bind(this));
+
             return this;
         },
 
@@ -166,6 +183,17 @@ define([
             }
         },
 
+        /**
+         * Update displayed record
+         *
+         * @param items
+         */
+        updateDisplayedRecord: function (items) {
+            if (!_.isNull(this.visibleRecord())) {
+                this.displayedRecord(items[this.visibleRecord()]);
+            }
+        },
+
         /**
          * Update image preview section height
          */

From 6186b6183b8196b984ad846386ece9b19ee05fca Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 19 Aug 2020 19:26:49 +0800
Subject: [PATCH 290/671] magento/adobe-stock-integration#1387: Uncaught
 TypeError: Cannot read property 'complete' of undefined appears in dev
 console if save Previewed image as a new View and open this View on another
 page - requested modifications

---
 .../Ui/view/base/web/js/grid/columns/image-preview.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
index 047e2cbae666b..ee2d9decdb0bb 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -161,7 +161,7 @@ define([
         },
 
         /**
-         * Update image data
+         * Update image data when image preview is opened
          */
         updateImageData: function () {
             var img = $(this.previewImageSelector + ' img');
@@ -184,9 +184,9 @@ define([
         },
 
         /**
-         * Update displayed record
+         * Update opened image preview contents when the data provider is updated
          *
-         * @param items
+         * @param {Array} items
          */
         updateDisplayedRecord: function (items) {
             if (!_.isNull(this.visibleRecord())) {

From 78f49469bb5aaa4b60389addbb046798577b83da Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 20 Aug 2020 21:21:04 +0800
Subject: [PATCH 291/671] magento/adobe-stock-integration#1387: Uncaught
 TypeError: Cannot read property 'complete' of undefined appears in dev
 console if save Previewed image as a new View and open this View on another
 page - fix static test and unit test

---
 .../base/web/js/grid/columns/image-preview.js     | 15 ++++++++-------
 .../Ui/base/js/grid/columns/image-preview.test.js |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
index ee2d9decdb0bb..1e4ae9df7dc77 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -50,15 +50,18 @@ define([
             $(document).on('keydown', this.handleKeyDown.bind(this));
 
             this.lastOpenedImage.subscribe(function (newValue) {
+
                 if (newValue === false && _.isNull(this.visibleRecord())) {
                     return;
                 }
+
                 if (newValue === this.visibleRecord()) {
                     return;
                 }
 
                 if (newValue === false) {
                     this.hide();
+
                     return;
                 }
 
@@ -170,16 +173,14 @@ define([
                 setTimeout(function () {
                     this.updateImageData();
                 }.bind(this), 100);
+            } else if (img.get(0).complete) {
+                this.updateHeight();
+                this.scrollToPreview();
             } else {
-                if (img.get(0).complete) {
+                img.load(function () {
                     this.updateHeight();
                     this.scrollToPreview();
-                } else {
-                    img.load(function () {
-                        this.updateHeight();
-                        this.scrollToPreview();
-                    }.bind(this));
-                }
+                }.bind(this));
             }
         },
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
index 6a466f0c37872..a5b434d956097 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/columns/image-preview.test.js
@@ -74,6 +74,7 @@ define([
                     originMock = $.fn.get;
 
                 spyOn($.fn, 'get').and.returnValue(imageMock);
+                imagePreview.lastOpenedImage = jasmine.createSpy().and.returnValue(2);
                 imagePreview.visibleRecord = jasmine.createSpy().and.returnValue(2);
                 imagePreview.displayedRecord = ko.observable();
                 imagePreview.displayedRecord(recordMock);

From e97dd6f7b5ead9a82d0fac69e205f3763e8e2fb4 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 20 Aug 2020 21:27:56 +0800
Subject: [PATCH 292/671] magento/adobe-stock-integration#1387: Uncaught
 TypeError: Cannot read property 'complete' of undefined appears in dev
 console if save Previewed image as a new View and open this View on another
 page - modified function description

---
 .../Magento/Ui/view/base/web/js/grid/columns/image-preview.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
index 1e4ae9df7dc77..b561ce2e784b8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -185,7 +185,7 @@ define([
         },
 
         /**
-         * Update opened image preview contents when the data provider is updated
+         * Update preview displayed record data from the new items data if the preview is expanded
          *
          * @param {Array} items
          */

From d53aff80eb7d04ad6cad60747e94a1ce519b6ac9 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Tue, 25 Aug 2020 00:26:18 +0800
Subject: [PATCH 293/671] magento/adobe-stock-integration#1387: Uncaught
 TypeError: Cannot read property 'complete' of undefined appears in dev
 console if save Previewed image as a new View and open this View on another
 page - fix static test fail

---
 .../Magento/Ui/view/base/web/js/grid/columns/image-preview.js    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
index b561ce2e784b8..7dcf0994ef56b 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/columns/image-preview.js
@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+/* eslint-disable no-undef */
 define([
     'jquery',
     'Magento_Ui/js/grid/columns/column',

From d05fc905bd1d6de7afb71a161e97a21459367713 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Tue, 18 Aug 2020 20:01:07 +0800
Subject: [PATCH 294/671] magento/adobe-stock-integration#1760: Media Gallery
 page and Category grid page opened successfully if "Enhanced Media Gallery"
 disabled - redirect to 404 if enhanced media gallery config is disabled.

---
 .../Controller/Adminhtml/Category/Index.php   | 29 +++++++++++++++++++
 .../MediaGalleryCatalogUi/composer.json       |  3 +-
 .../Controller/Adminhtml/Media/Index.php      | 29 +++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
index a541e9999b784..497a65b207353 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
@@ -8,10 +8,13 @@
 namespace Magento\MediaGalleryCatalogUi\Controller\Adminhtml\Category;
 
 use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Page;
+use Magento\Backend\Model\View\Result\Forward;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\MediaContentApi\Model\Config;
 
 /**
  * Controller serving the media gallery content
@@ -20,6 +23,24 @@ class Index extends Action implements HttpGetActionInterface
 {
     public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
 
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param Config $config
+     */
+    public function __construct(
+        Context $context,
+        Config $config
+    ) {
+        parent::__construct($context);
+        $this->config = $config;
+    }
+
     /**
      * Get the media gallery layout
      *
@@ -27,6 +48,14 @@ class Index extends Action implements HttpGetActionInterface
      */
     public function execute(): ResultInterface
     {
+        if (!$this->config->isEnabled()) {
+            /** @var Forward $resultForward */
+            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+            $resultForward->forward('noroute');
+
+            return $resultForward;
+        }
+
         /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->getConfig()->getTitle()->prepend(__('Categories'));
diff --git a/app/code/Magento/MediaGalleryCatalogUi/composer.json b/app/code/Magento/MediaGalleryCatalogUi/composer.json
index 985d581beff25..da759e67ddf54 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/composer.json
+++ b/app/code/Magento/MediaGalleryCatalogUi/composer.json
@@ -8,7 +8,8 @@
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/module-ui": "*",
+        "magento/module-media-content-api": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php
index 3660374243d16..8c5b3d4d3a9ac 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Media/Index.php
@@ -12,6 +12,9 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
+use Magento\MediaContentApi\Model\Config;
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Forward;
 
 /**
  * Controller serving the media gallery content
@@ -20,6 +23,24 @@ class Index extends Action implements HttpGetActionInterface
 {
     public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
 
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * Index constructor.
+     * @param Context $context
+     * @param Config $config
+     */
+    public function __construct(
+        Context $context,
+        Config $config
+    ) {
+        parent::__construct($context);
+        $this->config = $config;
+    }
+
     /**
      * Get the media gallery layout
      *
@@ -27,6 +48,14 @@ class Index extends Action implements HttpGetActionInterface
      */
     public function execute(): ResultInterface
     {
+        if (!$this->config->isEnabled()) {
+            /** @var Forward $resultForward */
+            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
+            $resultForward->forward('noroute');
+
+            return $resultForward;
+        }
+
         /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_MediaGalleryUi::media_gallery')

From 58ac51f0b23bd1ce03fe230d350a5df43ad41934 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 19 Aug 2020 17:04:46 +0800
Subject: [PATCH 295/671] magento/adobe-stock-integration#1760: Media Gallery
 page and Category grid page opened successfully if "Enhanced Media Gallery"
 disabled - revert category grid no route redirect when media gallery is
 disabled, MFTF test coverage

---
 .../Controller/Adminhtml/Category/Index.php   | 29 -------------------
 .../MediaGalleryCatalogUi/composer.json       |  3 +-
 ...daloneMediaGalleryPageIs404ActionGroup.xml | 18 ++++++++++++
 ...dminStandaloneMediaGalleryDisabledTest.xml | 28 ++++++++++++++++++
 4 files changed, 47 insertions(+), 31 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
index 497a65b207353..a541e9999b784 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Category/Index.php
@@ -8,13 +8,10 @@
 namespace Magento\MediaGalleryCatalogUi\Controller\Adminhtml\Category;
 
 use Magento\Backend\App\Action;
-use Magento\Backend\App\Action\Context;
 use Magento\Backend\Model\View\Result\Page;
-use Magento\Backend\Model\View\Result\Forward;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\MediaContentApi\Model\Config;
 
 /**
  * Controller serving the media gallery content
@@ -23,24 +20,6 @@ class Index extends Action implements HttpGetActionInterface
 {
     public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
 
-    /**
-     * @var Config
-     */
-    private $config;
-
-    /**
-     * Index constructor.
-     * @param Context $context
-     * @param Config $config
-     */
-    public function __construct(
-        Context $context,
-        Config $config
-    ) {
-        parent::__construct($context);
-        $this->config = $config;
-    }
-
     /**
      * Get the media gallery layout
      *
@@ -48,14 +27,6 @@ public function __construct(
      */
     public function execute(): ResultInterface
     {
-        if (!$this->config->isEnabled()) {
-            /** @var Forward $resultForward */
-            $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
-            $resultForward->forward('noroute');
-
-            return $resultForward;
-        }
-
         /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->getConfig()->getTitle()->prepend(__('Categories'));
diff --git a/app/code/Magento/MediaGalleryCatalogUi/composer.json b/app/code/Magento/MediaGalleryCatalogUi/composer.json
index da759e67ddf54..985d581beff25 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/composer.json
+++ b/app/code/Magento/MediaGalleryCatalogUi/composer.json
@@ -8,8 +8,7 @@
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
         "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-media-content-api": "*"
+        "magento/module-ui": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml
new file mode 100644
index 0000000000000..868477910f52b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="AssertAdminStandaloneMediaGalleryPageIs404ActionGroup">
+        <annotations>
+            <description>Validates that the '404 Error' message is present and correct in the Admin Standalone Media Gallery Page Header.</description>
+        </annotations>
+
+        <see userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="see404PageHeading"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
new file mode 100644
index 0000000000000..0d2c8207f90c5
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryDisabledPageTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1760"/>
+            <title value="Standalone Media Gallery Page should return 404 if Media Gallery is disabled"/>
+            <stories value="#1760 Media Gallery Page opened successfully if Enhanced Media Gallery disabled"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5106786"/>
+            <description value="Standalone Media Gallery Page should return 404 if Media Gallery is disabled"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        </before>
+        <actionGroup ref="AssertAdminStandaloneMediaGalleryPageIs404ActionGroup" stepKey="see404Page"/>
+    </test>
+</tests>

From 8d92a2966baaa189af3eac34cc9b3c4c746e0ebc Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 19 Aug 2020 20:12:00 +0800
Subject: [PATCH 296/671] magento/adobe-stock-integration#1760: Media Gallery
 page and Category grid page opened successfully if "Enhanced Media Gallery"
 disabled - MFTF Apply PR suggestions

---
 ...p.xml => AssertAdminPageIs404ActionGroup.xml} |  4 ++--
 .../Mftf/Suite/MediaGalleryUiDisabledSuite.xml   | 16 ++++++++++++++++
 .../AdminStandaloneMediaGalleryDisabledTest.xml  |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/{AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml => AssertAdminPageIs404ActionGroup.xml} (77%)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
similarity index 77%
rename from app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml
rename to app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
index 868477910f52b..09b0bdcc146ae 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminStandaloneMediaGalleryPageIs404ActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
@@ -8,9 +8,9 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminStandaloneMediaGalleryPageIs404ActionGroup">
+    <actionGroup name="AssertAdminPageIs404ActionGroup">
         <annotations>
-            <description>Validates that the '404 Error' message is present and correct in the Admin Standalone Media Gallery Page Header.</description>
+            <description>Validates that the '404 Error' message is present in the current Admin Page Header.</description>
         </annotations>
 
         <see userInput="404 Error" selector="{{AdminHeaderSection.pageHeading}}" stepKey="see404PageHeading"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml
new file mode 100644
index 0000000000000..727fbde3f17b6
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+    <suite name="MediaGalleryUiDisabledSuite">
+        <include>
+            <group name="media_gallery_ui_disabled"/>
+        </include>
+    </suite>
+</suites>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
index 0d2c8207f90c5..767a0004872c4 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
@@ -7,7 +7,7 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryDisabledPageTest">
+    <test name="AdminStandaloneMediaGalleryDisabledTest">
         <annotations>
             <features value="MediaGallery"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1760"/>
@@ -16,13 +16,13 @@
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5106786"/>
             <description value="Standalone Media Gallery Page should return 404 if Media Gallery is disabled"/>
             <severity value="CRITICAL"/>
-            <group value="media_gallery_ui"/>
+            <group value="media_gallery_ui_disabled"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         </before>
-        <actionGroup ref="AssertAdminStandaloneMediaGalleryPageIs404ActionGroup" stepKey="see404Page"/>
+        <actionGroup ref="AssertAdminPageIs404ActionGroup" stepKey="see404Page"/>
     </test>
 </tests>

From df69ee15c6c6fd3be833ccf401d35ebac3bf9192 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Fri, 21 Aug 2020 00:56:30 +0800
Subject: [PATCH 297/671] magento/adobe-stock-integration#1760: Media Gallery
 page and Category grid page opened successfully if "Enhanced Media Gallery"
 disabled - MFTF Apply PR suggestions

---
 .../Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml  | 0
 .../Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml | 3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename app/code/Magento/{MediaGalleryUi => Backend}/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml (100%)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml b/app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
similarity index 100%
rename from app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
rename to app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminPageIs404ActionGroup.xml
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
index 767a0004872c4..8b0c984c1df77 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryDisabledTest.xml
@@ -20,9 +20,8 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
-            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         </before>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="AssertAdminPageIs404ActionGroup" stepKey="see404Page"/>
     </test>
 </tests>

From 35c0706cdbbe3a32836ae8300f9504c13820aad0 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 18:13:32 +0300
Subject: [PATCH 298/671] Set path column as text type

---
 app/code/Magento/MediaGallery/etc/db_schema.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallery/etc/db_schema.xml b/app/code/Magento/MediaGallery/etc/db_schema.xml
index 1001737daa8a7..a1662ba63f199 100644
--- a/app/code/Magento/MediaGallery/etc/db_schema.xml
+++ b/app/code/Magento/MediaGallery/etc/db_schema.xml
@@ -8,7 +8,7 @@
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="media_gallery_asset" resource="default" engine="innodb" comment="Media Gallery Asset">
         <column xsi:type="int" name="id" unsigned="true" nullable="false" identity="true" comment="Entity ID"/>
-        <column xsi:type="varchar" name="path" length="255" nullable="true" comment="Path"/>
+        <column xsi:type="text" name="path" nullable="true" comment="Path"/>
         <column xsi:type="varchar" name="title" length="255" nullable="true" comment="Title"/>
         <column xsi:type="text" name="description" nullable="true" comment="Description"/>
         <column xsi:type="varchar" name="source" length="255" nullable="true" comment="Source"/>

From 99c87e09786eb79ac0d2c532b02022985d48b8b6 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 25 Aug 2020 18:05:16 +0100
Subject: [PATCH 299/671] magento/magento2#29742: Removed path unique
 constraint

---
 app/code/Magento/MediaGallery/etc/db_schema.xml            | 3 ---
 app/code/Magento/MediaGallery/etc/db_schema_whitelist.json | 1 -
 2 files changed, 4 deletions(-)

diff --git a/app/code/Magento/MediaGallery/etc/db_schema.xml b/app/code/Magento/MediaGallery/etc/db_schema.xml
index a1662ba63f199..1a9b0dc96a655 100644
--- a/app/code/Magento/MediaGallery/etc/db_schema.xml
+++ b/app/code/Magento/MediaGallery/etc/db_schema.xml
@@ -25,9 +25,6 @@
         <index referenceId="MEDIA_GALLERY_ID" indexType="btree">
             <column name="id"/>
         </index>
-        <constraint xsi:type="unique" referenceId="MEDIA_GALLERY_ID_PATH_TITLE_CONTENT_TYPE_WIDTH_HEIGHT">
-            <column name="path"/>
-        </constraint>
         <index referenceId="MEDIA_GALLERY_ASSET_TITLE" indexType="fulltext">
             <column name="title"/>
         </index>
diff --git a/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json b/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
index b32dfbf082175..e958d630b7e3f 100644
--- a/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
+++ b/app/code/Magento/MediaGallery/etc/db_schema_whitelist.json
@@ -20,7 +20,6 @@
             "MEDIA_GALLERY_ASSET_TITLE": true
         },
         "constraint": {
-            "MEDIA_GALLERY_ID_PATH_TITLE_CONTENT_TYPE_WIDTH_HEIGHT": true,
             "PRIMARY": true,
             "MEDIA_GALLERY_ASSET_PATH": true
         }

From ccdf0ad1ff72ac18abecc9c43509210f4a613817 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 25 Aug 2020 18:50:58 +0300
Subject: [PATCH 300/671] Skip segment reader if there is any kind of exception

---
 .../MediaGalleryMetadata/Model/File/ExtractMetadata.php   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php b/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
index 00f2b07f5bb81..f5efd25bca041 100644
--- a/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
+++ b/app/code/Magento/MediaGalleryMetadata/Model/File/ExtractMetadata.php
@@ -7,7 +7,6 @@
 
 namespace Magento\MediaGalleryMetadata\Model\File;
 
-use Magento\Framework\Exception\LocalizedException;
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
@@ -90,7 +89,12 @@ private function readSegments(FileInterface $file): MetadataInterface
                 );
             }
 
-            $data = $segmentReader->execute($file);
+            try {
+                $data = $segmentReader->execute($file);
+            } catch (\Exception $exception) {
+                continue;
+            }
+
             $title = !empty($data->getTitle()) ? $data->getTitle() : $title;
             $description = !empty($data->getDescription()) ? $data->getDescription() : $description;
 

From 6a48523082a40052beb490d49702dbf76e2d2e2b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 26 Aug 2020 18:28:23 +0100
Subject: [PATCH 301/671] Intoroduced MediaGallerySynchronizationMetadata
 module

---
 .../Model/GetAssetFromPath.php                |   1 +
 .../Model/SynchronizeFilesTest.php            |  70 +--
 .../MediaGallerySynchronization/composer.json |   3 +-
 .../MediaGallerySynchronization/etc/di.xml    |   3 +-
 .../Model/CreateAssetFromFile.php             |  16 +-
 .../LICENSE.txt                               |  48 ++
 .../LICENSE_AFL.txt                           |  48 ++
 .../Model/ImportKeywords.php}                 |  14 +-
 .../Plugin/CreateAssetFromFileMetadata.php    |  81 +++
 .../README.md                                 |   3 +
 .../composer.json                             |  24 +
 .../etc/di.xml                                |  19 +
 .../etc/module.xml                            |  10 +
 .../registration.php                          |  14 +
 composer.json                                 |   1 +
 composer.lock                                 | 568 +-----------------
 .../Model/SynchronizeFilesTest.php            | 151 +++++
 .../_files/magento.jpg                        | Bin 0 -> 55303 bytes
 .../_files/magento_metadata.jpg               | Bin
 19 files changed, 425 insertions(+), 649 deletions(-)
 rename app/code/Magento/{MediaGallerySynchronization => MediaGallerySynchronizationApi}/Model/CreateAssetFromFile.php (84%)
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE.txt
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE_AFL.txt
 rename app/code/Magento/{MediaGallerySynchronization/Model/ImportImageFileKeywords.php => MediaGallerySynchronizationMetadata/Model/ImportKeywords.php} (93%)
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/README.md
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/etc/module.xml
 create mode 100644 app/code/Magento/MediaGallerySynchronizationMetadata/registration.php
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/Model/SynchronizeFilesTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/_files/magento.jpg
 rename {app/code/Magento/MediaGallerySynchronization/Test/Integration => dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata}/_files/magento_metadata.jpg (100%)

diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
index 533d814c9f1d0..ef23e09dfa1fa 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
@@ -12,6 +12,7 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
+use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile;
 
 /**
  * Create media asset object based on the file information
diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
index 6c4338c0935dc..8a44307298065 100644
--- a/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
+++ b/app/code/Magento/MediaGallerySynchronization/Test/Integration/Model/SynchronizeFilesTest.php
@@ -9,14 +9,12 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\Filesystem\DriverInterface;
-use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
 use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
-use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -45,11 +43,6 @@ class SynchronizeFilesTest extends TestCase
      */
     private $mediaDirectory;
 
-    /**
-     * @var GetAssetsKeywordsInterface
-     */
-    private $getAssetKeywords;
-
     /**
      * @inheritdoc
      */
@@ -58,7 +51,6 @@ protected function setUp(): void
         $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
         $this->synchronizeFiles = Bootstrap::getObjectManager()->get(SynchronizeFilesInterface::class);
         $this->getAssetsByPath = Bootstrap::getObjectManager()->get(GetAssetsByPathsInterface::class);
-        $this->getAssetKeywords = Bootstrap::getObjectManager()->get(GetAssetsKeywordsInterface::class);
         $this->mediaDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
     }
@@ -67,18 +59,16 @@ protected function setUp(): void
      * Test for SynchronizeFiles::execute
      *
      * @dataProvider filesProvider
-     * @param null|string $file
-     * @param null|string $title
-     * @param null|string $description
-     * @param null|array $keywords
+     * @param string $file
+     * @param string $title
+     * @param string $source
      * @throws FileSystemException
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function testExecute(
-        ?string $file,
-        ?string $title,
-        ?string $description,
-        ?array $keywords
+        string $file,
+        string $title,
+        string $source
     ): void {
         $path = realpath(__DIR__ . '/../_files/' . $file);
         $modifiableFilePath = $this->mediaDirectory->getAbsolutePath($file);
@@ -89,12 +79,10 @@ public function testExecute(
 
         $this->synchronizeFiles->execute([$file]);
 
-        $loadedAssets = $this->getAssetsByPath->execute([$file])[0];
-        $loadedKeywords = $this->getKeywords($loadedAssets) ?: null;
+        $loadedAsset = $this->getAssetsByPath->execute([$file])[0];
 
-        $this->assertEquals($title, $loadedAssets->getTitle());
-        $this->assertEquals($description, $loadedAssets->getDescription());
-        $this->assertEquals($keywords, $loadedKeywords);
+        $this->assertEquals($title, $loadedAsset->getTitle());
+        $this->assertEquals($source, $loadedAsset->getSource());
 
         $this->driver->deleteFile($modifiableFilePath);
     }
@@ -110,42 +98,8 @@ public function filesProvider(): array
             [
                 '/magento.jpg',
                 'magento',
-                null,
-                null
-            ],
-            [
-                '/magento_metadata.jpg',
-                'Title of the magento image',
-                'Description of the magento image',
-                [
-                    'magento',
-                    'mediagallerymetadata'
-                ]
+                'Local'
             ]
         ];
     }
-
-    /**
-     * Key asset keywords
-     *
-     * @param AssetInterface $asset
-     * @return string[]
-     */
-    private function getKeywords(AssetInterface $asset): array
-    {
-        $assetKeywords = $this->getAssetKeywords->execute([$asset->getId()]);
-
-        if (empty($assetKeywords)) {
-            return [];
-        }
-
-        $keywords = current($assetKeywords)->getKeywords();
-
-        return array_map(
-            function (KeywordInterface $keyword) {
-                return $keyword->getKeyword();
-            },
-            $keywords
-        );
-    }
 }
diff --git a/app/code/Magento/MediaGallerySynchronization/composer.json b/app/code/Magento/MediaGallerySynchronization/composer.json
index e1d4962366978..f9d642dd02568 100644
--- a/app/code/Magento/MediaGallerySynchronization/composer.json
+++ b/app/code/Magento/MediaGallerySynchronization/composer.json
@@ -6,8 +6,7 @@
         "magento/framework": "*",
         "magento/module-media-gallery-api": "*",
         "magento/module-media-gallery-synchronization-api": "*",
-        "magento/framework-message-queue": "*",
-        "magento/module-media-gallery-metadata-api": "*"
+        "magento/framework-message-queue": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/di.xml b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
index 47a4360575b2e..4b9ffcbe63c76 100644
--- a/app/code/Magento/MediaGallerySynchronization/etc/di.xml
+++ b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
@@ -12,8 +12,7 @@
     <type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
         <arguments>
             <argument name="importers" xsi:type="array">
-                <item name="0" xsi:type="object">Magento\MediaGallerySynchronization\Model\ImportMediaAsset</item>
-                <item name="1" xsi:type="object">Magento\MediaGallerySynchronization\Model\ImportImageFileKeywords</item>
+                <item name="10" xsi:type="object">Magento\MediaGallerySynchronization\Model\ImportMediaAsset</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php
similarity index 84%
rename from app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
rename to app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php
index 80b334733ed43..0e11487ecfa73 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaGallerySynchronization\Model;
+namespace Magento\MediaGallerySynchronizationApi\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
@@ -14,7 +14,6 @@
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
-use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
 use Magento\MediaGallerySynchronization\Model\Filesystem\GetFileInfo;
 use Magento\MediaGallerySynchronization\Model\GetContentHash;
 
@@ -43,11 +42,6 @@ class CreateAssetFromFile
      */
     private $getContentHash;
 
-    /**
-     * @var ExtractMetadataInterface
-     */
-    private $extractMetadata;
-
     /**
      * @var GetFileInfo
      */
@@ -58,7 +52,6 @@ class CreateAssetFromFile
      * @param File $driver
      * @param AssetInterfaceFactory $assetFactory
      * @param GetContentHash $getContentHash
-     * @param ExtractMetadataInterface $extractMetadata
      * @param GetFileInfo $getFileInfo
      */
     public function __construct(
@@ -66,14 +59,12 @@ public function __construct(
         File $driver,
         AssetInterfaceFactory $assetFactory,
         GetContentHash $getContentHash,
-        ExtractMetadataInterface $extractMetadata,
         GetFileInfo $getFileInfo
     ) {
         $this->filesystem = $filesystem;
         $this->driver = $driver;
         $this->assetFactory = $assetFactory;
         $this->getContentHash = $getContentHash;
-        $this->extractMetadata = $extractMetadata;
         $this->getFileInfo = $getFileInfo;
     }
 
@@ -90,14 +81,11 @@ public function execute(string $path): AssetInterface
         $file = $this->getFileInfo->execute($absolutePath);
         [$width, $height] = getimagesize($absolutePath);
 
-        $metadata = $this->extractMetadata->execute($absolutePath);
-
         return $this->assetFactory->create(
             [
                 'id' => null,
                 'path' => $path,
-                'title' => $metadata->getTitle() ?: $file->getBasename(),
-                'description' => $metadata->getDescription(),
+                'title' => $file->getBasename(),
                 'width' => $width,
                 'height' => $height,
                 'hash' => $this->getHash($path),
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE.txt b/app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE_AFL.txt b/app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php b/app/code/Magento/MediaGallerySynchronizationMetadata/Model/ImportKeywords.php
similarity index 93%
rename from app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php
rename to app/code/Magento/MediaGallerySynchronizationMetadata/Model/ImportKeywords.php
index 361137ad27686..a9910157f27c7 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/ImportImageFileKeywords.php
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/Model/ImportKeywords.php
@@ -5,12 +5,11 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaGallerySynchronization\Model;
+namespace Magento\MediaGallerySynchronizationMetadata\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
-use Magento\Framework\Filesystem\Driver\File;
 use Magento\MediaGalleryApi\Api\Data\AssetKeywordsInterfaceFactory;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
 use Magento\MediaGalleryApi\Api\Data\KeywordInterfaceFactory;
@@ -22,18 +21,13 @@
 /**
  * import image keywords from file metadata
  */
-class ImportImageFileKeywords implements ImportFilesInterface
+class ImportKeywords implements ImportFilesInterface
 {
     /**
      * @var Filesystem
      */
     private $filesystem;
 
-    /**
-     * @var File
-     */
-    private $driver;
-
     /**
      * @var KeywordInterfaceFactory
      */
@@ -60,7 +54,6 @@ class ImportImageFileKeywords implements ImportFilesInterface
     private $getAssetsByPaths;
 
     /**
-     * @param File $driver
      * @param Filesystem $filesystem
      * @param KeywordInterfaceFactory $keywordFactory
      * @param ExtractMetadataInterface $extractMetadata
@@ -69,7 +62,6 @@ class ImportImageFileKeywords implements ImportFilesInterface
      * @param GetAssetsByPathsInterface $getAssetsByPaths
      */
     public function __construct(
-        File $driver,
         Filesystem $filesystem,
         KeywordInterfaceFactory $keywordFactory,
         ExtractMetadataInterface $extractMetadata,
@@ -77,7 +69,6 @@ public function __construct(
         AssetKeywordsInterfaceFactory $assetKeywordsFactory,
         GetAssetsByPathsInterface $getAssetsByPaths
     ) {
-        $this->driver = $driver;
         $this->filesystem = $filesystem;
         $this->keywordFactory = $keywordFactory;
         $this->extractMetadata = $extractMetadata;
@@ -123,6 +114,7 @@ private function getMetadataKeywords(string $path): ?array
     {
         $metadataKeywords = $this->extractMetadata->execute($this->getMediaDirectory()->getAbsolutePath($path))
             ->getKeywords();
+
         if ($metadataKeywords === null) {
             return null;
         }
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php b/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php
new file mode 100644
index 0000000000000..1f67a871b57ae
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationMetadata\Plugin;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
+use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile;
+
+/**
+ * Add metadata to the asset created from file
+ */
+class CreateAssetFromFileMetadata
+{
+    /**
+     * @var Filesystem
+     */
+    private $filesystem;
+
+    /**
+     * @var AssetInterfaceFactory
+     */
+    private $assetFactory;
+
+    /**
+     * @var ExtractMetadataInterface
+     */
+    private $extractMetadata;
+
+    /**
+     * @param Filesystem $filesystem
+     * @param AssetInterfaceFactory $assetFactory
+     * @param ExtractMetadataInterface $extractMetadata
+     */
+    public function __construct(
+        Filesystem $filesystem,
+        AssetInterfaceFactory $assetFactory,
+        ExtractMetadataInterface $extractMetadata
+    ) {
+        $this->filesystem = $filesystem;
+        $this->assetFactory = $assetFactory;
+        $this->extractMetadata = $extractMetadata;
+    }
+
+    /**
+     * Add metadata to the asset
+     *
+     * @param CreateAssetFromFile $createAssetFromFile
+     * @param AssetInterface $asset
+     * @return AssetInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterExecute(CreateAssetFromFile $createAssetFromFile, AssetInterface $asset): AssetInterface
+    {
+        $metadata = $this->extractMetadata->execute(
+            $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($asset->getPath())
+        );
+
+        return $this->assetFactory->create(
+            [
+                'id' => $asset->getId(),
+                'path' => $asset->getPath(),
+                'title' => $metadata->getTitle() ?: $asset->getTitle(),
+                'description' => $metadata->getDescription(),
+                'width' => $asset->getWidth(),
+                'height' => $asset->getHeight(),
+                'hash' => $asset->getHash(),
+                'size' => $asset->getSize(),
+                'contentType' => $asset->getContentType(),
+                'source' => $asset->getSource()
+            ]
+        );
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/README.md b/app/code/Magento/MediaGallerySynchronizationMetadata/README.md
new file mode 100644
index 0000000000000..64988dd543fe4
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/README.md
@@ -0,0 +1,3 @@
+# Magento_MediaGallerySynchronizationMetadata
+
+The purpose of this module is to include assets metadata to media gallery synchronization process
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json b/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
new file mode 100644
index 0000000000000..0674014026b24
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "magento/module-media-gallery-synchronization-metadata",
+    "description": "Magento module responsible for images metadata synchronization",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-metadata-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*"
+    },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\MediaGallerySynchronizationMetadata\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml b/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml
new file mode 100644
index 0000000000000..c82350f617b5b
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
+        <arguments>
+            <argument name="importers" xsi:type="array">
+                <item name="20" xsi:type="object">Magento\MediaGallerySynchronizationMetadata\Model\ImportKeywords</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile">
+        <plugin name="addMetadataToAssetCreatedFromFile" type="Magento\MediaGallerySynchronizationMetadata\Plugin\CreateAssetFromFileMetadata"/>
+    </type>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/etc/module.xml b/app/code/Magento/MediaGallerySynchronizationMetadata/etc/module.xml
new file mode 100644
index 0000000000000..f92c370496d2d
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/etc/module.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_MediaGallerySynchronizationMetadata"/>
+</config>
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/registration.php b/app/code/Magento/MediaGallerySynchronizationMetadata/registration.php
new file mode 100644
index 0000000000000..82315db519f82
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/registration.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
+    'Magento_MediaGallerySynchronizationMetadata',
+    __DIR__
+);
diff --git a/composer.json b/composer.json
index 25be12b5bb72f..1af86e438882c 100644
--- a/composer.json
+++ b/composer.json
@@ -215,6 +215,7 @@
         "magento/module-media-content-synchronization-api": "*",
         "magento/module-media-content-synchronization-catalog": "*",
         "magento/module-media-content-synchronization-cms": "*",
+        "magento/module-media-gallery-synchronization-metadata": "*",
         "magento/module-media-gallery-metadata": "*",
         "magento/module-media-gallery-metadata-api": "*",
         "magento/module-media-gallery-catalog-ui": "*",
diff --git a/composer.lock b/composer.lock
index 36a42d0c750df..9f079570cc2ac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "197f0388c574f9d40555a95634e439e0",
+    "content-hash": "aadcf8a265dd7ecbb86dd3dd4e49bc28",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -7315,555 +7315,6 @@
             ],
             "time": "2020-06-27T23:57:46+00:00"
         },
-        {
-            "name": "hoa/consistency",
-            "version": "1.17.05.02",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Consistency.git",
-                "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f",
-                "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/exception": "~1.0",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "hoa/stream": "~1.0",
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Consistency\\": "."
-                },
-                "files": [
-                    "Prelude.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Consistency library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "autoloader",
-                "callable",
-                "consistency",
-                "entity",
-                "flex",
-                "keyword",
-                "library"
-            ],
-            "time": "2017-05-02T12:18:12+00:00"
-        },
-        {
-            "name": "hoa/console",
-            "version": "3.17.05.02",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Console.git",
-                "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Console/zipball/e231fd3ea70e6d773576ae78de0bdc1daf331a66",
-                "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/event": "~1.0",
-                "hoa/exception": "~1.0",
-                "hoa/file": "~1.0",
-                "hoa/protocol": "~1.0",
-                "hoa/stream": "~1.0",
-                "hoa/ustring": "~4.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "suggest": {
-                "ext-pcntl": "To enable hoa://Event/Console/Window:resize.",
-                "hoa/dispatcher": "To use the console kit.",
-                "hoa/router": "To use the console kit."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Console\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Console library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "autocompletion",
-                "chrome",
-                "cli",
-                "console",
-                "cursor",
-                "getoption",
-                "library",
-                "option",
-                "parser",
-                "processus",
-                "readline",
-                "terminfo",
-                "tput",
-                "window"
-            ],
-            "time": "2017-05-02T12:26:19+00:00"
-        },
-        {
-            "name": "hoa/event",
-            "version": "1.17.01.13",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Event.git",
-                "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54",
-                "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/exception": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Event\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Event library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "event",
-                "library",
-                "listener",
-                "observer"
-            ],
-            "time": "2017-01-13T15:30:50+00:00"
-        },
-        {
-            "name": "hoa/exception",
-            "version": "1.17.01.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Exception.git",
-                "reference": "091727d46420a3d7468ef0595651488bfc3a458f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f",
-                "reference": "091727d46420a3d7468ef0595651488bfc3a458f",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/event": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Exception\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Exception library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "exception",
-                "library"
-            ],
-            "time": "2017-01-16T07:53:27+00:00"
-        },
-        {
-            "name": "hoa/file",
-            "version": "1.17.07.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/File.git",
-                "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca",
-                "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/event": "~1.0",
-                "hoa/exception": "~1.0",
-                "hoa/iterator": "~2.0",
-                "hoa/stream": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\File\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\File library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "Socket",
-                "directory",
-                "file",
-                "finder",
-                "library",
-                "link",
-                "temporary"
-            ],
-            "time": "2017-07-11T07:42:15+00:00"
-        },
-        {
-            "name": "hoa/iterator",
-            "version": "2.17.01.10",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Iterator.git",
-                "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc",
-                "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/exception": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Iterator\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Iterator library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "iterator",
-                "library"
-            ],
-            "time": "2017-01-10T10:34:47+00:00"
-        },
-        {
-            "name": "hoa/protocol",
-            "version": "1.17.01.14",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Protocol.git",
-                "reference": "5c2cf972151c45f373230da170ea015deecf19e2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2",
-                "reference": "5c2cf972151c45f373230da170ea015deecf19e2",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/exception": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Protocol\\": "."
-                },
-                "files": [
-                    "Wrapper.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Protocol library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "library",
-                "protocol",
-                "resource",
-                "stream",
-                "wrapper"
-            ],
-            "time": "2017-01-14T12:26:10+00:00"
-        },
-        {
-            "name": "hoa/stream",
-            "version": "1.17.02.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Stream.git",
-                "reference": "3293cfffca2de10525df51436adf88a559151d82"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82",
-                "reference": "3293cfffca2de10525df51436adf88a559151d82",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/event": "~1.0",
-                "hoa/exception": "~1.0",
-                "hoa/protocol": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Stream\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Stream library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "Context",
-                "bucket",
-                "composite",
-                "filter",
-                "in",
-                "library",
-                "out",
-                "protocol",
-                "stream",
-                "wrapper"
-            ],
-            "time": "2017-02-21T16:01:06+00:00"
-        },
-        {
-            "name": "hoa/ustring",
-            "version": "4.17.01.16",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hoaproject/Ustring.git",
-                "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0",
-                "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0",
-                "shasum": ""
-            },
-            "require": {
-                "hoa/consistency": "~1.0",
-                "hoa/exception": "~1.0"
-            },
-            "require-dev": {
-                "hoa/test": "~2.0"
-            },
-            "suggest": {
-                "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().",
-                "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()."
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Hoa\\Ustring\\": "."
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Ivan Enderlin",
-                    "email": "ivan.enderlin@hoa-project.net"
-                },
-                {
-                    "name": "Hoa community",
-                    "homepage": "https://hoa-project.net/"
-                }
-            ],
-            "description": "The Hoa\\Ustring library.",
-            "homepage": "https://hoa-project.net/",
-            "keywords": [
-                "library",
-                "search",
-                "string",
-                "unicode"
-            ],
-            "time": "2017-01-16T07:08:25+00:00"
-        },
         {
             "name": "jms/metadata",
             "version": "1.7.0",
@@ -8120,12 +7571,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {
@@ -8236,16 +7681,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.1.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "8a106ea029f222f4354854636861273c7577bee9"
+                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8a106ea029f222f4354854636861273c7577bee9",
-                "reference": "8a106ea029f222f4354854636861273c7577bee9",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8d98efa7434a30ab9e82ef128c430ef8e3a50699",
+                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699",
                 "shasum": ""
             },
             "require": {
@@ -8263,7 +7708,6 @@
                 "ext-intl": "*",
                 "ext-json": "*",
                 "ext-openssl": "*",
-                "hoa/console": "~3.0",
                 "monolog/monolog": "^1.17",
                 "mustache/mustache": "~2.5",
                 "php": "^7.3",
@@ -8323,7 +7767,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-08-19T19:57:27+00:00"
+            "time": "2020-07-09T21:26:19+00:00"
         },
         {
             "name": "mikey179/vfsstream",
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/Model/SynchronizeFilesTest.php b/dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/Model/SynchronizeFilesTest.php
new file mode 100644
index 0000000000000..52e7191a97226
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/Model/SynchronizeFilesTest.php
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationMetadata\Model;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Filesystem\DriverInterface;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+use Magento\MediaGalleryApi\Api\Data\KeywordInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
+use Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsKeywordsInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for SynchronizeFiles.
+ */
+class SynchronizeFilesTest extends TestCase
+{
+    /**
+     * @var DriverInterface
+     */
+    private $driver;
+
+    /**
+     * @var SynchronizeFilesInterface
+     */
+    private $synchronizeFiles;
+
+    /**
+     * @var GetAssetsByPathsInterface
+     */
+    private $getAssetsByPath;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @var GetAssetsKeywordsInterface
+     */
+    private $getAssetKeywords;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->driver = Bootstrap::getObjectManager()->get(DriverInterface::class);
+        $this->synchronizeFiles = Bootstrap::getObjectManager()->get(SynchronizeFilesInterface::class);
+        $this->getAssetsByPath = Bootstrap::getObjectManager()->get(GetAssetsByPathsInterface::class);
+        $this->getAssetKeywords = Bootstrap::getObjectManager()->get(GetAssetsKeywordsInterface::class);
+        $this->mediaDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
+    }
+
+    /**
+     * Test for SynchronizeFiles::execute
+     *
+     * @dataProvider filesProvider
+     * @param null|string $file
+     * @param null|string $title
+     * @param null|string $description
+     * @param null|array $keywords
+     * @throws FileSystemException
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testExecute(
+        ?string $file,
+        ?string $title,
+        ?string $description,
+        ?array $keywords
+    ): void {
+        $path = realpath(__DIR__ . '/../_files/' . $file);
+        $modifiableFilePath = $this->mediaDirectory->getAbsolutePath($file);
+        $this->driver->copy(
+            $path,
+            $modifiableFilePath
+        );
+
+        $this->synchronizeFiles->execute([$file]);
+
+        $loadedAssets = $this->getAssetsByPath->execute([$file])[0];
+        $loadedKeywords = $this->getKeywords($loadedAssets) ?: null;
+
+        $this->assertEquals($title, $loadedAssets->getTitle());
+        $this->assertEquals($description, $loadedAssets->getDescription());
+        $this->assertEquals($keywords, $loadedKeywords);
+
+        $this->driver->deleteFile($modifiableFilePath);
+    }
+
+    /**
+     * Data provider for testExecute
+     *
+     * @return array[]
+     */
+    public function filesProvider(): array
+    {
+        return [
+            [
+                '/magento.jpg',
+                'magento',
+                null,
+                null
+            ],
+            [
+                '/magento_metadata.jpg',
+                'Title of the magento image',
+                'Description of the magento image',
+                [
+                    'magento',
+                    'mediagallerymetadata'
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * Key asset keywords
+     *
+     * @param AssetInterface $asset
+     * @return string[]
+     */
+    private function getKeywords(AssetInterface $asset): array
+    {
+        $assetKeywords = $this->getAssetKeywords->execute([$asset->getId()]);
+
+        if (empty($assetKeywords)) {
+            return [];
+        }
+
+        $keywords = current($assetKeywords)->getKeywords();
+
+        return array_map(
+            function (KeywordInterface $keyword) {
+                return $keyword->getKeyword();
+            },
+            $keywords
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/_files/magento.jpg b/dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/_files/magento.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c377daf8fb0b390d89aa4f6f111715fc9118ca1b
GIT binary patch
literal 55303
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
Hh5vs5{BvNq

literal 0
HcmV?d00001

diff --git a/app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg b/dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/_files/magento_metadata.jpg
similarity index 100%
rename from app/code/Magento/MediaGallerySynchronization/Test/Integration/_files/magento_metadata.jpg
rename to dev/tests/integration/testsuite/Magento/MediaGallerySynchronizationMetadata/_files/magento_metadata.jpg

From 31938d47ce83541bc02edc6667ce4d049cb06ed6 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Wed, 26 Aug 2020 21:19:49 +0100
Subject: [PATCH 302/671] magento/magento2#29761: Added
 CreateAssetFromFileInterface

---
 .../Model/CreateAssetFromFile.php             | 12 +++------
 .../Model/GetAssetFromPath.php                |  8 +++---
 .../MediaGallerySynchronization/etc/di.xml    |  1 +
 .../Model/CreateAssetFromFileInterface.php    | 26 +++++++++++++++++++
 .../composer.json                             |  3 ++-
 .../Plugin/CreateAssetFromFileMetadata.php    |  6 ++---
 .../etc/di.xml                                |  2 +-
 7 files changed, 41 insertions(+), 17 deletions(-)
 rename app/code/Magento/{MediaGallerySynchronizationApi => MediaGallerySynchronization}/Model/CreateAssetFromFile.php (91%)
 create mode 100644 app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFileInterface.php

diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
similarity index 91%
rename from app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php
rename to app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index 0e11487ecfa73..5bfc2fd54ed2a 100644
--- a/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\MediaGallerySynchronizationApi\Model;
+namespace Magento\MediaGallerySynchronization\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
@@ -15,12 +15,12 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGallerySynchronization\Model\Filesystem\GetFileInfo;
-use Magento\MediaGallerySynchronization\Model\GetContentHash;
+use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface;
 
 /**
  * Create media asset object based on the file information
  */
-class CreateAssetFromFile
+class CreateAssetFromFile implements CreateAssetFromFileInterface
 {
     /**
      * @var Filesystem
@@ -69,11 +69,7 @@ public function __construct(
     }
 
     /**
-     * Create and format media asset object
-     *
-     * @param string $path
-     * @return AssetInterface
-     * @throws FileSystemException
+     * @inheridoc
      */
     public function execute(string $path): AssetInterface
     {
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
index ef23e09dfa1fa..be672666786dd 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/GetAssetFromPath.php
@@ -12,7 +12,7 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface;
-use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile;
+use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface;
 
 /**
  * Create media asset object based on the file information
@@ -30,19 +30,19 @@ class GetAssetFromPath
     private $assetFactory;
 
     /**
-     * @var CreateAssetFromFile
+     * @var CreateAssetFromFileInterface
      */
     private $createAssetFromFile;
 
     /**
      * @param AssetInterfaceFactory $assetFactory
      * @param GetAssetsByPathsInterface $getMediaGalleryAssetByPath
-     * @param CreateAssetFromFile $createAssetFromFile
+     * @param CreateAssetFromFileInterface $createAssetFromFile
      */
     public function __construct(
         AssetInterfaceFactory $assetFactory,
         GetAssetsByPathsInterface $getMediaGalleryAssetByPath,
-        CreateAssetFromFile $createAssetFromFile
+        CreateAssetFromFileInterface $createAssetFromFile
     ) {
         $this->assetFactory = $assetFactory;
         $this->getAssetsByPaths = $getMediaGalleryAssetByPath;
diff --git a/app/code/Magento/MediaGallerySynchronization/etc/di.xml b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
index 4b9ffcbe63c76..82bd1303eda74 100644
--- a/app/code/Magento/MediaGallerySynchronization/etc/di.xml
+++ b/app/code/Magento/MediaGallerySynchronization/etc/di.xml
@@ -9,6 +9,7 @@
     <preference for="Magento\MediaGallerySynchronizationApi\Api\SynchronizeInterface" type="Magento\MediaGallerySynchronization\Model\Synchronize"/>
     <preference for="Magento\MediaGallerySynchronizationApi\Model\FetchBatchesInterface" type="Magento\MediaGallerySynchronization\Model\FetchBatches"/>
     <preference for="Magento\MediaGallerySynchronizationApi\Api\SynchronizeFilesInterface" type="Magento\MediaGallerySynchronization\Model\SynchronizeFiles"/>
+    <preference for="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface" type="Magento\MediaGallerySynchronization\Model\CreateAssetFromFile"/>
     <type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
         <arguments>
             <argument name="importers" xsi:type="array">
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFileInterface.php b/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFileInterface.php
new file mode 100644
index 0000000000000..667c2e68a27d8
--- /dev/null
+++ b/app/code/Magento/MediaGallerySynchronizationApi/Model/CreateAssetFromFileInterface.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGallerySynchronizationApi\Model;
+
+use Magento\Framework\Exception\FileSystemException;
+use Magento\MediaGalleryApi\Api\Data\AssetInterface;
+
+/**
+ * Create media asset object from the media file
+ */
+interface CreateAssetFromFileInterface
+{
+    /**
+     * Create media asset object from the media file
+     *
+     * @param string $path
+     * @return AssetInterface
+     * @throws FileSystemException
+     */
+    public function execute(string $path): AssetInterface;
+}
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/composer.json b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
index 427bd2bd4aca7..19bab75dd5f42 100644
--- a/app/code/Magento/MediaGallerySynchronizationApi/composer.json
+++ b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
@@ -3,7 +3,8 @@
     "description": "Magento module responsible for the media gallery synchronization implementation API",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php b/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php
index 1f67a871b57ae..59604c0b3e501 100644
--- a/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/Plugin/CreateAssetFromFileMetadata.php
@@ -12,7 +12,7 @@
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
 use Magento\MediaGalleryMetadataApi\Api\ExtractMetadataInterface;
-use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile;
+use Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface;
 
 /**
  * Add metadata to the asset created from file
@@ -52,12 +52,12 @@ public function __construct(
     /**
      * Add metadata to the asset
      *
-     * @param CreateAssetFromFile $createAssetFromFile
+     * @param CreateAssetFromFileInterface $subject
      * @param AssetInterface $asset
      * @return AssetInterface
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterExecute(CreateAssetFromFile $createAssetFromFile, AssetInterface $asset): AssetInterface
+    public function afterExecute(CreateAssetFromFileInterface $subject, AssetInterface $asset): AssetInterface
     {
         $metadata = $this->extractMetadata->execute(
             $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath($asset->getPath())
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml b/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml
index c82350f617b5b..ed66fd08cabfc 100644
--- a/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/etc/di.xml
@@ -13,7 +13,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFile">
+    <type name="Magento\MediaGallerySynchronizationApi\Model\CreateAssetFromFileInterface">
         <plugin name="addMetadataToAssetCreatedFromFile" type="Magento\MediaGallerySynchronizationMetadata\Plugin\CreateAssetFromFileMetadata"/>
     </type>
 </config>

From 08f1648d3eadfe046fa9bfaebb28f1c9da0c59f0 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 27 Aug 2020 17:48:12 +0100
Subject: [PATCH 303/671] Fixed typo

---
 .../MediaGallerySynchronization/Model/CreateAssetFromFile.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index 5bfc2fd54ed2a..b4c360c3e0538 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -69,7 +69,7 @@ public function __construct(
     }
 
     /**
-     * @inheridoc
+     * @inheritdoc
      */
     public function execute(string $path): AssetInterface
     {

From 9ce2ba54138a98edd7e7e59362116adafce9432d Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Thu, 27 Aug 2020 19:56:06 +0800
Subject: [PATCH 304/671] magento/adobe-stock-integration#1783: Change the
 position of the main action buttons on View Details - change button order

---
 .../view/adminhtml/templates/image_details.phtml     | 12 ++++++------
 .../templates/image_details_standalone.phtml         | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
index ba2033478afa1..a6da20a255192 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
@@ -74,12 +74,6 @@ use Magento\Framework\Escaper;
                         "imageModelName" : "media_gallery_listing.media_gallery_listing.media_gallery_columns.thumbnail_url",
                         "mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
                         "actionsList": [
-                            {
-                                "title": "<?= $escaper->escapeJs(__('Edit Details')); ?>",
-                                "handler": "editImageAction",
-                                "name": "edit",
-                                "classes": "action-default scalable edit action-quaternary"
-                            },
                             {
                                 "title": "<?= $escaper->escapeJs(__('Cancel')); ?>",
                                 "handler": "closeModal",
@@ -92,6 +86,12 @@ use Magento\Framework\Escaper;
                                 "name": "delete",
                                 "classes": "action-default scalable delete action-quaternary"
                             },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Edit Details')); ?>",
+                                "handler": "editImageAction",
+                                "name": "edit",
+                                "classes": "action-default scalable edit action-quaternary"
+                            },
                             {
                                 "title": "<?= $escaper->escapeJs(__('Add Image')); ?>",
                                 "handler": "addImage",
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
index 9fc0e749ac888..288a2eaee5221 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
@@ -72,12 +72,6 @@ use Magento\Backend\Block\Template;
                         "mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
                         "imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",
                         "actionsList": [
-                            {
-                                "title": "<?= $escaper->escapeJs(__('Edit Details')); ?>",
-                                "handler": "editImageAction",
-                                "name": "edit",
-                                "classes": "action-default scalable edit action-quaternary"
-                            },
                             {
                                 "title": "<?= $escaper->escapeJs(__('Cancel')); ?>",
                                 "handler": "closeModal",
@@ -89,6 +83,12 @@ use Magento\Backend\Block\Template;
                                 "handler": "deleteImageAction",
                                 "name": "delete",
                                 "classes": "action-default scalable delete action-quaternary"
+                            },
+                            {
+                                "title": "<?= $escaper->escapeJs(__('Edit Details')); ?>",
+                                "handler": "editImageAction",
+                                "name": "edit",
+                                "classes": "action-default scalable edit action-quaternary"
                             }
                         ]
                     }

From c561c96d31880b74afc0e5d3ab3fea3811edcefb Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 19:07:10 +0300
Subject: [PATCH 305/671] Fix filter placeholders for ui-select filter
 (frontend implementation)

---
 .../Adminhtml/Product/GetSelected.php         |  82 +++++++------
 .../web/js/components/product-ui-select.js    |   3 +
 .../Listing/Filters/UsedInProducts.php        | 115 ------------------
 .../media_gallery_category_listing.xml        |   3 +-
 .../ui_component/media_gallery_listing.xml    |   3 +-
 .../standalone_media_gallery_listing.xml      |   3 +-
 .../Adminhtml/Block/GetSelected.php           |  83 +++++++++++++
 .../Controller/Adminhtml/Page/GetSelected.php |  83 +++++++++++++
 .../Listing/Filters/UsedInBlocks.php          | 115 ------------------
 .../Component/Listing/Filters/UsedInPages.php | 114 -----------------
 .../ui_component/media_gallery_listing.xml    |   6 +-
 .../standalone_media_gallery_listing.xml      |   8 +-
 .../Adminhtml/Asset/GetSelected.php           |  99 +++++++++++++++
 .../Ui/Component/Listing/Filters/Asset.php    | 112 +----------------
 .../ui_component/cms_block_listing.xml        |   3 +-
 .../ui_component/cms_page_listing.xml         |   3 +-
 .../ui_component/product_listing.xml          |   3 +-
 17 files changed, 333 insertions(+), 505 deletions(-)
 delete mode 100644 app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php
 delete mode 100644 app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
 delete mode 100644 app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
index 841715180a229..c6e39b048c40b 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
@@ -8,67 +8,77 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Backend\App\Action;
 
-/** Returns information about selected product by product id. Returns empty array if product don't exist */
-class GetSelected extends \Magento\Backend\App\Action
+/**
+ * Returns  selected product by product id. for ui-select filter
+ */
+class GetSelected extends Action implements HttpGetActionInterface
 {
     /**
-     * Authorization level of a basic admin session
-     *
      * @see _isAllowed()
      */
     const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var JsonFactory
      */
     private $resultJsonFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
+     * @var ProductRepositoryInterface
      */
-    private $productCollectionFactory;
+    private $productRepository;
 
     /**
-     * Search constructor.
-     * @param \Magento\Framework\Controller\Result\JsonFactory $jsonFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
-     * @param \Magento\Backend\App\Action\Context $context
+     *  GetSelected constructor.
+     *
+     * @param JsonFactory $jsonFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param Context $context
      */
     public function __construct(
-        \Magento\Framework\Controller\Result\JsonFactory $jsonFactory,
-        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-        \Magento\Backend\App\Action\Context $context
+        JsonFactory $jsonFactory,
+        ProductRepositoryInterface $productRepository,
+        Context $context
     ) {
         $this->resultJsonFactory = $jsonFactory;
-        $this->productCollectionFactory = $productCollectionFactory;
+        $this->productRepository = $productRepository;
         parent::__construct($context);
     }
 
     /**
-     * @return \Magento\Framework\Controller\ResultInterface
+     *
+     * @return ResultInterface
      */
-    public function execute() : \Magento\Framework\Controller\ResultInterface
+    public function execute() : ResultInterface
     {
-        $productId = $this->getRequest()->getParam('productId');
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
-        $productCollection = $this->productCollectionFactory->create();
-        $productCollection->addAttributeToSelect(ProductInterface::NAME);
-        $productCollection->addIdFilter($productId);
-        $option = [];
-        /** @var ProductInterface $product */
-        if (!empty($productCollection->getFirstItem()->getData())) {
-            $product = $productCollection->getFirstItem();
-            $option = [
-                'value' => $productId,
-                'label' => $product->getName(),
-                'is_active' => $product->getStatus(),
-                'path' => $product->getSku(),
-            ];
+        $productIds = $this->getRequest()->getParam('ids');
+        $options = [];
+
+
+        if (!is_array($productIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
         }
-        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
-        $resultJson = $this->resultJsonFactory->create();
-        return $resultJson->setData($option);
+        foreach ($productIds as $id) {
+            try {
+                $product = $this->productRepository->getById($id);
+                $options[] = [
+                    'value' => $product->getId(),
+                    'label' => $product->getName(),
+                    'is_active' => $product->getSatus(),
+                    'path' => $product->getSku()
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
     }
 }
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js b/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js
index fb7ea7a5bcd69..c04daf07db3dd 100644
--- a/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js
+++ b/app/code/Magento/Catalog/view/adminhtml/web/js/components/product-ui-select.js
@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated see Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+ */
 define([
     'Magento_Ui/js/form/element/ui-select',
     'jquery',
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php b/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
deleted file mode 100644
index d86617e12b8f8..0000000000000
--- a/app/code/Magento/MediaGalleryCatalogUi/Ui/Component/Listing/Filters/UsedInProducts.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters;
-
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Data\OptionSourceInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Ui\Component\Filters\FilterModifier;
-use Magento\Ui\Component\Filters\Type\Select;
-use Magento\Ui\Api\BookmarkManagementInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-
-/**
- * Used in products filter
- */
-class UsedInProducts extends Select
-{
-    /**
-     * @var BookmarkManagementInterface
-     */
-    private $bookmarkManagement;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
-    /**
-     * Constructor
-     *
-     * @param ContextInterface $context
-     * @param UiComponentFactory $uiComponentFactory
-     * @param FilterBuilder $filterBuilder
-     * @param FilterModifier $filterModifier
-     * @param OptionSourceInterface $optionsProvider
-     * @param BookmarkManagementInterface $bookmarkManagement
-     * @param ProductRepositoryInterface $productRepository
-     * @param array $components
-     * @param array $data
-     */
-    public function __construct(
-        ContextInterface $context,
-        UiComponentFactory $uiComponentFactory,
-        FilterBuilder $filterBuilder,
-        FilterModifier $filterModifier,
-        OptionSourceInterface $optionsProvider = null,
-        BookmarkManagementInterface $bookmarkManagement,
-        ProductRepositoryInterface $productRepository,
-        array $components = [],
-        array $data = []
-    ) {
-        $this->uiComponentFactory = $uiComponentFactory;
-        $this->filterBuilder = $filterBuilder;
-        parent::__construct(
-            $context,
-            $uiComponentFactory,
-            $filterBuilder,
-            $filterModifier,
-            $optionsProvider,
-            $components,
-            $data
-        );
-        $this->bookmarkManagement = $bookmarkManagement;
-        $this->productRepository = $productRepository;
-    }
-
-    /**
-     * Prepare component configuration
-     *
-     * @return void
-     */
-    public function prepare()
-    {
-        $options = [];
-        $productIds = [];
-        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
-            'current',
-            $this->context->getNameSpace()
-        );
-        if ($bookmark === null) {
-            parent::prepare();
-            return;
-        }
-
-        $applied = $bookmark->getConfig()['current']['filters']['applied'];
-
-        if (isset($applied[$this->getName()])) {
-            $productIds = $applied[$this->getName()];
-        }
-
-        foreach ($productIds as $id) {
-            try {
-                $product = $this->productRepository->getById($id);
-                $options[] = [
-                    'value' => $id,
-                    'label' => $product->getName(),
-                    'is_active' => $product->getStatus(),
-                    'path' => $product->getSku(),
-                    'optgroup' => false
-                ];
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-        $this->optionsProvider = $options;
-        parent::prepare();
-    }
-}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
index e12d90b95303b..17fe33e5b2bf5 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
@@ -58,7 +58,7 @@
                 provider="${ $.parentName }"
                 sortOrder="10"
                 class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
-                component="Magento_Ui/js/form/element/ui-select"
+                component="Magento_Ui/js/grid/filters/elements/ui-select"
                 template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -74,6 +74,7 @@
                         <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
                         <item name="searchOptions" xsi:type="boolean">true</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
+                        <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                     </item>
                 </argument>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
index 2ca58b6020fa7..a5491e3450451 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -13,8 +13,7 @@
                     name="product_id"
                     provider="${ $.parentName }"
                     sortOrder="110"
-                    class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters\UsedInProducts"
-                    component="Magento_Catalog/js/components/product-ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index 2ca58b6020fa7..a5491e3450451 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -13,8 +13,7 @@
                     name="product_id"
                     provider="${ $.parentName }"
                     sortOrder="110"
-                    class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Filters\UsedInProducts"
-                    component="Magento_Catalog/js/components/product-ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
diff --git a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php
new file mode 100644
index 0000000000000..a8beeb791f74a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCmsUi\Controller\Adminhtml\Block;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Api\BlockRepositoryInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller to get selected block for ui-select component
+ */
+class GetSelected extends Action implements HttpGetActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Cms::block';
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var BlockRepositoryInterface
+     */
+    private $blockRepository;
+
+    /**
+     * @param JsonFactory $resultFactory
+     * @param BlockRepositoryInterface $blockRepository
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $resultFactory,
+        BlockRepositoryInterface $blockRepository,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->blockRepository = $blockRepository;
+        parent::__construct($context);
+    }
+
+    /**
+     * Execute pages search.
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        $options = [];
+        $blockIds = $this->getRequest()->getParam('ids');
+
+        if (!is_array($blockIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        }
+        foreach ($blockIds as $id) {
+            try {
+                $block = $this->blockRepository->getById($id);
+                $options[] = [
+                    'value' => $block->getId(),
+                    'label' => $block->getTitle(),
+                    'is_active' => $block->isActive(),
+                    'optgroup' => false
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php
new file mode 100644
index 0000000000000..33f87b93c01e1
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCmsUi\Controller\Adminhtml\Page;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+
+/**
+ * Controller to get selected page for ui-select component
+ */
+class GetSelected extends Action implements HttpGetActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Cms::page';
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var PageRepositoryInterface
+     */
+    private $pageRepository;
+
+    /**
+     * @param JsonFactory $resultFactory
+     * @param PageRepositoryInterface $pageRepository
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $resultFactory,
+        PageRepositoryInterface $pageRepository,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->pageRepository = $pageRepository;
+        parent::__construct($context);
+    }
+
+    /**
+     * Execute pages search.
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        $options = [];
+        $pageIds = $this->getRequest()->getParam('ids');
+
+        if (!is_array($pageIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        }
+        foreach ($pageIds as $id) {
+            try {
+                $page = $this->pageRepository->getById($id);
+                $options[] = [
+                    'value' => $page->getId(),
+                    'label' => $page->getTitle(),
+                    'is_active' => $page->isActive(),
+                    'optgroup' => false
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
deleted file mode 100644
index 66f8caa71d70a..0000000000000
--- a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInBlocks.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters;
-
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Data\OptionSourceInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Ui\Component\Filters\FilterModifier;
-use Magento\Ui\Component\Filters\Type\Select;
-use Magento\Ui\Api\BookmarkManagementInterface;
-use Magento\Cms\Api\BlockRepositoryInterface;
-
-/**
- * Used in blocks filter
- */
-class UsedInBlocks extends Select
-{
-    /**
-     * @var BookmarkManagementInterface
-     */
-    private $bookmarkManagement;
-
-    /**
-     * @var BlockRepositoryInterface
-     */
-    private $blockRepository;
-
-    /**
-     * Constructor
-     *
-     * @param ContextInterface $context
-     * @param UiComponentFactory $uiComponentFactory
-     * @param FilterBuilder $filterBuilder
-     * @param FilterModifier $filterModifier
-     * @param OptionSourceInterface $optionsProvider
-     * @param BookmarkManagementInterface $bookmarkManagement
-     * @param BlockRepositoryInterface $blockRepository
-     * @param array $components
-     * @param array $data
-     */
-    public function __construct(
-        ContextInterface $context,
-        UiComponentFactory $uiComponentFactory,
-        FilterBuilder $filterBuilder,
-        FilterModifier $filterModifier,
-        OptionSourceInterface $optionsProvider = null,
-        BookmarkManagementInterface $bookmarkManagement,
-        BlockRepositoryInterface $blockRepository,
-        array $components = [],
-        array $data = []
-    ) {
-        $this->uiComponentFactory = $uiComponentFactory;
-        $this->filterBuilder = $filterBuilder;
-        parent::__construct(
-            $context,
-            $uiComponentFactory,
-            $filterBuilder,
-            $filterModifier,
-            $optionsProvider,
-            $components,
-            $data
-        );
-        $this->bookmarkManagement = $bookmarkManagement;
-        $this->blockRepository = $blockRepository;
-    }
-
-    /**
-     * Prepare component configuration
-     *
-     * @return void
-     */
-    public function prepare()
-    {
-        $options = [];
-        $blockIds = [];
-        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
-            'current',
-            $this->context->getNameSpace()
-        );
-        if ($bookmark === null) {
-            parent::prepare();
-            return;
-        }
-
-        $applied = $bookmark->getConfig()['current']['filters']['applied'];
-
-        if (isset($applied[$this->getName()])) {
-            $blockIds = $applied[$this->getName()];
-        }
-
-        foreach ($blockIds as $id) {
-            try {
-                $block = $this->blockRepository->getById($id);
-                $options[] = [
-                    'value' => $id,
-                    'label' => $block->getTitle(),
-                    'is_active' => $block->isActive(),
-                    'optgroup' => false
-                ];
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-
-        $this->optionsProvider = $options;
-        parent::prepare();
-    }
-}
diff --git a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php b/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
deleted file mode 100644
index 78ab1b63d32d1..0000000000000
--- a/app/code/Magento/MediaGalleryCmsUi/Ui/Component/Listing/Filters/UsedInPages.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-declare(strict_types=1);
-
-namespace Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters;
-
-use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\Data\OptionSourceInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
-use Magento\Framework\View\Element\UiComponentFactory;
-use Magento\Ui\Component\Filters\FilterModifier;
-use Magento\Ui\Component\Filters\Type\Select;
-use Magento\Ui\Api\BookmarkManagementInterface;
-use Magento\Cms\Api\PageRepositoryInterface;
-
-/**
- * Used in pages filter
- */
-class UsedInPages extends Select
-{
-    /**
-     * @var BookmarkManagementInterface
-     */
-    private $bookmarkManagement;
-
-    /**
-     * @var PageRepositoryInterface
-     */
-    private $pageRepository;
-
-    /**
-     * Constructor
-     *
-     * @param ContextInterface $context
-     * @param UiComponentFactory $uiComponentFactory
-     * @param FilterBuilder $filterBuilder
-     * @param FilterModifier $filterModifier
-     * @param OptionSourceInterface $optionsProvider
-     * @param BookmarkManagementInterface $bookmarkManagement
-     * @param PageRepositoryInterface $pageRepository
-     * @param array $components
-     * @param array $data
-     */
-    public function __construct(
-        ContextInterface $context,
-        UiComponentFactory $uiComponentFactory,
-        FilterBuilder $filterBuilder,
-        FilterModifier $filterModifier,
-        OptionSourceInterface $optionsProvider = null,
-        BookmarkManagementInterface $bookmarkManagement,
-        PageRepositoryInterface $pageRepository,
-        array $components = [],
-        array $data = []
-    ) {
-        $this->uiComponentFactory = $uiComponentFactory;
-        $this->filterBuilder = $filterBuilder;
-        parent::__construct(
-            $context,
-            $uiComponentFactory,
-            $filterBuilder,
-            $filterModifier,
-            $optionsProvider,
-            $components,
-            $data
-        );
-        $this->bookmarkManagement = $bookmarkManagement;
-        $this->pageRepository = $pageRepository;
-    }
-
-    /**
-     * Prepare component configuration
-     *
-     * @return void
-     */
-    public function prepare()
-    {
-        $options = [];
-        $pageIds = [];
-        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
-            'current',
-            $this->context->getNameSpace()
-        );
-        if ($bookmark === null) {
-            parent::prepare();
-             return;
-        }
-
-        $applied = $bookmark->getConfig()['current']['filters']['applied'];
-
-        if (isset($applied[$this->getName()])) {
-            $pageIds = $applied[$this->getName()];
-        }
-
-        foreach ($pageIds as $id) {
-            try {
-                $page = $this->pageRepository->getById($id);
-                $options[] = [
-                    'value' => $id,
-                    'label' => $page->getTitle(),
-                    'is_active' => $page->isActive(),
-                    'optgroup' => false
-                ];
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-        $this->optionsProvider = $options;
-        parent::prepare();
-    }
-}
diff --git a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
index 506a6cad5b68e..402866852711d 100644
--- a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -14,7 +14,7 @@
                     provider="${ $.parentName }"
                     sortOrder="120"
                     class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInPages"
-                    component="Magento_Ui/js/form/element/ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -27,6 +27,7 @@
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find pages</item>
                         <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_cms/page/getSelected"/>
                     </item>
                 </argument>
                 <settings>
@@ -39,7 +40,7 @@
                     provider="${ $.parentName }"
                     sortOrder="130"
                     class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInBlocks"
-                    component="Magento_Ui/js/form/element/ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -52,6 +53,7 @@
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find blocks</item>
                         <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_cms/block/getSelected"/>
                     </item>
                 </argument>
                 <settings>
diff --git a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index 506a6cad5b68e..e49ba7a98c8ce 100644
--- a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -13,8 +13,7 @@
                     name="page_id"
                     provider="${ $.parentName }"
                     sortOrder="120"
-                    class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInPages"
-                    component="Magento_Ui/js/form/element/ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -27,6 +26,7 @@
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find pages</item>
                         <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_cms/page/getSelected"/>
                     </item>
                 </argument>
                 <settings>
@@ -38,8 +38,7 @@
                     name="block_id"
                     provider="${ $.parentName }"
                     sortOrder="130"
-                    class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInBlocks"
-                    component="Magento_Ui/js/form/element/ui-select"
+                    component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -52,6 +51,7 @@
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find blocks</item>
                         <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_cms/block/getSelected"/>
                     </item>
                 </argument>
                 <settings>
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php
new file mode 100644
index 0000000000000..725c67185ce77
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Controller\Adminhtml\Asset;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\Controller\ResultInterface;
+use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
+use Magento\Cms\Helper\Wysiwyg\Images;
+use Magento\Cms\Model\Wysiwyg\Images\Storage;
+
+/**
+ * Controller to get selected asset for ui-select component
+ */
+class GetSelected extends Action implements HttpGetActionInterface
+{
+    /**
+     * Authorization level of a basic admin session
+     *
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var GetAssetsByIdsInterface
+     */
+    private $getAssetById;
+
+    /**
+     * @var Images
+     */
+    private $images;
+
+    /**
+     * @var Storage
+     */
+    private $storage;
+
+    /**
+     * @param JsonFactory $resultFactory
+     * @param GetAssetsByIdsInterface $getAssetById
+     * @param Context $context
+     * @param Images $images
+     * @param Storage $storage
+     *
+     */
+    public function __construct(
+        JsonFactory $resultFactory,
+        GetAssetsByIdsInterface $getAssetById,
+        Context $context,
+        Images $images,
+        Storage $storage
+    ) {
+        $this->resultJsonFactory = $resultFactory;
+        $this->getAssetById = $getAssetById;
+        $this->images = $images;
+        $this->storage = $storage;
+        parent::__construct($context);
+    }
+
+    /**
+     * Execute pages search.
+     *
+     * @return ResultInterface
+     */
+    public function execute(): ResultInterface
+    {
+        $options = [];
+        $assetIds = $this->getRequest()->getParam('ids');
+
+        if (!is_array($assetIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        }
+        $assets = $this->getAssetById->execute($assetIds);
+
+        foreach ($assets as $asset) {
+            $assetPath = $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath());
+            $options[] = [
+                'value' => (string) $asset->getId(),
+                'label' => $asset->getTitle(),
+                'src' => $assetPath
+            ];
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
index e8dc232584adb..190a99cac55b6 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
@@ -16,9 +16,6 @@
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
 use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
-use Magento\Cms\Helper\Wysiwyg\Images;
-use Magento\Cms\Model\Wysiwyg\Images\Storage;
-use Magento\Ui\Api\BookmarkManagementInterface;
 
 /**
  * Asset filter
@@ -35,21 +32,6 @@ class Asset extends Select
      */
     private $getAssetsByIds;
 
-    /**
-     * @var Images
-     */
-    private $images;
-
-    /**
-     * @var Storage
-     */
-    private $storage;
-
-    /**
-     * @var BookmarkManagementInterface
-     */
-    private $bookmarkManagement;
-
     /**
      * Constructor
      *
@@ -58,11 +40,6 @@ class Asset extends Select
      * @param FilterBuilder $filterBuilder
      * @param FilterModifier $filterModifier
      * @param OptionSourceInterface $optionsProvider
-     * @param GetContentByAssetIdsInterface $getContentIdentities
-     * @param GetAssetsByIdsInterface $getAssetsByIds
-     * @param BookmarkManagementInterface $bookmarkManagement
-     * @param Images $images
-     * @param Storage $storage
      * @param array $components
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -74,10 +51,6 @@ public function __construct(
         FilterModifier $filterModifier,
         OptionSourceInterface $optionsProvider = null,
         GetContentByAssetIdsInterface $getContentIdentities,
-        GetAssetsByIdsInterface $getAssetsByIds,
-        BookmarkManagementInterface $bookmarkManagement,
-        Images $images,
-        Storage $storage,
         array $components = [],
         array $data = []
     ) {
@@ -93,89 +66,6 @@ public function __construct(
             $data
         );
         $this->getContentIdentities = $getContentIdentities;
-        $this->getAssetsByIds = $getAssetsByIds;
-        $this->bookmarkManagement = $bookmarkManagement;
-        $this->images = $images;
-        $this->storage = $storage;
-    }
-
-    /**
-     * Prepare component configuration
-     *
-     * @return void
-     */
-    public function prepare()
-    {
-        $options = [];
-        $assetIds = $this->getAssetIds();
-
-        if (empty($assetIds)) {
-            parent::prepare();
-            return;
-        }
-
-        $assets = $this->getAssetsByIds->execute($assetIds);
-
-        foreach ($assets as $asset) {
-            $assetPath = $this->storage->getThumbnailUrl($this->images->getStorageRoot() . $asset->getPath());
-            $options[] = [
-                'value' => (string) $asset->getId(),
-                'label' => $asset->getTitle(),
-                'src' => $assetPath
-            ];
-        }
-
-        $this->optionsProvider = $options;
-        parent::prepare();
-    }
-
-    /**
-     * Get asset ids from filterData or from bookmarks
-     */
-    private function getAssetIds(): array
-    {
-        $assetIds = [];
-
-        if (isset($this->filterData[$this->getName()])) {
-            $assetIds = $this->filterData[$this->getName()];
-
-            if (!is_array($assetIds)) {
-                $assetIds = $this->stringToArray($assetIds);
-            }
-
-            return $assetIds;
-        }
-
-        $bookmark = $this->bookmarkManagement->getByIdentifierNamespace(
-            'current',
-            $this->context->getNameSpace()
-        );
-
-        if ($bookmark === null) {
-            return $assetIds;
-        }
-
-        $applied = $bookmark->getConfig()['current']['filters']['applied'];
-
-        if (isset($applied[$this->getName()])) {
-            $assetIds = $applied[$this->getName()];
-        }
-
-        if (!is_array($assetIds)) {
-            $assetIds = $this->stringToArray($assetIds);
-        }
-
-        return $assetIds;
-    }
-
-    /**
-     * Converts string array from url-applier to array
-     *
-     * @param string $string
-     */
-    private function stringToArray(string $string): array
-    {
-        return explode(',', str_replace(['[', ']'], '', $string));
     }
 
     /**
@@ -191,7 +81,7 @@ public function applyFilter()
 
         $assetIds = $this->filterData[$this->getName()];
         if (!is_array($assetIds)) {
-            $assetIds = $this->stringToArray($assetIds);
+            $assetIds = explode(',', str_replace(['[', ']'], '', $assetIds));
         }
 
         $filter = $this->filterBuilder->setConditionType('in')
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
index 86c8590bb4860..20988fad5ff35 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_block_listing.xml
@@ -13,7 +13,7 @@
                 provider="${ $.parentName }"
                 sortOrder="10"
                 class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
-                component="Magento_Ui/js/form/element/ui-select"
+                component="Magento_Ui/js/grid/filters/elements/ui-select"
                 template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -24,6 +24,7 @@
                         <item name="searchOptions" xsi:type="boolean">true</item>
                         <item name="filterOptions" xsi:type="boolean">true</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
+                        <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                     </item>
                 </argument>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
index 58881a8c9de6c..4abeb71679bde 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/cms_page_listing.xml
@@ -13,7 +13,7 @@
                 provider="${ $.parentName }"
                 sortOrder="10"
                 class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
-                component="Magento_Ui/js/form/element/ui-select"
+                component="Magento_Ui/js/grid/filters/elements/ui-select"
                 template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -24,6 +24,7 @@
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
+                        <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                     </item>
                 </argument>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
index 2b7d9fde3b9ff..4634652e9cc19 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/product_listing.xml
@@ -13,7 +13,7 @@
                 provider="${ $.parentName }"
                 sortOrder="10"
                 class="Magento\MediaGalleryUi\Ui\Component\Listing\Filters\Asset"
-                component="Magento_Ui/js/form/element/ui-select"
+                component="Magento_Ui/js/grid/filters/elements/ui-select"
                 template="Magento_MediaGalleryUi/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
                     <item name="config" xsi:type="array">
@@ -24,6 +24,7 @@
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
                         <item name="searchUrl" xsi:type="url" path="media_gallery/asset/search" />
+                        <item name="validationUrl" xsi:type="url" path="media_gallery/asset/getSelected"/>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                     </item>
                 </argument>

From 301ec2ee51dd277cb74abe8a95f4567435597c76 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 19:12:51 +0300
Subject: [PATCH 306/671] Introduce ui-select filter with validation init
 values

---
 .../web/js/grid/filters/elements/ui-select.js | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
new file mode 100644
index 0000000000000..c45ec348103c1
--- /dev/null
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
@@ -0,0 +1,82 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_Ui/js/form/element/ui-select',
+    'jquery',
+    'underscore'
+], function (Select, $, _) {
+    'use strict';
+
+    return Select.extend({
+        defaults: {
+            bookmarkProvider: 'ns = ${ $.ns }, index = bookmarks',
+            filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
+            validationUrl: false,
+            loadedOption: [],
+            validationLoading: true,
+            imports: {
+                activeIndex: '${ $.bookmarkProvider }:activeIndex'
+            },
+            modules: {
+                filterChips: '${ $.filterChipsProvider }'
+            },
+            listens: {
+                activeIndex: 'validateInitialValue'
+            }
+
+        },
+
+        /** @inheritdoc */
+        initialize: function () {
+            this._super();
+
+            this.validateInitialValue();
+
+            return this;
+        },
+
+        /**
+         * Validate initial value actually exists
+         */
+        validateInitialValue: function () {
+            if (!_.isEmpty(this.value())) {
+                $.ajax({
+                    url: this.validationUrl,
+                    type: 'GET',
+                    dataType: 'json',
+                    context: this,
+                    data: {
+                        ids: this.value()
+                    },
+
+                    /** @param {Object} response */
+                    success: function (response) {
+                        if (!_.isEmpty(response)) {
+                            this.options([]);
+                            this.success({
+                                options: response
+                            });
+                        }
+                        this.filterChips().updateActive();
+                    },
+
+                    /** set empty array if error occurs */
+                    error: function () {
+                        this.options([]);
+                    },
+
+                    /** stop loader */
+                    complete: function () {
+                        this.validationLoading(false);
+                        this.setCaption();
+                    }
+                });
+            } else {
+                this.validationLoading(false);
+            }
+        }
+    });
+});

From 4850009a4c7f7ce8e2277366e85d859c78bc62a3 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 22:03:46 +0300
Subject: [PATCH 307/671] Codereview suggestions, static test fixes

---
 .../Adminhtml/Product/GetSelected.php         | 82 ++++++++----------
 .../Adminhtml/Product/GetSelected.php         | 84 +++++++++++++++++++
 .../ui_component/media_gallery_listing.xml    |  2 +-
 .../standalone_media_gallery_listing.xml      |  2 +-
 .../ui_component/media_gallery_listing.xml    |  2 -
 .../Ui/Component/Listing/Filters/Asset.php    |  7 +-
 .../web/js/grid/filters/elements/ui-select.js | 65 +++++++-------
 7 files changed, 157 insertions(+), 87 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
index c6e39b048c40b..841715180a229 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/GetSelected.php
@@ -8,77 +8,67 @@
 
 namespace Magento\Catalog\Controller\Adminhtml\Product;
 
-use Magento\Framework\Controller\ResultInterface;
-use Magento\Backend\App\Action\Context;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Controller\Result\JsonFactory;
-use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Backend\App\Action;
+use Magento\Catalog\Api\Data\ProductInterface;
 
-/**
- * Returns  selected product by product id. for ui-select filter
- */
-class GetSelected extends Action implements HttpGetActionInterface
+/** Returns information about selected product by product id. Returns empty array if product don't exist */
+class GetSelected extends \Magento\Backend\App\Action
 {
     /**
+     * Authorization level of a basic admin session
+     *
      * @see _isAllowed()
      */
     const ADMIN_RESOURCE = 'Magento_Catalog::products';
 
     /**
-     * @var JsonFactory
+     * @var \Magento\Framework\Controller\Result\JsonFactory
      */
     private $resultJsonFactory;
 
     /**
-     * @var ProductRepositoryInterface
+     * @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory
      */
-    private $productRepository;
+    private $productCollectionFactory;
 
     /**
-     *  GetSelected constructor.
-     *
-     * @param JsonFactory $jsonFactory
-     * @param ProductRepositoryInterface $productRepository
-     * @param Context $context
+     * Search constructor.
+     * @param \Magento\Framework\Controller\Result\JsonFactory $jsonFactory
+     * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\Backend\App\Action\Context $context
      */
     public function __construct(
-        JsonFactory $jsonFactory,
-        ProductRepositoryInterface $productRepository,
-        Context $context
+        \Magento\Framework\Controller\Result\JsonFactory $jsonFactory,
+        \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
+        \Magento\Backend\App\Action\Context $context
     ) {
         $this->resultJsonFactory = $jsonFactory;
-        $this->productRepository = $productRepository;
+        $this->productCollectionFactory = $productCollectionFactory;
         parent::__construct($context);
     }
 
     /**
-     *
-     * @return ResultInterface
+     * @return \Magento\Framework\Controller\ResultInterface
      */
-    public function execute() : ResultInterface
+    public function execute() : \Magento\Framework\Controller\ResultInterface
     {
-        $productIds = $this->getRequest()->getParam('ids');
-        $options = [];
-
-
-        if (!is_array($productIds)) {
-            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        $productId = $this->getRequest()->getParam('productId');
+        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addAttributeToSelect(ProductInterface::NAME);
+        $productCollection->addIdFilter($productId);
+        $option = [];
+        /** @var ProductInterface $product */
+        if (!empty($productCollection->getFirstItem()->getData())) {
+            $product = $productCollection->getFirstItem();
+            $option = [
+                'value' => $productId,
+                'label' => $product->getName(),
+                'is_active' => $product->getStatus(),
+                'path' => $product->getSku(),
+            ];
         }
-        foreach ($productIds as $id) {
-            try {
-                $product = $this->productRepository->getById($id);
-                $options[] = [
-                    'value' => $product->getId(),
-                    'label' => $product->getName(),
-                    'is_active' => $product->getSatus(),
-                    'path' => $product->getSku()
-                ];
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-
-        return $this->resultJsonFactory->create()->setData($options);
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData($option);
     }
 }
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php
new file mode 100644
index 0000000000000..3fb3234482efd
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryCatalogUi\Controller\Adminhtml\Product;
+
+use Magento\Framework\Controller\ResultInterface;
+use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Controller\Result\JsonFactory;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Backend\App\Action;
+
+/**
+ * Returns selected product by product id. for ui-select filter
+ */
+class GetSelected extends Action implements HttpGetActionInterface
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Catalog::products';
+
+    /**
+     * @var JsonFactory
+     */
+    private $resultJsonFactory;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     *  GetSelected constructor.
+     *
+     * @param JsonFactory $jsonFactory
+     * @param ProductRepositoryInterface $productRepository
+     * @param Context $context
+     */
+    public function __construct(
+        JsonFactory $jsonFactory,
+        ProductRepositoryInterface $productRepository,
+        Context $context
+    ) {
+        $this->resultJsonFactory = $jsonFactory;
+        $this->productRepository = $productRepository;
+        parent::__construct($context);
+    }
+
+    /**
+     *
+     * @return ResultInterface
+     */
+    public function execute() : ResultInterface
+    {
+        $productIds = $this->getRequest()->getParam('ids');
+        $options = [];
+
+
+        if (!is_array($productIds)) {
+            return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
+        }
+        foreach ($productIds as $id) {
+            try {
+                $product = $this->productRepository->getById($id);
+                $options[] = [
+                    'value' => $product->getId(),
+                    'label' => $product->getName(),
+                    'is_active' => $product->getSatus(),
+                    'path' => $product->getSku()
+                ];
+            } catch (\Exception $e) {
+                continue;
+            }
+        }
+
+        return $this->resultJsonFactory->create()->setData($options);
+    }
+}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
index a5491e3450451..6976584c2e36c 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -29,7 +29,7 @@
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                         <item name="searchUrl" xsi:type="url" path="catalog/product/search"/>
-                        <item name="validationUrl" xsi:type="url" path="catalog/product/getSelected"/>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_catalog/product/getSelected"/>
                     </item>
                 </argument>
                 <settings>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index a5491e3450451..6976584c2e36c 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -29,7 +29,7 @@
                         <item name="filterRateLimitMethod" xsi:type="string">notifyWhenChangesStop</item>
                         <item name="levelsVisibility" xsi:type="number">1</item>
                         <item name="searchUrl" xsi:type="url" path="catalog/product/search"/>
-                        <item name="validationUrl" xsi:type="url" path="catalog/product/getSelected"/>
+                        <item name="validationUrl" xsi:type="url" path="media_gallery_catalog/product/getSelected"/>
                     </item>
                 </argument>
                 <settings>
diff --git a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
index 402866852711d..e49ba7a98c8ce 100644
--- a/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -13,7 +13,6 @@
                     name="page_id"
                     provider="${ $.parentName }"
                     sortOrder="120"
-                    class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInPages"
                     component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
@@ -39,7 +38,6 @@
                     name="block_id"
                     provider="${ $.parentName }"
                     sortOrder="130"
-                    class="Magento\MediaGalleryCmsUi\Ui\Component\Listing\Filters\UsedInBlocks"
                     component="Magento_Ui/js/grid/filters/elements/ui-select"
                     template="ui/grid/filters/elements/ui-select">
                 <argument name="data" xsi:type="array">
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
index 190a99cac55b6..f61e34512bfe3 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Filters/Asset.php
@@ -15,7 +15,6 @@
 use Magento\MediaContentApi\Api\GetContentByAssetIdsInterface;
 use Magento\Ui\Component\Filters\FilterModifier;
 use Magento\Ui\Component\Filters\Type\Select;
-use Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface;
 
 /**
  * Asset filter
@@ -27,11 +26,6 @@ class Asset extends Select
      */
     private $getContentIdentities;
 
-    /**
-     * @var GetAssetsByIdsInterface
-     */
-    private $getAssetsByIds;
-
     /**
      * Constructor
      *
@@ -40,6 +34,7 @@ class Asset extends Select
      * @param FilterBuilder $filterBuilder
      * @param FilterModifier $filterModifier
      * @param OptionSourceInterface $optionsProvider
+     * @param GetContentByAssetIdsInterface $getContentIdentities
      * @param array $components
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
index c45ec348103c1..5e46360b59e7d 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
@@ -42,41 +42,44 @@ define([
          * Validate initial value actually exists
          */
         validateInitialValue: function () {
-            if (!_.isEmpty(this.value())) {
-                $.ajax({
-                    url: this.validationUrl,
-                    type: 'GET',
-                    dataType: 'json',
-                    context: this,
-                    data: {
-                        ids: this.value()
-                    },
+            if (_.isEmpty(this.value())) {
+                this.validationLoading(false);
 
-                    /** @param {Object} response */
-                    success: function (response) {
-                        if (!_.isEmpty(response)) {
-                            this.options([]);
-                            this.success({
-                                options: response
-                            });
-                        }
-                        this.filterChips().updateActive();
-                    },
+                return;
+            }
 
-                    /** set empty array if error occurs */
-                    error: function () {
-                        this.options([]);
-                    },
+            $.ajax({
+                url: this.validationUrl,
+                type: 'GET',
+                dataType: 'json',
+                context: this,
+                data: {
+                    ids: this.value()
+                },
 
-                    /** stop loader */
-                    complete: function () {
-                        this.validationLoading(false);
-                        this.setCaption();
+                /** @param {Object} response */
+                success: function (response) {
+                    if (!_.isEmpty(response)) {
+                        this.options([]);
+                        this.success({
+                            options: response
+                        });
                     }
-                });
-            } else {
-                this.validationLoading(false);
-            }
+                    this.filterChips().updateActive();
+                },
+
+                /** set empty array if error occurs */
+                error: function () {
+                    this.options([]);
+                },
+
+                /** stop loader */
+                complete: function () {
+                    this.validationLoading(false);
+                    this.setCaption();
+                }
+            });
+
         }
     });
 });

From a44d3affa9768f0b6d10138819f23ca12c166813 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 23:14:51 +0300
Subject: [PATCH 308/671] Fix static tests

---
 .../Controller/Adminhtml/Product/GetSelected.php            | 2 +-
 .../Controller/Adminhtml/Block/GetSelected.php              | 2 +-
 .../Controller/Adminhtml/Page/GetSelected.php               | 2 +-
 app/code/Magento/MediaGalleryCmsUi/composer.json            | 3 +--
 .../Controller/Adminhtml/Asset/GetSelected.php              | 2 +-
 .../Ui/view/base/web/js/grid/filters/elements/ui-select.js  | 6 +++++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php
index 3fb3234482efd..f70d4584547a3 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php
+++ b/app/code/Magento/MediaGalleryCatalogUi/Controller/Adminhtml/Product/GetSelected.php
@@ -53,6 +53,7 @@ public function __construct(
     }
 
     /**
+     * Return selected products options
      *
      * @return ResultInterface
      */
@@ -61,7 +62,6 @@ public function execute() : ResultInterface
         $productIds = $this->getRequest()->getParam('ids');
         $options = [];
 
-
         if (!is_array($productIds)) {
             return $this->resultJsonFactory->create()->setData('parameter ids must be type of array');
         }
diff --git a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php
index a8beeb791f74a..a686f0e7b3ace 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php
+++ b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Block/GetSelected.php
@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * Execute pages search.
+     * Return selected blocks options.
      *
      * @return ResultInterface
      */
diff --git a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php
index 33f87b93c01e1..be6eb9fd9de9f 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php
+++ b/app/code/Magento/MediaGalleryCmsUi/Controller/Adminhtml/Page/GetSelected.php
@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * Execute pages search.
+     * Return selected pages options.
      *
      * @return ResultInterface
      */
diff --git a/app/code/Magento/MediaGalleryCmsUi/composer.json b/app/code/Magento/MediaGalleryCmsUi/composer.json
index 73747a669c051..1ecfb9a3c8855 100644
--- a/app/code/Magento/MediaGalleryCmsUi/composer.json
+++ b/app/code/Magento/MediaGalleryCmsUi/composer.json
@@ -5,8 +5,7 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
-        "magento/module-backend": "*",
-        "magento/module-ui": "*"
+        "magento/module-backend": "*"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php
index 725c67185ce77..09837c301c367 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Asset/GetSelected.php
@@ -71,7 +71,7 @@ public function __construct(
     }
 
     /**
-     * Execute pages search.
+     * Return selected asset options.
      *
      * @return ResultInterface
      */
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
index 5e46360b59e7d..9f14639194fa7 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
@@ -29,7 +29,11 @@ define([
 
         },
 
-        /** @inheritdoc */
+        /**
+         * Initializes UiSelect component.
+         *
+         * @returns {UiSelect} Chainable.
+         */
         initialize: function () {
             this._super();
 

From a63ba82db187db80a92262dfbb0ea1a49d4705cc Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Thu, 27 Aug 2020 23:15:36 +0300
Subject: [PATCH 309/671] remove empty line

---
 .../Ui/view/base/web/js/grid/filters/elements/ui-select.js       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
index 9f14639194fa7..a913f3fa4a042 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
@@ -83,7 +83,6 @@ define([
                     this.setCaption();
                 }
             });
-
         }
     });
 });

From 9775a1dbbe19203662de3e22be99845cced5f2cc Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sat, 29 Aug 2020 17:03:03 +0100
Subject: [PATCH 310/671] Updated composer lock

---
 composer.lock | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index 36a42d0c750df..e1ce66005223d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8120,12 +8120,6 @@
                 "sftp",
                 "storage"
             ],
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-05-18T15:13:39+00:00"
         },
         {

From 98fe5093b90cfa6b4b44bb04db9d9b014901758a Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sun, 30 Aug 2020 14:12:10 +0100
Subject: [PATCH 311/671] Corrected MFTF version in composer.lock

---
 composer.lock | 560 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 555 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9f079570cc2ac..551167152be4d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -7315,6 +7315,555 @@
             ],
             "time": "2020-06-27T23:57:46+00:00"
         },
+        {
+            "name": "hoa/consistency",
+            "version": "1.17.05.02",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Consistency.git",
+                "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Consistency/zipball/fd7d0adc82410507f332516faf655b6ed22e4c2f",
+                "reference": "fd7d0adc82410507f332516faf655b6ed22e4c2f",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/exception": "~1.0",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "hoa/stream": "~1.0",
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Consistency\\": "."
+                },
+                "files": [
+                    "Prelude.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Consistency library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "autoloader",
+                "callable",
+                "consistency",
+                "entity",
+                "flex",
+                "keyword",
+                "library"
+            ],
+            "time": "2017-05-02T12:18:12+00:00"
+        },
+        {
+            "name": "hoa/console",
+            "version": "3.17.05.02",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Console.git",
+                "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Console/zipball/e231fd3ea70e6d773576ae78de0bdc1daf331a66",
+                "reference": "e231fd3ea70e6d773576ae78de0bdc1daf331a66",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0",
+                "hoa/exception": "~1.0",
+                "hoa/file": "~1.0",
+                "hoa/protocol": "~1.0",
+                "hoa/stream": "~1.0",
+                "hoa/ustring": "~4.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "suggest": {
+                "ext-pcntl": "To enable hoa://Event/Console/Window:resize.",
+                "hoa/dispatcher": "To use the console kit.",
+                "hoa/router": "To use the console kit."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Console\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Console library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "autocompletion",
+                "chrome",
+                "cli",
+                "console",
+                "cursor",
+                "getoption",
+                "library",
+                "option",
+                "parser",
+                "processus",
+                "readline",
+                "terminfo",
+                "tput",
+                "window"
+            ],
+            "time": "2017-05-02T12:26:19+00:00"
+        },
+        {
+            "name": "hoa/event",
+            "version": "1.17.01.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Event.git",
+                "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Event/zipball/6c0060dced212ffa3af0e34bb46624f990b29c54",
+                "reference": "6c0060dced212ffa3af0e34bb46624f990b29c54",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Event\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Event library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "event",
+                "library",
+                "listener",
+                "observer"
+            ],
+            "time": "2017-01-13T15:30:50+00:00"
+        },
+        {
+            "name": "hoa/exception",
+            "version": "1.17.01.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Exception.git",
+                "reference": "091727d46420a3d7468ef0595651488bfc3a458f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Exception/zipball/091727d46420a3d7468ef0595651488bfc3a458f",
+                "reference": "091727d46420a3d7468ef0595651488bfc3a458f",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Exception\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Exception library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "exception",
+                "library"
+            ],
+            "time": "2017-01-16T07:53:27+00:00"
+        },
+        {
+            "name": "hoa/file",
+            "version": "1.17.07.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/File.git",
+                "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/File/zipball/35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca",
+                "reference": "35cb979b779bc54918d2f9a4e02ed6c7a1fa67ca",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0",
+                "hoa/exception": "~1.0",
+                "hoa/iterator": "~2.0",
+                "hoa/stream": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\File\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\File library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "Socket",
+                "directory",
+                "file",
+                "finder",
+                "library",
+                "link",
+                "temporary"
+            ],
+            "time": "2017-07-11T07:42:15+00:00"
+        },
+        {
+            "name": "hoa/iterator",
+            "version": "2.17.01.10",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Iterator.git",
+                "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Iterator/zipball/d1120ba09cb4ccd049c86d10058ab94af245f0cc",
+                "reference": "d1120ba09cb4ccd049c86d10058ab94af245f0cc",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Iterator\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Iterator library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "iterator",
+                "library"
+            ],
+            "time": "2017-01-10T10:34:47+00:00"
+        },
+        {
+            "name": "hoa/protocol",
+            "version": "1.17.01.14",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Protocol.git",
+                "reference": "5c2cf972151c45f373230da170ea015deecf19e2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Protocol/zipball/5c2cf972151c45f373230da170ea015deecf19e2",
+                "reference": "5c2cf972151c45f373230da170ea015deecf19e2",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Protocol\\": "."
+                },
+                "files": [
+                    "Wrapper.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Protocol library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "library",
+                "protocol",
+                "resource",
+                "stream",
+                "wrapper"
+            ],
+            "time": "2017-01-14T12:26:10+00:00"
+        },
+        {
+            "name": "hoa/stream",
+            "version": "1.17.02.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Stream.git",
+                "reference": "3293cfffca2de10525df51436adf88a559151d82"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Stream/zipball/3293cfffca2de10525df51436adf88a559151d82",
+                "reference": "3293cfffca2de10525df51436adf88a559151d82",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/event": "~1.0",
+                "hoa/exception": "~1.0",
+                "hoa/protocol": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Stream\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Stream library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "Context",
+                "bucket",
+                "composite",
+                "filter",
+                "in",
+                "library",
+                "out",
+                "protocol",
+                "stream",
+                "wrapper"
+            ],
+            "time": "2017-02-21T16:01:06+00:00"
+        },
+        {
+            "name": "hoa/ustring",
+            "version": "4.17.01.16",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hoaproject/Ustring.git",
+                "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hoaproject/Ustring/zipball/e6326e2739178799b1fe3fdd92029f9517fa17a0",
+                "reference": "e6326e2739178799b1fe3fdd92029f9517fa17a0",
+                "shasum": ""
+            },
+            "require": {
+                "hoa/consistency": "~1.0",
+                "hoa/exception": "~1.0"
+            },
+            "require-dev": {
+                "hoa/test": "~2.0"
+            },
+            "suggest": {
+                "ext-iconv": "ext/iconv must be present (or a third implementation) to use Hoa\\Ustring::transcode().",
+                "ext-intl": "To get a better Hoa\\Ustring::toAscii() and Hoa\\Ustring::compareTo()."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Hoa\\Ustring\\": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net"
+                },
+                {
+                    "name": "Hoa community",
+                    "homepage": "https://hoa-project.net/"
+                }
+            ],
+            "description": "The Hoa\\Ustring library.",
+            "homepage": "https://hoa-project.net/",
+            "keywords": [
+                "library",
+                "search",
+                "string",
+                "unicode"
+            ],
+            "time": "2017-01-16T07:08:25+00:00"
+        },
         {
             "name": "jms/metadata",
             "version": "1.7.0",
@@ -7681,16 +8230,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699"
+                "reference": "8a106ea029f222f4354854636861273c7577bee9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8d98efa7434a30ab9e82ef128c430ef8e3a50699",
-                "reference": "8d98efa7434a30ab9e82ef128c430ef8e3a50699",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8a106ea029f222f4354854636861273c7577bee9",
+                "reference": "8a106ea029f222f4354854636861273c7577bee9",
                 "shasum": ""
             },
             "require": {
@@ -7708,6 +8257,7 @@
                 "ext-intl": "*",
                 "ext-json": "*",
                 "ext-openssl": "*",
+                "hoa/console": "~3.0",
                 "monolog/monolog": "^1.17",
                 "mustache/mustache": "~2.5",
                 "php": "^7.3",
@@ -7767,7 +8317,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-07-09T21:26:19+00:00"
+            "time": "2020-08-19T19:57:27+00:00"
         },
         {
             "name": "mikey179/vfsstream",

From 55f06e6fd09d5a5c0988eb9d96d18e4b26798f90 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Mon, 31 Aug 2020 13:25:33 +0100
Subject: [PATCH 312/671] Added tests coverage and small improvements

---
 ...inFromOrderPageManualChooseActionGroup.xml |  30 ++++++
 ...sCustomerManualChooseFromOrderPageTest.xml | 101 ++++++++++++++++++
 .../Component/ConfirmationPopup/Options.php   |  50 ++++++---
 3 files changed, 167 insertions(+), 14 deletions(-)
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
 create mode 100644 app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
new file mode 100644
index 0000000000000..e778ede05f9a5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup">
+        <annotations>
+            <description>Verify Login as Customer Login action is works properly from Order page with manual Store View choose.</description>
+        </annotations>
+        <arguments>
+            <argument name="orderId" type="string"/>
+            <argument name="storeName" type="string" defaultValue="default"/>
+        </arguments>
+
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
+        <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store" stepKey="seeModal"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
+        <selectOption selector="{{AdminLoginAsCustomerConfirmationModalSection.store}}" userInput="{{storeName}}" stepKey="selectStore"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="clickLogin"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml
new file mode 100644
index 0000000000000..372e89771b1e5
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminLoginAsCustomerManualChooseFromOrderPageTest">
+        <annotations>
+            <features value="Login as Customer"/>
+            <stories value="Select Store based on 'Store View To Login In' setting"/>
+            <title
+                value="Admin user directly login into customer account with store View To Login In = Manual Choose on Order Page"/>
+            <description
+                value="Verify admin user can directly login into customer account to Custom store view when Store View To Login In = Manual Choose on Order Page"/>
+            <severity value="CRITICAL"/>
+            <group value="login_as_customer"/>
+        </annotations>
+        <before>
+            <createData entity="Simple_US_Customer_Assistance_Allowed" stepKey="createCustomer"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="SimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 1"
+                        stepKey="enableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 1"
+                        stepKey="enableLoginAsCustomerManualChoose"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheBeforeTestRun"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createCustomStore">
+                <argument name="website" value="{{_defaultWebsite.name}}"/>
+                <argument name="storeGroupName" value="{{customStoreGroup.name}}"/>
+                <argument name="storeGroupCode" value="{{customStoreGroup.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createFirstCustomStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStoreEN"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createSecondCustomStoreView">
+                <argument name="StoreGroup" value="customStoreGroup"/>
+                <argument name="customStore" value="customStoreFR"/>
+            </actionGroup>
+        </before>
+        <after>
+            <actionGroup ref="DeleteCustomStoreActionGroup" stepKey="deleteCustomStore">
+                <argument name="storeGroupName" value="customStoreGroup.name"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <magentoCLI command="config:set {{LoginAsCustomerConfigDataEnabled.path}} 0"
+                        stepKey="disableLoginAsCustomer"/>
+            <magentoCLI command="config:set {{LoginAsCustomerStoreViewLogin.path}} 0"
+                        stepKey="enableLoginAsCustomerAutoDetection"/>
+            <magentoCLI command="cache:flush config" stepKey="flushCacheAfterTestRun"/>
+            <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Login as Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup"
+                     stepKey="loginAsCustomerFromCustomerPage">
+            <argument name="customerId" value="$$createCustomer.id$$"/>
+            <argument name="storeName" value="{{customStoreGroup.name}}"/>
+        </actionGroup>
+
+        <!-- Place Order as Customer -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
+            <argument name="productUrl" value="$$createProduct.sku$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
+        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
+
+        <!-- Login as Customer from Customer page -->
+        <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup"
+                     stepKey="loginAsCustomerFromOrderPage">
+            <argument name="orderId" value="{$grabOrderId}"/>
+            <argument name="storeName" value="{{customStoreGroup.name}}"/>
+        </actionGroup>
+
+        <!-- Assert Customer logged on on custom store view -->
+        <actionGroup ref="StorefrontAssertLoginAsCustomerLoggedInActionGroup" stepKey="assertLoggedInFromCustomerGird">
+            <argument name="customerFullName" value="$$createCustomer.firstname$$ $$createCustomer.lastname$$"/>
+            <argument name="customerEmail" value="$$createCustomer.email$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAssertCustomerOnStoreViewActionGroup" stepKey="assertCustomStoreView">
+            <argument name="storeViewName" value="{{customStoreEN.name}}"/>
+        </actionGroup>
+
+        <!-- Log out Customer and close tab -->
+        <actionGroup ref="StorefrontSignOutAndCloseTabActionGroup" stepKey="signOutAndCloseTab"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 865d4f0bc12e2..4d9e61fffdb21 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -14,6 +14,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\Escaper;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Sales\Api\CreditmemoRepositoryInterface;
 use Magento\Sales\Api\InvoiceRepositoryInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
@@ -116,6 +117,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     * @throws LocalizedException
      */
     public function toOptionArray(): array
     {
@@ -213,25 +215,45 @@ private function fillStoreGroupOptions(Website $website, CustomerInterface $cust
      * Get Customer id from request param.
      *
      * @return int
+     * @throws LocalizedException
      */
     private function getCustomerId(): int
     {
         $customerId = $this->request->getParam('id');
-        if (!$customerId) {
-            $orderId = $this->request->getParam('order_id');
-            $shipmentId = $this->request->getParam('shipment_id');
-            $creditmemoId = $this->request->getParam('creditmemo_id');
-            $invoiceId = $this->request->getParam('invoice_id');
-            if ($invoiceId) {
-                $orderId = $this->invoiceRepository->get($invoiceId)->getOrderId();
-            } elseif ($shipmentId) {
-                $orderId = $this->shipmentRepository->get($shipmentId)->getOrderId();
-            } elseif ($creditmemoId) {
-                $orderId = $this->creditmemoRepository->get($creditmemoId)->getOrderId();
-            }
-            $customerId = $this->orderRepository->get($orderId)->getCustomerId();
+        if ($customerId) {
+            return (int)$customerId;
+        }
+        try {
+            $orderId = $this->getOrderId();
+        } catch (LocalizedException $exception) {
+            throw new LocalizedException(__('Unable to get Customer ID.'));
         }
 
-        return (int)$customerId;
+        return (int)$this->orderRepository->get($orderId)->getCustomerId();
+    }
+
+    /**
+     * Get Order id from request param
+     *
+     * @return int
+     * @throws LocalizedException
+     */
+    private function getOrderId(): int
+    {
+        $orderId = $this->request->getParam('order_id');
+        if ($orderId) {
+            return (int)$orderId;
+        }
+        $shipmentId = $this->request->getParam('shipment_id');
+        $creditmemoId = $this->request->getParam('creditmemo_id');
+        $invoiceId = $this->request->getParam('invoice_id');
+        if ($invoiceId) {
+            return $this->invoiceRepository->get($invoiceId)->getOrderId();
+        } elseif ($shipmentId) {
+            return $this->shipmentRepository->get($shipmentId)->getOrderId();
+        } elseif ($creditmemoId) {
+            return $this->creditmemoRepository->get($creditmemoId)->getOrderId();
+        }
+        throw new LocalizedException(__('Unable to get Order ID.'));
     }
 }

From dd26af242e7fffc3f2e5ad47d632480872aa628e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 31 Aug 2020 16:31:09 +0300
Subject: [PATCH 313/671] MFTF test update.

---
 ...LoginAsCustomerLoginFromOrderPageActionGroup.xml | 13 +++++++++++--
 ...merLoginFromOrderPageManualChooseActionGroup.xml | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
index a478f8e9d18cd..68eaad37ccd91 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
@@ -16,8 +16,17 @@
             <argument name="orderId" type="string"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
-        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrdersPage"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <waitForPageLoad stepKey="waitForClearFilters"/>
+        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
+        <waitForPageLoad stepKey="waitForClickFilters"/>
+        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
+        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+        <waitForPageLoad stepKey="waitForApplyFilters"/>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="You are about to Login as Customer"
              stepKey="seeModal"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
index e778ede05f9a5..f06c87db0e6ae 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
@@ -17,8 +17,17 @@
             <argument name="storeName" type="string" defaultValue="default"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
-        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
+        <waitForPageLoad stepKey="waitForOrdersPage"/>
+        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
+        <waitForPageLoad stepKey="waitForClearFilters"/>
+        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
+        <waitForPageLoad stepKey="waitForClickFilters"/>
+        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
+        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
+        <waitForPageLoad stepKey="waitForApplyFilters"/>
+        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
+        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store" stepKey="seeModal"/>
         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>

From 7c24ca030e2cc72af5b467d959fb4c547e43d598 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Mon, 31 Aug 2020 17:36:15 -0500
Subject: [PATCH 314/671] MC-37250: [GraphQl] Change exception message when
 wishlist is not enabled - updated exception messages

---
 .../WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php    | 2 +-
 .../WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php | 2 +-
 .../Model/Resolver/RemoveProductsFromWishlist.php               | 2 +-
 .../WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php | 2 +-
 .../Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php | 2 +-
 .../GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php   | 2 +-
 .../testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
index 3489585cd17d7..c98c2376255dc 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
@@ -97,7 +97,7 @@ public function resolve(
         $wishlist = $this->getWishlist($wishlistId, $customerId);
 
         if (null === $wishlist->getId() || $customerId !== (int) $wishlist->getCustomerId()) {
-            throw new GraphQlInputException(__('The wishlist was not found.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $wishlistItems = $this->getWishlistItems($args['wishlistItems']);
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php
index cad574ef56ed2..b73afe27883dd 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/CustomerWishlistResolver.php
@@ -54,7 +54,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         if (false === $context->getExtensionAttributes()->getIsCustomer()) {
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
index a59c5ccdb0f70..66a6c7b86ea37 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/RemoveProductsFromWishlist.php
@@ -83,7 +83,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
index 42b8cd576f7c8..465ab33744984 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/UpdateProductsInWishlist.php
@@ -83,7 +83,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
index 09c0a8a935a6c..f31b403a514fb 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistResolver.php
@@ -63,7 +63,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
index 489a960056f1b..bccb6a7cb9fd6 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
@@ -110,7 +110,7 @@ public function testAddDownloadableProductOnDisabledWishlist(): void
             json_encode($itemOptions)
         ), '{}');
         $query = $this->getQuery($qty, $sku, $productOptionsQuery);
-        $this->expectExceptionMessage('The wishlist is not currently available.');
+        $this->expectExceptionMessage('The wishlist configuration is currently disabled.');
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
index dcbb550d66d62..a38f8f8015d66 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/CustomerWishlistTest.php
@@ -275,7 +275,7 @@ public function testAddProductToWishlistWithDisabledProduct()
     public function testCustomerCannotGetWishlistWhenDisabled()
     {
         $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('The wishlist is not currently available.');
+        $this->expectExceptionMessage('The wishlist configuration is currently disabled.');
 
         $query =
             <<<QUERY

From 08e7e4faffca9330aaed009dbe6ddebb9f6c70ee Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Tue, 1 Sep 2020 09:58:08 +0300
Subject: [PATCH 315/671] add testCaseId

---
 ...torefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
index 0959962d50d81..1055ff25edaef 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutWithPurchaseOrderNumberPressKeyEnterTest.xml
@@ -15,6 +15,7 @@
             <title value="Create Checkout with purchase order payment method test. Press key Enter on field Purchase Order Number for create Order."/>
             <description value="Create Checkout with purchase order payment method. Press key Enter on field Purchase Order Number for create Order."/>
             <severity value="MAJOR"/>
+            <testCaseId value="MC-37227"/>
             <group value="checkout"/>
         </annotations>
 

From c7e2deb4e9f648f5f42f70acbbc24e27fc2e5ec8 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Tue, 1 Sep 2020 09:51:40 +0100
Subject: [PATCH 316/671] Applied bug fix on getOrderId

---
 .../Ui/Customer/Component/ConfirmationPopup/Options.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 4d9e61fffdb21..e9b0bf26a9375 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -248,11 +248,11 @@ private function getOrderId(): int
         $creditmemoId = $this->request->getParam('creditmemo_id');
         $invoiceId = $this->request->getParam('invoice_id');
         if ($invoiceId) {
-            return $this->invoiceRepository->get($invoiceId)->getOrderId();
+            return (int)$this->invoiceRepository->get($invoiceId)->getOrderId();
         } elseif ($shipmentId) {
-            return $this->shipmentRepository->get($shipmentId)->getOrderId();
+            return (int)$this->shipmentRepository->get($shipmentId)->getOrderId();
         } elseif ($creditmemoId) {
-            return $this->creditmemoRepository->get($creditmemoId)->getOrderId();
+            return (int)$this->creditmemoRepository->get($creditmemoId)->getOrderId();
         }
         throw new LocalizedException(__('Unable to get Order ID.'));
     }

From 28efcf2117504cf2538400bc366e62b9ad5b4727 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Tue, 1 Sep 2020 14:53:50 -0500
Subject: [PATCH 317/671] MC-37250: [GraphQl] Change exception message when
 wishlist is not enabled - updated exception messages

---
 .../WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
index c98c2376255dc..3cfb95e766d0e 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
@@ -83,7 +83,7 @@ public function resolve(
         array $args = null
     ) {
         if (!$this->wishlistConfig->isEnabled()) {
-            throw new GraphQlInputException(__('The wishlist is not currently available.'));
+            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
         }
 
         $customerId = $context->getUserId();

From 1778c0f73570f19f9f368a18ff0808a6177f96e2 Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 2 Sep 2020 09:34:16 +0100
Subject: [PATCH 318/671] MC-37112: Reverting partially contribution because of
 bug with fastly

---
 app/code/Magento/PageCache/Model/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index bf144cc46637e..10ae41be21d4d 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -121,7 +121,7 @@ public function __construct(
      */
     public function getType()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
+        return $this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
     }
 
     /**

From 89c00cea4a2e26bfd23d12329a1c0d9044e807e8 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 2 Sep 2020 12:01:55 +0300
Subject: [PATCH 319/671] MC-37121: Deleted category still shown as available
 Category during product creation.

---
 .../Framework/App/Cache/FlushCacheByTags.php  | 28 ++++---------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
index 8f8dfd3baf1b6..f53d7f70e300b 100644
--- a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
+++ b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
@@ -55,37 +55,21 @@ public function __construct(
         $this->tagResolver = $tagResolver;
     }
 
-    /**
-     * Clean cache on save object
-     *
-     * @param AbstractResource $subject
-     * @param \Closure $proceed
-     * @param AbstractModel $object
-     * @return AbstractResource
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     */
-    public function aroundSave(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
-    {
-        $result = $proceed($object);
-        $tags = $this->tagResolver->getTags($object);
-        $this->cleanCacheByTags($tags);
-
-        return $result;
-    }
-
     /**
      * Clean cache on delete object
      *
      * @param AbstractResource $subject
-     * @param \Closure $proceed
+     * @param AbstractResource $result
      * @param AbstractModel $object
      * @return AbstractResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundDelete(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
-    {
+    public function afterDelete(
+        AbstractResource $subject,
+        AbstractResource $result,
+        AbstractModel $object
+    ): AbstractResource {
         $tags = $this->tagResolver->getTags($object);
-        $result = $proceed($object);
         $this->cleanCacheByTags($tags);
 
         return $result;

From 3efc95a409120fa2724be02bf2b5222c17b4ee23 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 2 Sep 2020 15:10:15 +0300
Subject: [PATCH 320/671] remove wrong tags

---
 app/code/Magento/AdminNotification/Block/ToolbarEntry.php       | 1 -
 app/code/Magento/AdminNotification/Model/Feed.php               | 1 -
 app/code/Magento/AdminNotification/Model/InboxInterface.php     | 1 -
 .../Magento/AdminNotification/Model/NotificationService.php     | 1 -
 .../AdminNotification/Model/ResourceModel/Grid/Collection.php   | 2 --
 .../AdminNotification/Model/ResourceModel/Inbox/Collection.php  | 2 --
 .../Model/ResourceModel/Inbox/Collection/Unread.php             | 2 --
 .../Observer/PredispatchAdminActionControllerObserver.php       | 2 --
 8 files changed, 12 deletions(-)

diff --git a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
index c097edfd8af65..42ca68177cb83 100644
--- a/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
+++ b/app/code/Magento/AdminNotification/Block/ToolbarEntry.php
@@ -10,7 +10,6 @@
  * Toolbar entry that shows latest notifications
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class ToolbarEntry extends \Magento\Backend\Block\Template
diff --git a/app/code/Magento/AdminNotification/Model/Feed.php b/app/code/Magento/AdminNotification/Model/Feed.php
index b99a8bbbc9031..ac1e631cc3f33 100644
--- a/app/code/Magento/AdminNotification/Model/Feed.php
+++ b/app/code/Magento/AdminNotification/Model/Feed.php
@@ -12,7 +12,6 @@
 /**
  * AdminNotification Feed model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
diff --git a/app/code/Magento/AdminNotification/Model/InboxInterface.php b/app/code/Magento/AdminNotification/Model/InboxInterface.php
index 4e87822763fc3..5e61c3dd680c9 100644
--- a/app/code/Magento/AdminNotification/Model/InboxInterface.php
+++ b/app/code/Magento/AdminNotification/Model/InboxInterface.php
@@ -8,7 +8,6 @@
 /**
  * AdminNotification Inbox interface
  *
- * @author Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/AdminNotification/Model/NotificationService.php b/app/code/Magento/AdminNotification/Model/NotificationService.php
index d44e98aaf2203..a13efe2136a6f 100644
--- a/app/code/Magento/AdminNotification/Model/NotificationService.php
+++ b/app/code/Magento/AdminNotification/Model/NotificationService.php
@@ -8,7 +8,6 @@
 /**
  * Notification service model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
index e12419155d52b..1a59d15e40c7a 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php
@@ -6,8 +6,6 @@
 
 /**
  * AdminNotification Inbox model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Grid;
 
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
index 44ec765b9d0a2..bf4f91cc6ae80 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php
@@ -9,8 +9,6 @@
  * AdminNotification Inbox model
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
- * @api
  * @since 100.0.2
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
diff --git a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
index b9e77f8a35295..9504c2f2d10f7 100644
--- a/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
+++ b/app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php
@@ -6,8 +6,6 @@
 
 /**
  * Collection of unread notifications
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
 
diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 24ef712c0f61f..5c40ec88f0906 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -9,8 +9,6 @@
 
 /**
  * AdminNotification observer
- *
- * @author      Magento Core Team <core@magentocommerce.com>
  */
 class PredispatchAdminActionControllerObserver implements ObserverInterface
 {

From abff48fd8d26ab455154da5b1a102c5ec99a27b8 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 2 Sep 2020 15:24:27 +0300
Subject: [PATCH 321/671] Remove wrong tag

---
 .../AdvancedPricingImportExport/Model/Export/AdvancedPricing.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 27e2713995653..a11f53aeb67b8 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -14,7 +14,6 @@
 /**
  * Export Advanced Pricing
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

From 61b3c24f25a8b6833ae54fcb95229e599584115f Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 2 Sep 2020 15:30:36 +0300
Subject: [PATCH 322/671] removes wrong tags

---
 app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php  | 1 -
 app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php  | 1 -
 .../AdvancedSearch/Model/ResourceModel/Recommendations.php       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
index 403a4d12cc17b..401e9d666103e 100644
--- a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Edit.php
@@ -9,7 +9,6 @@
  * Search queries relations grid container
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Edit extends \Magento\Backend\Block\Widget\Grid\Container
diff --git a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
index 6bdfd3b0dd143..add3e244be851 100644
--- a/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
+++ b/app/code/Magento/AdvancedSearch/Block/Adminhtml/Search/Grid.php
@@ -9,7 +9,6 @@
  * Search query relations edit grid
  *
  * @api
- * @author     Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid
diff --git a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
index c19c1d67d81f7..9be5d0c201841 100644
--- a/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
+++ b/app/code/Magento/AdvancedSearch/Model/ResourceModel/Recommendations.php
@@ -8,7 +8,6 @@
 /**
  * Catalog search recommendations resource model
  *
- * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
  */

From 4666ac046457f733b79bf47dd1aede3b0ae4c76d Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 2 Sep 2020 16:19:37 +0300
Subject: [PATCH 323/671] remove some wrongs tags

---
 .../Setup/Patch/Data/InitializeAuthRoles.php  | 25 ++++++++++---------
 .../Model/Indexer/Stock/AbstractAction.php    |  2 --
 .../Model/Indexer/Stock/Action/Full.php       |  2 --
 .../Model/Indexer/Stock/Action/Row.php        |  4 ---
 .../Model/Indexer/Stock/Action/Rows.php       |  4 ---
 .../Model/Indexer/Stock/CacheCleaner.php      |  2 --
 .../Model/Indexer/Stock/Processor.php         |  2 --
 .../Model/Indexer/Stock/Action/FullTest.php   |  3 ---
 .../Model/Indexer/Stock/Action/RowTest.php    |  3 ---
 .../Model/Indexer/Stock/Action/RowsTest.php   |  3 ---
 .../Indexer/Stock/Plugin/StoreGroupTest.php   |  3 ---
 .../Sales/Block/Adminhtml/Order/View.php      |  2 --
 12 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
index 84992badf65db..c133bae98f1c5 100644
--- a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
+++ b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
@@ -6,6 +6,9 @@
 
 namespace Magento\Authorization\Setup\Patch\Data;
 
+use Magento\Authorization\Model\ResourceModel\Role;
+use Magento\Authorization\Model\Rules;
+use Magento\Authorization\Setup\AuthorizationFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
@@ -14,8 +17,7 @@
 use Magento\Authorization\Model\UserContextInterface;
 
 /**
- * Class InitializeAuthRoles
- * @package Magento\Authorization\Setup\Patch
+ * Class for Initialize Auth Roles
  */
 class InitializeAuthRoles implements DataPatchInterface, PatchVersionInterface
 {
@@ -25,25 +27,24 @@ class InitializeAuthRoles implements DataPatchInterface, PatchVersionInterface
     private $moduleDataSetup;
 
     /**
-     * @var \Magento\Authorization\Setup\AuthorizationFactory
+     * @var AuthorizationFactory
      */
     private $authFactory;
 
     /**
-     * InitializeAuthRoles constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
-     * @param \Magento\Authorization\Setup\AuthorizationFactory $authorizationFactory
+     * @param AuthorizationFactory $authorizationFactory
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        \Magento\Authorization\Setup\AuthorizationFactory $authorizationFactory
+        AuthorizationFactory $authorizationFactory
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->authFactory = $authorizationFactory;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -68,7 +69,7 @@ public function apply()
                 ]
             )->save();
         } else {
-            /** @var \Magento\Authorization\Model\ResourceModel\Role $item */
+            /** @var Role $item */
             foreach ($roleCollection as $item) {
                 $admGroupRole = $item;
                 break;
@@ -89,7 +90,7 @@ public function apply()
                 ]
             )->save();
         } else {
-            /** @var \Magento\Authorization\Model\Rules $rule */
+            /** @var Rules $rule */
             foreach ($rulesCollection as $rule) {
                 $rule->setData('resource_id', 'Magento_Backend::all')->save();
             }
@@ -108,7 +109,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -116,7 +117,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -124,7 +125,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
index 85fee62eb4303..54d92cf12e2b8 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
index 43a5aabee9779..e345ef2ee752b 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
index c7dfcffee3d31..9e5e39e4aeb53 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Row.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,8 +8,6 @@
 
 /**
  * Class Row reindex action
- *
- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  */
 class Row extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
index f107955f0201e..a6176df3b107e 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Rows.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,8 +8,6 @@
 
 /**
  * Class Rows reindex action for mass actions
- *
- * @package Magento\CatalogInventory\Model\Indexer\Stock\Action
  */
 class Rows extends \Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction
 {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
index b3fa07479a712..055185239e404 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/CacheCleaner.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
index 403f64e7f77f8..e59f81414f102 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
index ca89ac01f280f..c888d522d2e8b 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
index 25b0c2ef33ebe..c9f60bd61c2fb 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
index e01f371b829d6..42d578ec88ea8 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/RowsTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
index 0e2b6b2f329c1..a81a4cd34b87f 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Plugin/StoreGroupTest.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_CatalogInventory
- * @subpackage  unit_tests
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index e4b12c30e71b4..d70df80038193 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @category    Magento
- * @package     Magento_Sales
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */

From 18c36a6baede9f7f49b83ce2e235adee0ef61c90 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 2 Sep 2020 16:35:34 +0300
Subject: [PATCH 324/671] MC-37097: Stores are not shown in "Login as Customer:
 Select Store" modal window on order view page - MFTF tests fix.

---
 ...sCustomerLoginFromOrderPageActionGroup.xml | 13 ++---------
 ...inFromOrderPageManualChooseActionGroup.xml | 13 ++---------
 ...sCustomerManualChooseFromOrderPageTest.xml | 23 +++++--------------
 ...minUIShownIfLoginAsCustomerEnabledTest.xml |  5 +---
 4 files changed, 11 insertions(+), 43 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
index 68eaad37ccd91..a478f8e9d18cd 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageActionGroup.xml
@@ -16,17 +16,8 @@
             <argument name="orderId" type="string"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPage"/>
-        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-        <waitForPageLoad stepKey="waitForClearFilters"/>
-        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
-        <waitForPageLoad stepKey="waitForClickFilters"/>
-        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
-        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-        <waitForPageLoad stepKey="waitForApplyFilters"/>
-        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
-        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForOrderPageLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="You are about to Login as Customer"
              stepKey="seeModal"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
index f06c87db0e6ae..e778ede05f9a5 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup.xml
@@ -17,17 +17,8 @@
             <argument name="storeName" type="string" defaultValue="default"/>
         </arguments>
 
-        <amOnPage url="{{AdminOrdersPage.url}}" stepKey="navigateToOrderGridPage"/>
-        <waitForPageLoad stepKey="waitForOrdersPage"/>
-        <conditionalClick selector="{{AdminOrdersGridSection.clearFilters}}" dependentSelector="{{AdminOrdersGridSection.clearFilters}}" visible="true" stepKey="clearExistingOrderFilters"/>
-        <waitForPageLoad stepKey="waitForClearFilters"/>
-        <click selector="{{AdminOrdersGridSection.filters}}" stepKey="openOrderGridFilters"/>
-        <waitForPageLoad stepKey="waitForClickFilters"/>
-        <fillField selector="{{AdminOrdersGridSection.idFilter}}" userInput="{{orderId}}" stepKey="fillOrderIdFilter"/>
-        <click selector="{{AdminOrdersGridSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-        <waitForPageLoad stepKey="waitForApplyFilters"/>
-        <click selector="{{AdminDataGridTableSection.firstRow}}" stepKey="clickOrderRow"/>
-        <waitForPageLoad stepKey="waitForOrderPageOpened"/>
+        <amOnPage url="{{AdminOrderPage.url(orderId)}}" stepKey="gotoOrderPage"/>
+        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
         <click selector="{{AdminOrderDetailsMainActionsSection.loginAsCustomer}}" stepKey="clickLoginAsCustomerLink"/>
         <see selector="{{AdminConfirmationModalSection.title}}" userInput="Login as Customer: Select Store" stepKey="seeModal"/>
         <see selector="{{AdminConfirmationModalSection.message}}" userInput="Actions taken while in &quot;Login as Customer&quot; will affect actual customer data." stepKey="seeModalMessage"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml
index 372e89771b1e5..e4f0209c55233 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseFromOrderPageTest.xml
@@ -60,26 +60,15 @@
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
         </after>
 
-        <!-- Login as Customer from Customer page -->
-        <actionGroup ref="AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup"
-                     stepKey="loginAsCustomerFromCustomerPage">
-            <argument name="customerId" value="$$createCustomer.id$$"/>
-            <argument name="storeName" value="{{customStoreGroup.name}}"/>
-        </actionGroup>
-
-        <!-- Place Order as Customer -->
-        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
-            <argument name="productUrl" value="$$createProduct.sku$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
+        <!-- Create order -->
+        <actionGroup ref="CreateOrderInStoreActionGroup" stepKey="createOrder">
             <argument name="product" value="$$createProduct$$"/>
-            <argument name="productCount" value="1"/>
+            <argument name="customer" value="$$createCustomer$$"/>
+            <argument name="storeView" value="customStoreFR"/>
         </actionGroup>
-        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCart"/>
-        <actionGroup ref="PlaceOrderWithLoggedUserActionGroup" stepKey="placeOrder"/>
-        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderId"/>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
 
-        <!-- Login as Customer from Customer page -->
+        <!-- Login as Customer from Order page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageManualChooseActionGroup"
                      stepKey="loginAsCustomerFromOrderPage">
             <argument name="orderId" value="{$grabOrderId}"/>
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index ea06263901b9e..9b415d9914fdb 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -59,10 +59,7 @@
             <argument name="product" value="$$createSimpleProduct$$"/>
             <argument name="customer" value="$$createCustomer$$"/>
         </actionGroup>
-        <grabTextFrom selector="{{AdminOrderDetailsInformationSection.orderId}}" stepKey="grabOrderId"/>
-        <actionGroup ref="FilterOrderGridByIdActionGroup" stepKey="filterOrderGridById">
-            <argument name="orderId" value="$grabOrderId"/>
-        </actionGroup>
+        <grabFromCurrentUrl regex="~/order_id/(\d+)/~" stepKey="grabOrderId"/>
 
         <!-- Verify Login as Customer Login action works correctly from Order page -->
         <actionGroup ref="AdminLoginAsCustomerLoginFromOrderPageActionGroup"

From 2c70ad89cab02cdd543f37b02073692f243096da Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Wed, 2 Sep 2020 16:47:37 +0300
Subject: [PATCH 325/671] MC-37121: Deleted category still shown as available
 Category during product creation - restore deleted method.

---
 .../Framework/App/Cache/FlushCacheByTags.php   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
index f53d7f70e300b..c6c43f7053443 100644
--- a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
+++ b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
@@ -55,6 +55,24 @@ public function __construct(
         $this->tagResolver = $tagResolver;
     }
 
+    /**
+     * Clean cache on save object
+     *
+     * @param AbstractResource $subject
+     * @param \Closure $proceed
+     * @param AbstractModel $object
+     * @return AbstractResource
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundSave(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
+    {
+        $result = $proceed($object);
+        $tags = $this->tagResolver->getTags($object);
+        $this->cleanCacheByTags($tags);
+
+        return $result;
+    }
+
     /**
      * Clean cache on delete object
      *

From 30aebc39fb59cc76456e48198ee285c1b86f4e96 Mon Sep 17 00:00:00 2001
From: Prabhu Ram <pganapat@adobe.com>
Date: Wed, 2 Sep 2020 10:52:16 -0500
Subject: [PATCH 326/671] MC-37250: [GraphQl] Change exception message when
 wishlist is not enabled - updated exception messages

---
 .../WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
index 3cfb95e766d0e..840c4638614c4 100644
--- a/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
+++ b/app/code/Magento/WishlistGraphQl/Model/Resolver/AddProductsToWishlist.php
@@ -97,7 +97,7 @@ public function resolve(
         $wishlist = $this->getWishlist($wishlistId, $customerId);
 
         if (null === $wishlist->getId() || $customerId !== (int) $wishlist->getCustomerId()) {
-            throw new GraphQlInputException(__('The wishlist configuration is currently disabled.'));
+            throw new GraphQlInputException(__('The wishlist was not found.'));
         }
 
         $wishlistItems = $this->getWishlistItems($args['wishlistItems']);

From 835be0d6c4d2631484f27e074c872ad388c3c4bf Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 3 Sep 2020 10:56:39 +0300
Subject: [PATCH 327/671] MC-37121: Deleted category still shown as available
 Category during product creation - restore deleted method - unit test fix.

---
 .../App/Test/Unit/Cache/FlushCacheByTagsTest.php          | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
index 6e550cd4fbde4..ba0a6b9b8e4c7 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
@@ -85,7 +85,7 @@ function () use ($resource) {
     /**
      * @return void
      */
-    public function testAroundDelete(): void
+    public function testAfterDelete(): void
     {
         $resource = $this->getMockBuilder(AbstractResource::class)
             ->disableOriginalConstructor()
@@ -95,11 +95,9 @@ public function testAroundDelete(): void
             ->getMockForAbstractClass();
         $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
 
-        $result = $this->plugin->aroundDelete(
+        $result = $this->plugin->afterDelete(
+            $resource,
             $resource,
-            function () use ($resource) {
-                return $resource;
-            },
             $model
         );
 

From 7bbd5de5261436eb412c73a08b6fcdd1e251be6d Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 3 Sep 2020 10:59:08 +0100
Subject: [PATCH 328/671] Fixed static tests

---
 .../Ui/Customer/Component/ConfirmationPopup/Options.php          | 1 +
 app/code/Magento/LoginAsCustomerAdminUi/composer.json            | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index e9b0bf26a9375..16ff6ec6df99d 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -117,6 +117,7 @@ public function __construct(
 
     /**
      * @inheritdoc
+     *
      * @throws LocalizedException
      */
     public function toOptionArray(): array
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/composer.json b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
index 8bbe0e2bd6c9e..b6291226827a8 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
@@ -8,6 +8,7 @@
         "magento/module-login-as-customer-frontend-ui": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
+        "magento/module-sales": "*",
         "magento/module-store": "*"
     },
     "suggest": {

From 189c93bf5c8b1bf823fda8466550dbba8029e2ba Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Thu, 3 Sep 2020 12:07:33 +0100
Subject: [PATCH 329/671] Added suppress for excessive coupling

---
 .../Ui/Customer/Component/ConfirmationPopup/Options.php         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
index 16ff6ec6df99d..791ed35519850 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -25,6 +25,8 @@
 
 /**
  * Store group options for Login As Customer confirmation pop-up.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Options implements OptionSourceInterface
 {

From 727d322b63a5f54054fb7179e61835d322fe22bc Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Thu, 3 Sep 2020 14:13:10 +0300
Subject: [PATCH 330/671] MC-37121: Deleted category still shown as available
 Category during product creation - restore deleted method - MFTF test added.

---
 ...ryNotShownAsAvailableOnProductPageTest.xml | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminDeletedCategoryNotShownAsAvailableOnProductPageTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeletedCategoryNotShownAsAvailableOnProductPageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeletedCategoryNotShownAsAvailableOnProductPageTest.xml
new file mode 100644
index 0000000000000..4207f88ecd97d
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminDeletedCategoryNotShownAsAvailableOnProductPageTest.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminDeletedCategoryNotShownAsAvailableOnProductPageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Delete categories"/>
+            <title value="Deleted Category not shown as available on Product page"/>
+            <description value="Deleted category not shown as available Category on Product edit page"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-37121"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <actionGroup ref="AdminLoginActionGroup" stepKey="logInAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Create Category -->
+        <actionGroup ref="GoToCreateCategoryPageActionGroup" stepKey="goToCreateCategoryPage"/>
+        <actionGroup ref="FillCategoryNameAndUrlKeyAndSaveActionGroup" stepKey="fillCategoryForm">
+            <argument name="categoryName" value="additional"/>
+            <argument name="categoryUrlKey" value=""/>
+        </actionGroup>
+
+        <!-- Check if Category present on Product page -->
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPage">
+            <argument name="productId" value="$$createProduct.id$$"/>
+        </actionGroup>
+        <waitForPageLoad time="60" stepKey="waitForProductPageLoad"/>
+        <actionGroup ref="AdminProductFormCategoryExistInCategoryListActionGroup" stepKey="checkExistCategoryInList">
+            <argument name="categoryName" value="$$createCategory.name$$"/>
+        </actionGroup>
+
+        <!-- Delete Category -->
+        <actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="deleteAdditionalCategory">
+            <argument name="categoryName" value="additional"/>
+        </actionGroup>
+
+        <!-- Check if Category absent on Product page -->
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductPageAfterDelete">
+            <argument name="productId" value="$$createProduct.id$$"/>
+        </actionGroup>
+        <waitForPageLoad time="60" stepKey="waitForProductPageLoadAfterDelete"/>
+        <actionGroup ref="AdminProductFormCategoryNotExistInCategoryListActionGroup" stepKey="checkNotExistCategoryInList">
+            <argument name="categoryName" value="additional"/>
+        </actionGroup>
+    </test>
+</tests>

From 6be6b0477d12ad908281144667d8dcd4fa0bf554 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 3 Sep 2020 11:59:45 -0500
Subject: [PATCH 331/671] MC-37350: revert graphql cors

---
 .../CorsAllowCredentialsHeaderProvider.php    |  71 ----------
 .../Cors/CorsAllowHeadersHeaderProvider.php   |  71 ----------
 .../Cors/CorsAllowMethodsHeaderProvider.php   |  71 ----------
 .../Cors/CorsAllowOriginHeaderProvider.php    |  71 ----------
 .../Cors/CorsMaxAgeHeaderProvider.php         |  71 ----------
 .../GraphQl/Model/Cors/Configuration.php      |  96 -------------
 .../Model/Cors/ConfigurationInterface.php     |  56 --------
 .../Magento/GraphQl/etc/adminhtml/system.xml  |  65 ---------
 app/code/Magento/GraphQl/etc/config.xml       |  22 ---
 app/code/Magento/GraphQl/etc/di.xml           |  27 ----
 app/code/Magento/GraphQl/etc/graphql/di.xml   |  11 --
 .../Magento/GraphQl/CorsHeadersTest.php       | 126 ------------------
 12 files changed, 758 deletions(-)
 delete mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
 delete mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
 delete mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
 delete mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
 delete mode 100644 app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
 delete mode 100644 app/code/Magento/GraphQl/Model/Cors/Configuration.php
 delete mode 100644 app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
 delete mode 100644 app/code/Magento/GraphQl/etc/adminhtml/system.xml
 delete mode 100644 app/code/Magento/GraphQl/etc/config.xml
 delete mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php

diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
deleted file mode 100644
index ba2e995d4f704..0000000000000
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Controller\HttpResponse\Cors;
-
-use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
-use Magento\GraphQl\Model\Cors\ConfigurationInterface;
-
-/**
- * Provides value for Access-Control-Allow-Credentials header if CORS is enabled
- */
-class CorsAllowCredentialsHeaderProvider implements HeaderProviderInterface
-{
-    /**
-     * @var string
-     */
-    private $headerName;
-
-    /**
-     * CORS configuration provider
-     *
-     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
-     */
-    private $corsConfiguration;
-
-    /**
-     * @param ConfigurationInterface $corsConfiguration
-     * @param string $headerName
-     */
-    public function __construct(
-        ConfigurationInterface $corsConfiguration,
-        string $headerName
-    ) {
-        $this->corsConfiguration = $corsConfiguration;
-        $this->headerName = $headerName;
-    }
-
-    /**
-     * Get name of header
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->headerName;
-    }
-
-    /**
-     * Get value for header
-     *
-     * @return string
-     */
-    public function getValue(): string
-    {
-        return "1";
-    }
-
-    /**
-     * Check if header can be applied
-     *
-     * @return bool
-     */
-    public function canApply(): bool
-    {
-        return $this->corsConfiguration->isEnabled() && $this->corsConfiguration->isCredentialsAllowed();
-    }
-}
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
deleted file mode 100644
index 68760de543daa..0000000000000
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Controller\HttpResponse\Cors;
-
-use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
-use Magento\GraphQl\Model\Cors\ConfigurationInterface;
-
-/**
- * Provides value for Access-Control-Allow-Headers header if CORS is enabled
- */
-class CorsAllowHeadersHeaderProvider implements HeaderProviderInterface
-{
-    /**
-     * @var string
-     */
-    private $headerName;
-
-    /**
-     * CORS configuration provider
-     *
-     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
-     */
-    private $corsConfiguration;
-
-    /**
-     * @param ConfigurationInterface $corsConfiguration
-     * @param string $headerName
-     */
-    public function __construct(
-        ConfigurationInterface $corsConfiguration,
-        string $headerName
-    ) {
-        $this->corsConfiguration = $corsConfiguration;
-        $this->headerName = $headerName;
-    }
-
-    /**
-     * Get name of header
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->headerName;
-    }
-
-    /**
-     * Check if header can be applied
-     *
-     * @return bool
-     */
-    public function canApply(): bool
-    {
-        return $this->corsConfiguration->isEnabled() && $this->getValue();
-    }
-
-    /**
-     * Get value for header
-     *
-     * @return string|null
-     */
-    public function getValue(): ?string
-    {
-        return $this->corsConfiguration->getAllowedHeaders();
-    }
-}
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
deleted file mode 100644
index 233839b9deb74..0000000000000
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Controller\HttpResponse\Cors;
-
-use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
-use Magento\GraphQl\Model\Cors\ConfigurationInterface;
-
-/**
- * Provides value for Access-Control-Allow-Methods header if CORS is enabled
- */
-class CorsAllowMethodsHeaderProvider implements HeaderProviderInterface
-{
-    /**
-     * @var string
-     */
-    private $headerName;
-
-    /**
-     * CORS configuration provider
-     *
-     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
-     */
-    private $corsConfiguration;
-
-    /**
-     * @param ConfigurationInterface $corsConfiguration
-     * @param string $headerName
-     */
-    public function __construct(
-        ConfigurationInterface $corsConfiguration,
-        string $headerName
-    ) {
-        $this->corsConfiguration = $corsConfiguration;
-        $this->headerName = $headerName;
-    }
-
-    /**
-     * Get name of header
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->headerName;
-    }
-
-    /**
-     * Check if header can be applied
-     *
-     * @return bool
-     */
-    public function canApply(): bool
-    {
-        return $this->corsConfiguration->isEnabled() && $this->getValue();
-    }
-
-    /**
-     * Get value for header
-     *
-     * @return string|null
-     */
-    public function getValue(): ?string
-    {
-        return $this->corsConfiguration->getAllowedMethods();
-    }
-}
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
deleted file mode 100644
index 21850f18db1f2..0000000000000
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Controller\HttpResponse\Cors;
-
-use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
-use Magento\GraphQl\Model\Cors\ConfigurationInterface;
-
-/**
- * Provides value for Access-Control-Allow-Origin header if CORS is enabled
- */
-class CorsAllowOriginHeaderProvider implements HeaderProviderInterface
-{
-    /**
-     * @var string
-     */
-    private $headerName;
-
-    /**
-     * CORS configuration provider
-     *
-     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
-     */
-    private $corsConfiguration;
-
-    /**
-     * @param ConfigurationInterface $corsConfiguration
-     * @param string $headerName
-     */
-    public function __construct(
-        ConfigurationInterface $corsConfiguration,
-        string $headerName
-    ) {
-        $this->corsConfiguration = $corsConfiguration;
-        $this->headerName = $headerName;
-    }
-
-    /**
-     * Get name of header
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->headerName;
-    }
-
-    /**
-     * Check if header can be applied
-     *
-     * @return bool
-     */
-    public function canApply(): bool
-    {
-        return $this->corsConfiguration->isEnabled() && $this->getValue();
-    }
-
-    /**
-     * Get value for header
-     *
-     * @return string|null
-     */
-    public function getValue(): ?string
-    {
-        return $this->corsConfiguration->getAllowedOrigins();
-    }
-}
diff --git a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php b/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
deleted file mode 100644
index e30209ae25e68..0000000000000
--- a/app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Controller\HttpResponse\Cors;
-
-use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface;
-use Magento\GraphQl\Model\Cors\ConfigurationInterface;
-
-/**
- * Provides value for Access-Control-Max-Age header if CORS is enabled
- */
-class CorsMaxAgeHeaderProvider implements HeaderProviderInterface
-{
-    /**
-     * @var string
-     */
-    private $headerName;
-
-    /**
-     * CORS configuration provider
-     *
-     * @var \Magento\GraphQl\Model\Cors\ConfigurationInterface
-     */
-    private $corsConfiguration;
-
-    /**
-     * @param ConfigurationInterface $corsConfiguration
-     * @param string $headerName
-     */
-    public function __construct(
-        ConfigurationInterface $corsConfiguration,
-        string $headerName
-    ) {
-        $this->corsConfiguration = $corsConfiguration;
-        $this->headerName = $headerName;
-    }
-
-    /**
-     * Get name of header
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return $this->headerName;
-    }
-
-    /**
-     * Check if header can be applied
-     *
-     * @return bool
-     */
-    public function canApply(): bool
-    {
-        return $this->corsConfiguration->isEnabled() && $this->getValue();
-    }
-
-    /**
-     * Get value for header
-     *
-     * @return string|null
-     */
-    public function getValue(): ?string
-    {
-        return (string) $this->corsConfiguration->getMaxAge();
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Cors/Configuration.php b/app/code/Magento/GraphQl/Model/Cors/Configuration.php
deleted file mode 100644
index dd5a0b426e22d..0000000000000
--- a/app/code/Magento/GraphQl/Model/Cors/Configuration.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Model\Cors;
-
-use Magento\Framework\App\Config\ScopeConfigInterface;
-
-/**
- * Configuration provider for GraphQL CORS settings
- */
-class Configuration implements ConfigurationInterface
-{
-    public const XML_PATH_CORS_HEADERS_ENABLED = 'graphql/cors/enabled';
-    public const XML_PATH_CORS_ALLOWED_ORIGINS = 'graphql/cors/allowed_origins';
-    public const XML_PATH_CORS_ALLOWED_HEADERS = 'graphql/cors/allowed_headers';
-    public const XML_PATH_CORS_ALLOWED_METHODS = 'graphql/cors/allowed_methods';
-    public const XML_PATH_CORS_MAX_AGE = 'graphql/cors/max_age';
-    public const XML_PATH_CORS_ALLOW_CREDENTIALS = 'graphql/cors/allow_credentials';
-
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @param ScopeConfigInterface $scopeConfig
-     */
-    public function __construct(ScopeConfigInterface $scopeConfig)
-    {
-        $this->scopeConfig = $scopeConfig;
-    }
-
-    /**
-     * Are CORS headers enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool
-    {
-        return $this->scopeConfig->isSetFlag(self::XML_PATH_CORS_HEADERS_ENABLED);
-    }
-
-    /**
-     * Get allowed origins or null if stored configuration is empty
-     *
-     * @return string|null
-     */
-    public function getAllowedOrigins(): ?string
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_CORS_ALLOWED_ORIGINS);
-    }
-
-    /**
-     * Get allowed headers or null if stored configuration is empty
-     *
-     * @return string|null
-     */
-    public function getAllowedHeaders(): ?string
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_CORS_ALLOWED_HEADERS);
-    }
-
-    /**
-     * Get allowed methods or null if stored configuration is empty
-     *
-     * @return string|null
-     */
-    public function getAllowedMethods(): ?string
-    {
-        return $this->scopeConfig->getValue(self::XML_PATH_CORS_ALLOWED_METHODS);
-    }
-
-    /**
-     * Get max age header value
-     *
-     * @return int
-     */
-    public function getMaxAge(): int
-    {
-        return (int) $this->scopeConfig->getValue(self::XML_PATH_CORS_MAX_AGE);
-    }
-
-    /**
-     * Are credentials allowed
-     *
-     * @return bool
-     */
-    public function isCredentialsAllowed(): bool
-    {
-        return $this->scopeConfig->isSetFlag(self::XML_PATH_CORS_ALLOW_CREDENTIALS);
-    }
-}
diff --git a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php b/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
deleted file mode 100644
index b40b64f48e51f..0000000000000
--- a/app/code/Magento/GraphQl/Model/Cors/ConfigurationInterface.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl\Model\Cors;
-
-/**
- * Interface for configuration provider for GraphQL CORS settings
- */
-interface ConfigurationInterface
-{
-    /**
-     * Are CORS headers enabled
-     *
-     * @return bool
-     */
-    public function isEnabled(): bool;
-
-    /**
-     * Get allowed origins or null if stored configuration is empty
-     *
-     * @return string|null
-     */
-    public function getAllowedOrigins(): ?string;
-
-    /**
-     * Get allowed headers or null if stored configuration is empty
-     *
-     * @return string|null
-     */
-    public function getAllowedHeaders(): ?string;
-
-    /**
-     * Get allowed methods or null if stored configuration is empty
-     *
-     * @return string|null
-     */
-    public function getAllowedMethods(): ?string;
-
-    /**
-     * Get max age header value
-     *
-     * @return int
-     */
-    public function getMaxAge(): int;
-
-    /**
-     * Are credentials allowed
-     *
-     * @return bool
-     */
-    public function isCredentialsAllowed() : bool;
-}
diff --git a/app/code/Magento/GraphQl/etc/adminhtml/system.xml b/app/code/Magento/GraphQl/etc/adminhtml/system.xml
deleted file mode 100644
index ddee7596eca3e..0000000000000
--- a/app/code/Magento/GraphQl/etc/adminhtml/system.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
-    <system>
-        <section id="graphql" translate="label" type="text" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
-            <label>GraphQL</label>
-            <tab>service</tab>
-            <resource>Magento_Integration::config_oauth</resource>
-            <group id="cors" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1">
-                <label>CORS Settings</label>
-                <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" canRestore="1">
-                    <label>CORS Headers Enabled</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
-
-                <field id="allowed_origins" translate="label" type="text" sortOrder="10" showInDefault="1" canRestore="1">
-                    <label>Allowed origins</label>
-                    <comment>The Access-Control-Allow-Origin response header indicates whether the response can be shared with requesting code from the given origin. Fill this field with one or more origins (comma separated) or use '*' to allow access from all origins.</comment>
-                    <depends>
-                        <field id="graphql/cors/enabled">1</field>
-                    </depends>
-                </field>
-
-                <field id="allowed_methods" translate="label" type="text" sortOrder="20" showInDefault="1" canRestore="1">
-                    <label>Allowed methods</label>
-                    <comment>The Access-Control-Allow-Methods response header specifies the method or methods allowed when accessing the resource in response to a preflight request. Use comma separated methods (e.g. GET,POST)</comment>
-                    <depends>
-                        <field id="graphql/cors/enabled">1</field>
-                    </depends>
-                </field>
-
-                <field id="allowed_headers" translate="label" type="text" sortOrder="30" showInDefault="1" canRestore="1">
-                    <label>Allowed headers</label>
-                    <comment>The Access-Control-Allow-Headers response header is used in response to a preflight request which includes the Access-Control-Request-Headers to indicate which HTTP headers can be used during the actual request. Use comma separated headers.</comment>
-                    <depends>
-                        <field id="graphql/cors/enabled">1</field>
-                    </depends>
-                </field>
-
-                <field id="max_age" translate="label" type="text" sortOrder="40" showInDefault="1" canRestore="1">
-                    <label>Max Age</label>
-                    <validate>validate-digits</validate>
-                    <comment>The Access-Control-Max-Age response header indicates how long the results of a preflight request (that is the information contained in the Access-Control-Allow-Methods and Access-Control-Allow-Headers headers) can be cached.</comment>
-                    <depends>
-                        <field id="graphql/cors/enabled">1</field>
-                    </depends>
-                </field>
-
-                <field id="allow_credentials" translate="label" type="select" sortOrder="50" showInDefault="1" canRestore="1">
-                    <label>Credentials Allowed</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                    <comment>The Access-Control-Allow-Credentials response header tells browsers whether to expose the response to frontend code when the request's credentials mode is include.</comment>
-                    <depends>
-                        <field id="graphql/cors/enabled">1</field>
-                    </depends>
-                </field>
-            </group>
-        </section>
-    </system>
-</config>
diff --git a/app/code/Magento/GraphQl/etc/config.xml b/app/code/Magento/GraphQl/etc/config.xml
deleted file mode 100644
index 39caacbec42d2..0000000000000
--- a/app/code/Magento/GraphQl/etc/config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
-    <default>
-        <graphql>
-            <cors>
-                <enabled>0</enabled>
-                <allowed_origins></allowed_origins>
-                <allowed_methods></allowed_methods>
-                <allowed_headers></allowed_headers>
-                <max_age>86400</max_age>
-                <allow_credentials>0</allow_credentials>
-            </cors>
-        </graphql>
-    </default>
-</config>
diff --git a/app/code/Magento/GraphQl/etc/di.xml b/app/code/Magento/GraphQl/etc/di.xml
index fca6c425e2507..b356f33c4f4bf 100644
--- a/app/code/Magento/GraphQl/etc/di.xml
+++ b/app/code/Magento/GraphQl/etc/di.xml
@@ -98,31 +98,4 @@
             <argument name="queryComplexity" xsi:type="number">300</argument>
         </arguments>
     </type>
-
-    <preference for="Magento\GraphQl\Model\Cors\ConfigurationInterface" type="Magento\GraphQl\Model\Cors\Configuration" />
-    <type name="Magento\GraphQl\Controller\HttpResponse\Cors\CorsMaxAgeHeaderProvider">
-        <arguments>
-            <argument name="headerName" xsi:type="string">Access-Control-Max-Age</argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowCredentialsHeaderProvider">
-        <arguments>
-            <argument name="headerName" xsi:type="string">Access-Control-Allow-Credentials</argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowHeadersHeaderProvider">
-        <arguments>
-            <argument name="headerName" xsi:type="string">Access-Control-Allow-Headers</argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowMethodsHeaderProvider">
-        <arguments>
-            <argument name="headerName" xsi:type="string">Access-Control-Allow-Methods</argument>
-        </arguments>
-    </type>
-    <type name="Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowOriginHeaderProvider">
-        <arguments>
-            <argument name="headerName" xsi:type="string">Access-Control-Allow-Origin</argument>
-        </arguments>
-    </type>
 </config>
diff --git a/app/code/Magento/GraphQl/etc/graphql/di.xml b/app/code/Magento/GraphQl/etc/graphql/di.xml
index 23d49124d1a02..77fce336374dd 100644
--- a/app/code/Magento/GraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/GraphQl/etc/graphql/di.xml
@@ -30,15 +30,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Response\HeaderManager">
-        <arguments>
-            <argument name="headerProviderList" xsi:type="array">
-                <item name="CorsAllowOrigins" xsi:type="object">Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowOriginHeaderProvider</item>
-                <item name="CorsAllowHeaders" xsi:type="object">Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowHeadersHeaderProvider</item>
-                <item name="CorsAllowMethods" xsi:type="object">Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowMethodsHeaderProvider</item>
-                <item name="CorsAllowCredentials" xsi:type="object">Magento\GraphQl\Controller\HttpResponse\Cors\CorsAllowCredentialsHeaderProvider</item>
-                <item name="CorsMaxAge" xsi:type="object">Magento\GraphQl\Controller\HttpResponse\Cors\CorsMaxAgeHeaderProvider</item>
-            </argument>
-        </arguments>
-    </type>
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
deleted file mode 100644
index 25c808a549e80..0000000000000
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/CorsHeadersTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\GraphQl;
-
-use Magento\Config\Model\ResourceModel\Config;
-use Magento\Framework\App\Config\ReinitableConfigInterface;
-use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\GraphQl\Model\Cors\Configuration;
-use Magento\TestFramework\ObjectManager;
-use Magento\TestFramework\TestCase\GraphQlAbstract;
-
-class CorsHeadersTest extends GraphQlAbstract
-{
-    /**
-     * @var Config $config
-     */
-    private $resourceConfig;
-    /**
-     * @var ReinitableConfigInterface
-     */
-    private $reinitConfig;
-    /**
-     * @var ScopeConfigInterface
-     */
-    private $scopeConfig;
-
-    /**
-     * @inheritdoc
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $objectManager = ObjectManager::getInstance();
-
-        $this->resourceConfig = $objectManager->get(Config::class);
-        $this->reinitConfig = $objectManager->get(ReinitableConfigInterface::class);
-        $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
-    }
-
-    protected function tearDown(): void
-    {
-        parent::tearDown();
-
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 0);
-        $this->reinitConfig->reinit();
-    }
-
-    public function testNoCorsHeadersWhenCorsIsDisabled(): void
-    {
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 0);
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_HEADERS, 'Origin');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOW_CREDENTIALS, '1');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_METHODS, 'GET,POST');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_ORIGINS, 'magento.local');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_MAX_AGE, '86400');
-        $this->reinitConfig->reinit();
-
-        $headers = $this->getHeadersFromIntrospectionQuery();
-
-        self::assertArrayNotHasKey('Access-Control-Max-Age', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Credentials', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Headers', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Methods', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Origin', $headers);
-    }
-
-    public function testCorsHeadersWhenCorsIsEnabled(): void
-    {
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 1);
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_HEADERS, 'Origin');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOW_CREDENTIALS, '1');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_METHODS, 'GET,POST');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_ORIGINS, 'magento.local');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_MAX_AGE, '86400');
-        $this->reinitConfig->reinit();
-
-        $headers = $this->getHeadersFromIntrospectionQuery();
-
-        self::assertEquals('Origin', $headers['Access-Control-Allow-Headers']);
-        self::assertEquals('1', $headers['Access-Control-Allow-Credentials']);
-        self::assertEquals('GET,POST', $headers['Access-Control-Allow-Methods']);
-        self::assertEquals('magento.local', $headers['Access-Control-Allow-Origin']);
-        self::assertEquals('86400', $headers['Access-Control-Max-Age']);
-    }
-
-    public function testEmptyCorsHeadersWhenCorsIsEnabled(): void
-    {
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_HEADERS_ENABLED, 1);
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_HEADERS, '');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOW_CREDENTIALS, '');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_METHODS, '');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_ALLOWED_ORIGINS, '');
-        $this->resourceConfig->saveConfig(Configuration::XML_PATH_CORS_MAX_AGE, '');
-        $this->reinitConfig->reinit();
-
-        $headers = $this->getHeadersFromIntrospectionQuery();
-
-        self::assertArrayNotHasKey('Access-Control-Max-Age', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Credentials', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Headers', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Methods', $headers);
-        self::assertArrayNotHasKey('Access-Control-Allow-Origin', $headers);
-    }
-
-    private function getHeadersFromIntrospectionQuery(): array
-    {
-        $query
-            = <<<QUERY
- query IntrospectionQuery {
-    __schema {
-        types {
-        name
-        }
-    }
-  }
-QUERY;
-
-        return $this->graphQlQueryWithResponseHeaders($query)['headers'] ?? [];
-    }
-}

From e90df20ec0edbe36e52aa2e76d4e46c972c10df4 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 4 Sep 2020 12:06:29 +0300
Subject: [PATCH 332/671] MC-37313: [Create UPS shipping label] Error message
 appears "Failed to send items" if Signature Confirmation is set to Not
 Required

---
 app/code/Magento/Ups/Model/Carrier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b6e539bdadcb9..ac9764d8c908d 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1538,7 +1538,7 @@ protected function _formShipmentRequest(DataObject $request)
             }
         }
 
-        if (isset($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
+        if (!empty($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
             $serviceOptionsNode = $shipmentPart->addChild('ShipmentServiceOptions');
             $serviceOptionsNode->addChild(
                 'DeliveryConfirmation'

From bfd31751733b7ea2264fb345401750a53472e297 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 4 Sep 2020 16:39:46 +0300
Subject: [PATCH 333/671] MC-37313: [Create UPS shipping label] Error message
 appears "Failed to send items" if Signature Confirmation is set to Not
 Required

---
 app/code/Magento/Ups/Model/Carrier.php                        | 4 ++++
 .../integration/testsuite/Magento/Ups/Model/CarrierTest.php   | 3 +++
 .../testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml   | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index ac9764d8c908d..4dcc832d1a7db 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1118,6 +1118,7 @@ protected function _getXmlTracking($trackings)
 
         /** @var HttpResponseDeferredInterface[] $trackingResponses */
         $trackingResponses = [];
+        $tracking = '';
         foreach ($trackings as $tracking) {
             /**
              * RequestOption==>'1' to request all activities
@@ -1362,6 +1363,7 @@ public function getAllowedMethods()
     protected function _formShipmentRequest(DataObject $request)
     {
         $packages = $request->getPackages();
+        $shipmentItems = [];
         foreach ($packages as $package) {
             $shipmentItems[] = $package['items'];
         }
@@ -1624,6 +1626,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
             $xmlResponse = '';
         }
 
+        $response = '';
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
         } catch (Throwable $e) {
@@ -1800,6 +1803,7 @@ protected function _doShipmentRequest(DataObject $request)
         $this->setXMLAccessRequest();
         $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
+        $debugData = [];
 
         if ($xmlResponse === null) {
             $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;
diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
index 4909a14f6f7d1..25633229516bb 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -252,6 +252,8 @@ public function testRequestToShipment(): void
                             'weight' => '0.55',
                             'customs_value' => '20.00',
                             'container' => 'Large Express Box',
+                            'delivery_confirmation_level' => 1,
+                            'delivery_confirmation' => 0,
                         ],
                         'items' => [
                             'item2' => [
@@ -262,6 +264,7 @@ public function testRequestToShipment(): void
                 ]
             ]
         );
+        $request->setRecipientAddressCountryCode('UK');
 
         $result = $this->carrier->requestToShipment($request);
 
diff --git a/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml
index 63463c087726c..8caf02a5160a2 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml
+++ b/dev/tests/integration/testsuite/Magento/Ups/_files/ShipmentConfirmRequest.xml
@@ -27,7 +27,7 @@
             <AddressLine1 />
             <AddressLine2 />
             <City />
-            <CountryCode />
+            <CountryCode>UK</CountryCode>
             <PostalCode />
             <ResidentialAddress />
         </Address>

From 49b2bd0784130517bff20845453c8679b191bce8 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 4 Sep 2020 16:52:46 +0300
Subject: [PATCH 334/671] MC-37313: [Create UPS shipping label] Error message
 appears "Failed to send items" if Signature Confirmation is set to Not
 Required

---
 .../integration/testsuite/Magento/Ups/Model/CarrierTest.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
index 25633229516bb..345c572b92861 100644
--- a/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/integration/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -252,7 +252,6 @@ public function testRequestToShipment(): void
                             'weight' => '0.55',
                             'customs_value' => '20.00',
                             'container' => 'Large Express Box',
-                            'delivery_confirmation_level' => 1,
                             'delivery_confirmation' => 0,
                         ],
                         'items' => [

From bce4a8cf95e55c6e6482332e0c9087d8ee453cfb Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 4 Sep 2020 21:41:54 +0300
Subject: [PATCH 335/671] fixed static issue

---
 .../Model/Export/AdvancedPricing.php          |  4 +--
 .../Setup/Patch/Data/InitializeAuthRoles.php  | 25 +++++++++----------
 .../Model/Indexer/Stock/AbstractAction.php    |  4 +--
 .../Model/Indexer/Stock/Action/Full.php       |  2 ++
 .../Model/Indexer/Stock/Processor.php         |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index a11f53aeb67b8..60f79987932ad 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -514,6 +514,7 @@ private function fetchTierPrices(array $productIds): array
      */
     protected function getTierPrices(array $listSku, $table)
     {
+        $selectFields = [];
         if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP])) {
             $exportFilter = $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP];
         }
@@ -570,12 +571,11 @@ protected function getTierPrices(array $listSku, $table)
                 if (isset($updatedAtTo) && !empty($updatedAtTo)) {
                     $select->where('cpe.updated_at <= ?', $updatedAtTo);
                 }
-                $exportData = $this->_connection->fetchAll($select);
+                return $this->_connection->fetchAll($select);
             } catch (\Exception $e) {
                 return false;
             }
         }
-        return $exportData;
     }
 
     /**
diff --git a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
index c133bae98f1c5..c450dc7127d4e 100644
--- a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
+++ b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
@@ -6,9 +6,6 @@
 
 namespace Magento\Authorization\Setup\Patch\Data;
 
-use Magento\Authorization\Model\ResourceModel\Role;
-use Magento\Authorization\Model\Rules;
-use Magento\Authorization\Setup\AuthorizationFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
@@ -17,7 +14,8 @@
 use Magento\Authorization\Model\UserContextInterface;
 
 /**
- * Class for Initialize Auth Roles
+ * Class InitializeAuthRoles
+ * @package Magento\Authorization\Setup\Patch
  */
 class InitializeAuthRoles implements DataPatchInterface, PatchVersionInterface
 {
@@ -27,24 +25,25 @@ class InitializeAuthRoles implements DataPatchInterface, PatchVersionInterface
     private $moduleDataSetup;
 
     /**
-     * @var AuthorizationFactory
+     * @var \Magento\Authorization\Setup\AuthorizationFactor
      */
     private $authFactory;
 
     /**
+     * InitializeAuthRoles constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
-     * @param AuthorizationFactory $authorizationFactory
+     * @param \Magento\Authorization\Setup\AuthorizationFactor $authorizationFactory
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        AuthorizationFactory $authorizationFactory
+        \Magento\Authorization\Setup\AuthorizationFactor $authorizationFactory
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->authFactory = $authorizationFactory;
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function apply()
     {
@@ -69,7 +68,7 @@ public function apply()
                 ]
             )->save();
         } else {
-            /** @var Role $item */
+            /** @var \Magento\Authorization\Model\ResourceModel\Role $item */
             foreach ($roleCollection as $item) {
                 $admGroupRole = $item;
                 break;
@@ -90,7 +89,7 @@ public function apply()
                 ]
             )->save();
         } else {
-            /** @var Rules $rule */
+            /** @var \Magento\Authorization\Model\Rules $rule */
             foreach ($rulesCollection as $rule) {
                 $rule->setData('resource_id', 'Magento_Backend::all')->save();
             }
@@ -109,7 +108,7 @@ public function apply()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public static function getDependencies()
     {
@@ -117,7 +116,7 @@ public static function getDependencies()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public static function getVersion()
     {
@@ -125,7 +124,7 @@ public static function getVersion()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
index 54d92cf12e2b8..4ea6b6bcfde9a 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php
@@ -12,8 +12,6 @@
 
 /**
  * Abstract action reindex class
- *
- * @package Magento\CatalogInventory\Model\Indexer\Stock
  */
 abstract class AbstractAction
 {
@@ -281,6 +279,8 @@ private function doReindex($productIds = [])
     }
 
     /**
+     * Get cache cleaner object
+     *
      * @return CacheCleaner
      */
     private function getCacheCleaner()
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
index e345ef2ee752b..43a5aabee9779 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * @category    Magento
+ * @package     Magento_CatalogInventory
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
index e59f81414f102..73c4a8833e433 100644
--- a/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
+++ b/app/code/Magento/CatalogInventory/Model/Indexer/Stock/Processor.php
@@ -9,7 +9,7 @@
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
     /**
-     * Indexer ID
+     * Get Indexer ID for cataloginventory_stock
      */
     const INDEXER_ID = 'cataloginventory_stock';
 }

From 9e248695ced252adbfd6127577786d5b8b28ae22 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 4 Sep 2020 21:43:30 +0300
Subject: [PATCH 336/671] minor changes

---
 .../Authorization/Setup/Patch/Data/InitializeAuthRoles.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
index c450dc7127d4e..84992badf65db 100644
--- a/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
+++ b/app/code/Magento/Authorization/Setup/Patch/Data/InitializeAuthRoles.php
@@ -25,18 +25,18 @@ class InitializeAuthRoles implements DataPatchInterface, PatchVersionInterface
     private $moduleDataSetup;
 
     /**
-     * @var \Magento\Authorization\Setup\AuthorizationFactor
+     * @var \Magento\Authorization\Setup\AuthorizationFactory
      */
     private $authFactory;
 
     /**
      * InitializeAuthRoles constructor.
      * @param ModuleDataSetupInterface $moduleDataSetup
-     * @param \Magento\Authorization\Setup\AuthorizationFactor $authorizationFactory
+     * @param \Magento\Authorization\Setup\AuthorizationFactory $authorizationFactory
      */
     public function __construct(
         ModuleDataSetupInterface $moduleDataSetup,
-        \Magento\Authorization\Setup\AuthorizationFactor $authorizationFactory
+        \Magento\Authorization\Setup\AuthorizationFactory $authorizationFactory
     ) {
         $this->moduleDataSetup = $moduleDataSetup;
         $this->authFactory = $authorizationFactory;

From ff97fe619d211ce80c4ecf73517f896c5a2cc2de Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Fri, 4 Sep 2020 22:30:39 +0300
Subject: [PATCH 337/671] fix some static issues

---
 .../Observer/PredispatchAdminActionControllerObserver.php    | 1 +
 .../Model/Export/AdvancedPricing.php                         | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
index 5c40ec88f0906..a244ad1fb9a0f 100644
--- a/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
+++ b/app/code/Magento/AdminNotification/Observer/PredispatchAdminActionControllerObserver.php
@@ -9,6 +9,7 @@
 
 /**
  * AdminNotification observer
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class PredispatchAdminActionControllerObserver implements ObserverInterface
 {
diff --git a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
index 60f79987932ad..27e2713995653 100644
--- a/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
+++ b/app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php
@@ -14,6 +14,7 @@
 /**
  * Export Advanced Pricing
  *
+ * @author      Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -514,7 +515,6 @@ private function fetchTierPrices(array $productIds): array
      */
     protected function getTierPrices(array $listSku, $table)
     {
-        $selectFields = [];
         if (isset($this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP])) {
             $exportFilter = $this->_parameters[\Magento\ImportExport\Model\Export::FILTER_ELEMENT_GROUP];
         }
@@ -571,11 +571,12 @@ protected function getTierPrices(array $listSku, $table)
                 if (isset($updatedAtTo) && !empty($updatedAtTo)) {
                     $select->where('cpe.updated_at <= ?', $updatedAtTo);
                 }
-                return $this->_connection->fetchAll($select);
+                $exportData = $this->_connection->fetchAll($select);
             } catch (\Exception $e) {
                 return false;
             }
         }
+        return $exportData;
     }
 
     /**

From 314ec92a7c82b70ac7460c21b2c82085e380d292 Mon Sep 17 00:00:00 2001
From: Bartosz Kubicki <bartosz.kubicki@lizardmedia.pl>
Date: Sat, 5 Sep 2020 22:23:44 +0200
Subject: [PATCH 338/671] Adding unit test

---
 .../Unit/Topology/ArgumentProcessorTest.php   | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php

diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php
new file mode 100644
index 0000000000000..ef1098da318ab
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\Amqp\Test\Unit\Topology;
+
+use InvalidArgumentException;
+use Magento\Framework\Amqp\Topology\ArgumentProcessor;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class ArgumentProcessorTest
+ */
+class ArgumentProcessorTest extends TestCase
+{
+    /**
+     * @var ArgumentProcessor|MockObject
+     */
+    private $argumentProcessor;
+
+    /**
+     * @return void
+     */
+    public function testProcessArgumentsWhenAnyArgumentIsIncorrect(): void
+    {
+        $arguments = [
+            'test' => new class {
+            }
+        ];
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->argumentProcessor->processArguments($arguments);
+    }
+
+    /**
+     * @return void
+     */
+    public function testProcessArgumentsWhenAllArgumentAreCorrect(): void
+    {
+        $arguments = [
+            'array_type' => ['some_key' => 'some_value'],
+            'numeric_value' => '25',
+            'integer_value' => 26,
+            'boolean_value' => false,
+            'string_value' => 'test'
+        ];
+
+        $expected = [
+            'array_type' => ['A', ['some_key' => 'some_value']],
+            'numeric_value' => ['I', 25],
+            'integer_value' => ['I', 26],
+            'boolean_value' => ['t', false],
+            'string_value' => ['S', 'test']
+        ];
+
+        $this->assertSame($expected, $this->argumentProcessor->processArguments($arguments));
+    }
+
+    /**
+     * @return void
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->argumentProcessor = $this->getMockForTrait(ArgumentProcessor::class);
+    }
+}

From 4b832de25424bd0b6049f6de43167edf79a8968c Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Wed, 5 Aug 2020 22:53:45 +0800
Subject: [PATCH 339/671] magento/adobe-stock-integration#1523: Switching
 between Views does not change the selected folder. [Media Gallery] - modified
 function to select folder when switching view

---
 .../web/js/directory/directoryTree.js         | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index decc337e1b83c..f8d129e9d0489 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -26,7 +26,7 @@ define([
                 filterChips: '${ $.filterChipsProvider }'
             },
             listens: {
-                '${ $.provider }:params.filters.path': 'clearFiltersHandle'
+                '${ $.provider }:params.filters.path': 'updateSelectedDirectory'
             },
             viewConfig: [{
                 component: 'Magento_MediaGalleryUi/js/directory/directories',
@@ -220,7 +220,7 @@ define([
                                 this.firejsTreeEvents();
                             }.bind(this));
                         } else {
-                            this.checkChipFiltersState();
+                            this.updateSelectedDirectory();
                         }
                     }.bind(this));
                 }.bind(this));
@@ -239,7 +239,7 @@ define([
             }.bind(this));
 
             $(this.directoryTreeSelector).on('loaded.jstree', function () {
-                this.checkChipFiltersState();
+                this.updateSelectedDirectory();
             }.bind(this));
 
         },
@@ -247,7 +247,7 @@ define([
         /**
          * Verify directory filter on init event, select folder per directory filter state
          */
-        checkChipFiltersState: function () {
+        updateSelectedDirectory: function () {
             var currentFilterPath = this.filterChips().filters.path,
                 isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
                 currentTreePath;
@@ -260,6 +260,12 @@ define([
             } else {
                 this.selectStorageRoot();
             }
+
+            if (_.isUndefined(currentFilterPath)) {
+                $(this.directoryTreeSelector).jstree('deselect_all');
+                this.activeNode(null);
+                this.directories().setInActive();
+            }
         },
 
         /**
@@ -281,8 +287,7 @@ define([
          * @param {String} currentFilterPath
          */
         isFiltersApplied: function (currentFilterPath) {
-            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '' &&
-                currentFilterPath !== 'wysiwyg' && currentFilterPath !== 'catalog/category';
+            return !_.isUndefined(currentFilterPath);
         },
 
         /**
@@ -302,17 +307,6 @@ define([
 
         },
 
-        /**
-         * Listener to clear filters event
-         */
-        clearFiltersHandle: function () {
-            if (_.isUndefined(this.filterChips().filters.path)) {
-                $(this.directoryTreeSelector).jstree('deselect_all');
-                this.activeNode(null);
-                this.directories().setInActive();
-            }
-        },
-
         /**
          * Set active node filter, or deselect if the same node clicked
          *

From 86b76a07cef9c299127fccc8f315b3a11212b572 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Thu, 6 Aug 2020 01:05:56 +0800
Subject: [PATCH 340/671] magento/adobe-stock-integration#1523: Switching
 between Views does not change the selected folder. [Media Gallery] - modified
 functions

---
 .../web/js/directory/directoryTree.js         | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index f8d129e9d0489..5981a7f09355d 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -252,19 +252,17 @@ define([
                 isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
                 currentTreePath;
 
-            currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
-                Base64.idDecode(window.MediabrowserUtility.pathId);
-
-            if (this.folderExistsInTree(currentTreePath)) {
-                this.locateNode(currentTreePath);
+            if (_.isUndefined(currentFilterPath)) {
+                this.clearFiltersHandle();
             } else {
-                this.selectStorageRoot();
-            }
+                currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
+                    Base64.idDecode(window.MediabrowserUtility.pathId);
 
-            if (_.isUndefined(currentFilterPath)) {
-                $(this.directoryTreeSelector).jstree('deselect_all');
-                this.activeNode(null);
-                this.directories().setInActive();
+                if (this.folderExistsInTree(currentTreePath)) {
+                    this.locateNode(currentTreePath);
+                } else {
+                    this.selectStorageRoot();
+                }
             }
         },
 
@@ -287,7 +285,8 @@ define([
          * @param {String} currentFilterPath
          */
         isFiltersApplied: function (currentFilterPath) {
-            return !_.isUndefined(currentFilterPath);
+            return !_.isUndefined(currentFilterPath) && currentFilterPath !== ''
+                && currentFilterPath !== 'catalog/category';
         },
 
         /**
@@ -307,6 +306,12 @@ define([
 
         },
 
+        clearFiltersHandle: function () {
+            $(this.directoryTreeSelector).jstree('deselect_all');
+            this.activeNode(null);
+            this.directories().setInActive();
+        },
+
         /**
          * Set active node filter, or deselect if the same node clicked
          *

From 6623424de1310608c24589d305b5c0ed2741396e Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 7 Aug 2020 04:15:43 +0800
Subject: [PATCH 341/671] magento/adobe-stock-integration#1523: Switching
 between Views does not change the selected folder. [Media Gallery] -
 implement request change and mftf test

---
 .../AssertFolderIsChangedActionGroup.xml      | 25 ++++++++
 ...nMediaGallerySwitchingBetweenViewsTest.xml | 63 +++++++++++++++++++
 .../web/js/directory/directoryTree.js         | 23 ++++---
 3 files changed, 101 insertions(+), 10 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertFolderIsChangedActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySwitchingBetweenViewsTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertFolderIsChangedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertFolderIsChangedActionGroup.xml
new file mode 100644
index 0000000000000..090dbed8b4f78
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertFolderIsChangedActionGroup.xml
@@ -0,0 +1,25 @@
+<?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="AssertFolderIsChangedActionGroup">
+        <annotations>
+            <description>Assert that folder is changed</description>
+        </annotations>
+        <arguments>
+            <argument name="newSelectedFolder" type="string"/>
+            <argument name="oldSelectedFolder" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
+        </arguments>
+
+        <assertNotEquals stepKey="assertNotEqual">
+            <actualResult type="string">{{newSelectedFolder}}</actualResult>
+            <expectedResult type="string">{{oldSelectedFolder}}</expectedResult>
+        </assertNotEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySwitchingBetweenViewsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySwitchingBetweenViewsTest.xml
new file mode 100644
index 0000000000000..01b8c27b7371d
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySwitchingBetweenViewsTest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGallerySwitchingBetweenViewsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1523"/>
+            <title value="User switches between Views and checks if the folder is changed"/>
+            <stories value="User switches between Views and checks if the folder is changed"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5060037"/>
+            <description value="User switches between Views and checks if the folder is changed"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeleteGridViewActionGroup" stepKey="deleteView">
+                <argument name="viewToDelete" value="New View"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderForDelete"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFolderContents"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySaveCustomViewActionGroup" stepKey="saveCustomView">
+            <argument name="viewName" value="New View"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="selectDefaultView">
+            <argument name="selectView" value="Default View"/>
+        </actionGroup>
+        <actionGroup ref="AssertFolderIsChangedActionGroup" stepKey="assertFolderIsChanged">
+            <argument name="newSelectedFolder" value="category" />
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="switchBackToNewView">
+            <argument name="selectView" value="New View"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup" stepKey="assertFilterApplied">
+            <argument name="resultValue" value="{{AdminMediaGalleryFolderData.name}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 5981a7f09355d..a0959fa90c7ba 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -254,15 +254,16 @@ define([
 
             if (_.isUndefined(currentFilterPath)) {
                 this.clearFiltersHandle();
-            } else {
-                currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
-                    Base64.idDecode(window.MediabrowserUtility.pathId);
+                return;
+            }
 
-                if (this.folderExistsInTree(currentTreePath)) {
-                    this.locateNode(currentTreePath);
-                } else {
-                    this.selectStorageRoot();
-                }
+            currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
+                Base64.idDecode(window.MediabrowserUtility.pathId);
+
+            if (this.folderExistsInTree(currentTreePath)) {
+                this.locateNode(currentTreePath);
+            } else {
+                this.selectStorageRoot();
             }
         },
 
@@ -285,8 +286,7 @@ define([
          * @param {String} currentFilterPath
          */
         isFiltersApplied: function (currentFilterPath) {
-            return !_.isUndefined(currentFilterPath) && currentFilterPath !== ''
-                && currentFilterPath !== 'catalog/category';
+            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '';
         },
 
         /**
@@ -306,6 +306,9 @@ define([
 
         },
 
+        /**
+         * Clear filters
+         */
         clearFiltersHandle: function () {
             $(this.directoryTreeSelector).jstree('deselect_all');
             this.activeNode(null);

From 8cda8d43b302f4cbc491119e9e2d150cf4ed438a Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 7 Aug 2020 22:17:49 +0800
Subject: [PATCH 342/671] magento/adobe-stock-integration#1523: Switching
 between Views does not change the selected folder. [Media Gallery] - fix
 failed static test

---
 .../view/adminhtml/web/js/directory/directoryTree.js             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index a0959fa90c7ba..7f0973a543761 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -254,6 +254,7 @@ define([
 
             if (_.isUndefined(currentFilterPath)) {
                 this.clearFiltersHandle();
+
                 return;
             }
 

From 567f37d7c3fdb52cb870fab7917e4f169b1a3ade Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Thu, 13 Aug 2020 17:20:59 +0100
Subject: [PATCH 343/671] magento/magento2#29411: Directory Tree refactoring

---
 .../Model/Directory/Command/CreateByPaths.php |   2 +-
 ...{DirectoriesTree.php => DirectoryTree.php} |   8 +-
 .../ui_component/media_gallery_listing.xml    |   2 +-
 .../standalone_media_gallery_listing.xml      |   2 +-
 .../deleteImageWithDetailConfirmation.js      |  23 +-
 .../adminhtml/web/js/directory/directories.js |  95 +++---
 .../web/js/directory/directoryTree.js         | 289 +++++++-----------
 7 files changed, 177 insertions(+), 244 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Ui/Component/{DirectoriesTree.php => DirectoryTree.php} (81%)

diff --git a/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php b/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php
index f33c22a18b4b8..d0ba786c7084e 100644
--- a/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php
+++ b/app/code/Magento/MediaGallery/Model/Directory/Command/CreateByPaths.php
@@ -78,7 +78,7 @@ public function execute(array $paths): void
         if (!empty($failedPaths)) {
             throw new CouldNotSaveException(
                 __(
-                    'Could not save directories: %paths',
+                    'Could not create directories: %paths',
                     [
                         'paths' => implode(' ,', $failedPaths)
                     ]
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php b/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php
similarity index 81%
rename from app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php
rename to app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php
index 4047a4fcb98d8..269bc1f8bcba7 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoriesTree.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/DirectoryTree.php
@@ -14,7 +14,7 @@
 /**
  * Directories tree component
  */
-class DirectoriesTree extends Container
+class DirectoryTree extends Container
 {
     /**
      * @var UrlInterface
@@ -50,9 +50,9 @@ public function prepare(): void
             array_replace_recursive(
                 (array) $this->getData('config'),
                 [
-                    'getDirectoryTreeUrl' => $this->url->getUrl("media_gallery/directories/gettree"),
-                    'deleteDirectoryUrl' => $this->url->getUrl("media_gallery/directories/delete"),
-                    'createDirectoryUrl' => $this->url->getUrl("media_gallery/directories/create")
+                    'getDirectoryTreeUrl' => $this->url->getUrl('media_gallery/directories/gettree'),
+                    'deleteDirectoryUrl' => $this->url->getUrl('media_gallery/directories/delete'),
+                    'createDirectoryUrl' => $this->url->getUrl('media_gallery/directories/create')
                 ]
             )
         );
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml
index 49206043725f9..66731b1cbae6f 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/media_gallery_listing.xml
@@ -219,7 +219,7 @@
         </container>
     </listingToolbar>
     <container name="media_gallery_directories"
-               class="Magento\MediaGalleryUi\Ui\Component\DirectoriesTree"
+               class="Magento\MediaGalleryUi\Ui\Component\DirectoryTree"
                template="Magento_MediaGalleryUi/grid/directories/directoryTree"
                component="Magento_MediaGalleryUi/js/directory/directoryTree"/>
     <columns name="media_gallery_columns" component="Magento_MediaGalleryUi/js/grid/masonry">
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
index 655178c104492..3656a8ea25f74 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/ui_component/standalone_media_gallery_listing.xml
@@ -206,7 +206,7 @@
         </container>
     </listingToolbar>
     <container name="media_gallery_directories"
-               class="Magento\MediaGalleryUi\Ui\Component\DirectoriesTree"
+               class="Magento\MediaGalleryUi\Ui\Component\DirectoryTree"
                template="Magento_MediaGalleryUi/grid/directories/directoryTree"
                component="Magento_MediaGalleryUi/js/directory/directoryTree"/>
     <columns name="media_gallery_columns" component="Magento_MediaGalleryUi/js/grid/masonry">
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
index ed40674df20f0..28c021fe4728f 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/action/deleteImageWithDetailConfirmation.js
@@ -21,25 +21,24 @@ define([
          * @param {String} deleteImageUrl
          */
         deleteImageAction: function (recordsIds, imageDetailsUrl, deleteImageUrl) {
-            var confirmationContent = $t('%1 Are you sure you want to delete "%2" image(s)?')
+            var confirmationContent = $t('%1Are you sure you want to delete "%2" image(s)?')
                 .replace('%2', Object.keys(recordsIds).length),
                 deferred = $.Deferred();
 
-            getDetails(imageDetailsUrl, recordsIds)
-                .then(function (imageDetails) {
+            getDetails(imageDetailsUrl, recordsIds).then(function (images) {
                         confirmationContent = confirmationContent.replace(
                             '%1',
-                            this.getRecordRelatedContentMessage(imageDetails)
+                            this.getRecordRelatedContentMessage(images) + ' '
                         );
                     }.bind(this)).fail(function () {
-                confirmationContent = confirmationContent.replace('%1', '');
-            }).always(function () {
-                deleteImages(recordsIds, deleteImageUrl, confirmationContent).then(function (status) {
-                    deferred.resolve(status);
-                }).fail(function (error) {
-                    deferred.reject(error);
-                });
-            });
+                        confirmationContent = confirmationContent.replace('%1', '');
+                    }).always(function () {
+                        deleteImages(recordsIds, deleteImageUrl, confirmationContent).then(function (status) {
+                            deferred.resolve(status);
+                        }).fail(function (error) {
+                            deferred.reject(error);
+                        });
+                    });
 
             return deferred.promise();
         },
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js
index d7f756d8bbd90..6d8d38a1ca1d6 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directories.js
@@ -23,6 +23,7 @@ define([
             deleteButtonSelector: '#delete_folder',
             createFolderButtonSelector: '#create_folder',
             messageDelay: 5,
+            selectedFolder: null,
             messagesName: 'media_gallery_listing.media_gallery_listing.messages',
             modules: {
                 directoryTree: '${ $.parentName }.media_gallery_directories',
@@ -47,51 +48,57 @@ define([
           */
         initEvents: function () {
             $(this.deleteButtonSelector).on('delete_folder', function () {
-                this.getConfirmationPopupDeleteFolder();
+                this.deleteFolder();
             }.bind(this));
 
             $(this.createFolderButtonSelector).on('create_folder', function () {
-                this.getPrompt({
-                    title: $t('New Folder Name:'),
-                    content: '',
-                    actions: {
-                        /**
-                         * Confirm action
-                         */
-                        confirm: function (folderName) {
-                            createDirectory(
-                                this.directoryTree().createDirectoryUrl,
-                                [this.getNewFolderPath(folderName)]
-                            ).then(function () {
-                                this.directoryTree().reloadJsTree().then(function () {
-                                    $(this.directoryTree().directoryTreeSelector).on('loaded.jstree', function () {
-                                        this.directoryTree().locateNode(this.getNewFolderPath(folderName));
-                                    }.bind(this));
-                                }.bind(this));
+                this.createFolder();
+            }.bind(this));
+        },
 
-                            }.bind(this)).fail(function (error) {
-                                uiAlert({
-                                    content: error
-                                });
+        /**
+         * Show confirmation popup and create folder based on user input
+         */
+        createFolder: function () {
+            this.getPrompt({
+                title: $t('New Folder Name:'),
+                content: '',
+                actions: {
+                    /**
+                     * Confirm action
+                     */
+                    confirm: function (folderName) {
+                        createDirectory(
+                            this.directoryTree().createDirectoryUrl,
+                            [this.getNewFolderPath(folderName)]
+                        ).then(function () {
+                            this.directoryTree().reloadJsTree().then(function () {
+                                $(this.directoryTree().directoryTreeSelector).on('loaded.jstree', function () {
+                                    this.directoryTree().locateNode(this.getNewFolderPath(folderName));
+                                }.bind(this));
+                            }.bind(this));
+                        }.bind(this)).fail(function (error) {
+                            uiAlert({
+                                content: error
                             });
-                        }.bind(this)
-                    },
-                    buttons: [{
-                        text: $t('Cancel'),
-                        class: 'action-secondary action-dismiss',
+                        });
+                    }.bind(this)
+                },
+                buttons: [{
+                    text: $t('Cancel'),
+                    class: 'action-secondary action-dismiss',
 
-                        /**
-                         * Close modal
-                         */
-                        click: function () {
-                            this.closeModal();
-                        }
-                    }, {
-                        text: $t('Confirm'),
-                        class: 'action-primary action-accept'
-                    }]
-                });
-            }.bind(this));
+                    /**
+                     * Close modal
+                     */
+                    click: function () {
+                        this.closeModal();
+                    }
+                }, {
+                    text: $t('Confirm'),
+                    class: 'action-primary action-accept'
+                }]
+            });
         },
 
         /**
@@ -101,11 +108,11 @@ define([
          * @returns {String}
          */
         getNewFolderPath: function (folderName) {
-            var selectedFolder = _.isUndefined(this.selectedFolder()) ||
-                                 _.isNull(this.selectedFolder()) ? '/' : this.selectedFolder(),
-               folderToCreate = selectedFolder !== '/' ? selectedFolder + '/' + folderName : folderName;
+            if (_.isUndefined(this.selectedFolder()) || _.isNull(this.selectedFolder())) {
+                return folderName;
+            }
 
-            return folderToCreate;
+            return this.selectedFolder() + '/' + folderName;
         },
 
         /**
@@ -136,7 +143,7 @@ define([
         /**
           * Confirmation popup for delete folder action.
           */
-        getConfirmationPopupDeleteFolder: function () {
+        deleteFolder: function () {
             confirm({
                 title: $t('Are you sure you want to delete this folder?'),
                 modalClass: 'delete-folder-confirmation-popup',
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 7f0973a543761..9cf5144808f7d 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -20,13 +20,14 @@ define([
             filterChipsProvider: 'componentType = filters, ns = ${ $.ns }',
             directoryTreeSelector: '#media-gallery-directory-tree',
             getDirectoryTreeUrl: 'media_gallery/directories/gettree',
-            jsTreeReloaded: null,
+            createDirectoryUrl: 'media_gallery/directories/create',
+            activeNode: null,
             modules: {
                 directories: '${ $.name }_directories',
                 filterChips: '${ $.filterChipsProvider }'
             },
             listens: {
-                '${ $.provider }:params.filters.path': 'updateSelectedDirectory'
+                '${ $.provider }:params.filters.path': 'selectTreeFolder'
             },
             viewConfig: [{
                 component: 'Magento_MediaGalleryUi/js/directory/directories',
@@ -49,7 +50,8 @@ define([
                     this.renderDirectoryTree().then(function () {
                         this.initEvents();
                     }.bind(this));
-                }.bind(this));
+                }.bind(this)
+            );
 
             return this;
         },
@@ -58,66 +60,57 @@ define([
          * Render directory tree component.
          */
         renderDirectoryTree: function () {
-
             return this.getJsonTree().then(function (data) {
                 this.createFolderIfNotExists(data).then(function (isFolderCreated) {
-                    if (isFolderCreated) {
-                        this.getJsonTree().then(function (newData) {
-                            this.createTree(newData);
-                        }.bind(this));
-                    } else {
+                    if (!isFolderCreated) {
                         this.createTree(data);
+                        return;
                     }
+
+                    this.getJsonTree().then(function (newData) {
+                        this.createTree(newData);
+                    }.bind(this));
                 }.bind(this));
             }.bind(this));
         },
 
-        /**
-         * Set jstree reloaded
-         *
-         * @param {Boolean} value
-         */
-        setJsTreeReloaded: function (value) {
-            this.jsTreeReloaded = value;
-        },
-
         /**
          * Create folder by provided current_tree_path param
          *
          * @param {Array} directories
          */
         createFolderIfNotExists: function (directories) {
-            var isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
-                currentTreePath = isMediaBrowser ? window.MediabrowserUtility.pathId : null,
+            var requestedDirectoryPath = this.getRequestedDirectory(),
                 deferred = $.Deferred(),
-                decodedPath,
                 pathArray;
 
-            if (currentTreePath) {
-                decodedPath = Base64.idDecode(currentTreePath);
-
-                if (!this.isDirectoryExist(directories[0], decodedPath)) {
-                    pathArray = this.convertPathToPathsArray(decodedPath);
+            if (!requestedDirectoryPath) {
+                deferred.resolve(false);
 
-                    $.each(pathArray, function (i, val) {
-                        if (this.isDirectoryExist(directories[0], val)) {
-                            pathArray.splice(i, 1);
-                        }
-                    }.bind(this));
+                return deferred.promise();
+            }
 
-                    createDirectory(
-                        this.createDirectoryUrl,
-                        pathArray
-                    ).then(function () {
-                        deferred.resolve(true);
-                    });
-                } else {
-                    deferred.resolve(false);
-                }
-            } else {
+            if (this.isDirectoryExist(directories[0], requestedDirectoryPath)) {
                 deferred.resolve(false);
+
+                return deferred.promise();
             }
 
+            pathArray = this.convertPathToPathsArray(requestedDirectoryPath);
+
+            $.each(pathArray, function (index, directoryId) {
+                if (this.isDirectoryExist(directories[0], directoryId)) {
+                    pathArray.splice(index, 1);
+                }
+            }.bind(this));
+
+            createDirectory(
+                this.createDirectoryUrl,
+                pathArray
+            ).then(function () {
+                deferred.resolve(true);
+            });
+
             return deferred.promise();
         },
 
@@ -125,33 +118,22 @@ define([
          * Verify if directory exists in array
          *
          * @param {Array} directories
-         * @param {String} directoryId
+         * @param {String} path
          */
-        isDirectoryExist: function (directories, directoryId) {
-            var found = false;
-
-            /**
-             * Recursive search in array
-             *
-             * @param {Array} data
-             * @param {String} id
-             */
-            function recurse(data, id) {
-                var i;
-
-                for (i = 0; i < data.length; i++) {
-                    if (data[i].attr.id === id) {
-                        found = data[i];
-                        break;
-                    } else if (data[i].children && data[i].children.length) {
-                        recurse(data[i].children, id);
-                    }
+        isDirectoryExist: function (directories, path) {
+            var i;
+
+            for (i = 0; i < directories.length; i++) {
+                if (directories[i].attr.id === path
+                    || directories[i].children
+                    && directories[i].children.length
+                    && this.isDirectoryExist(directories[i].children, path)
+                ) {
+                    return true;
                 }
             }
 
-            recurse(directories, directoryId);
-
-            return found;
+            return false;
         },
 
         /**
@@ -199,7 +181,7 @@ define([
         /**
          * Remove ability to multiple select on nodes
          */
-        overrideMultiselectBehavior: function () {
+        disableMultiselectBehavior: function () {
             $.jstree.defaults.ui['select_range_modifier'] = false;
             $.jstree.defaults.ui['select_multiple_modifier'] = false;
         },
@@ -208,21 +190,12 @@ define([
          *  Handle jstree events
          */
         initEvents: function () {
-            this.firejsTreeEvents();
-            this.overrideMultiselectBehavior();
+            this.initJsTreeEvents();
+            this.disableMultiselectBehavior();
 
             $(window).on('reload.MediaGallery', function () {
-                this.getJsonTree().then(function (data) {
-                    this.createFolderIfNotExists(data).then(function (isCreated) {
-                        if (isCreated) {
-                            this.renderDirectoryTree().then(function () {
-                                this.setJsTreeReloaded(true);
-                                this.firejsTreeEvents();
-                            }.bind(this));
-                        } else {
-                            this.updateSelectedDirectory();
-                        }
-                    }.bind(this));
+                this.renderDirectoryTree().then(function () {
+                    this.initJsTreeEvents();
                 }.bind(this));
             }.bind(this));
         },
@@ -230,64 +203,46 @@ define([
         /**
          * Fire event for jstree component
          */
-        firejsTreeEvents: function () {
+        initJsTreeEvents: function () {
             $(this.directoryTreeSelector).on('select_node.jstree', function (element, data) {
-                var path = $(data.rslt.obj).data('path');
-
-                this.setActiveNodeFilter(path);
-                this.setJsTreeReloaded(false);
+                this.toggleSelectedDirectory($(data.rslt.obj).data('path'));
             }.bind(this));
 
             $(this.directoryTreeSelector).on('loaded.jstree', function () {
-                this.updateSelectedDirectory();
-            }.bind(this));
+                var path = this.getRequestedDirectory() || this.filterChips().filters.path;
 
+                if (this.activeNode() !== path) {
+                    this.selectFolder(path);
+                }
+            }.bind(this));
         },
 
         /**
          * Verify directory filter on init event, select folder per directory filter state
          */
-        updateSelectedDirectory: function () {
-            var currentFilterPath = this.filterChips().filters.path,
-                isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
-                currentTreePath;
-
-            if (_.isUndefined(currentFilterPath)) {
-                this.clearFiltersHandle();
-
-                return;
-            }
-
-            currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
-                Base64.idDecode(window.MediabrowserUtility.pathId);
-
-            if (this.folderExistsInTree(currentTreePath)) {
-                this.locateNode(currentTreePath);
-            } else {
-                this.selectStorageRoot();
-            }
+        selectTreeFolder: function (path) {
+            this.isFolderRendered(path) ? this.locateNode(path) : this.selectStorageRoot();
         },
 
         /**
          * Verify if directory exists in folder tree
          *
          * @param {String} path
+         * @return {Boolean}
          */
-        folderExistsInTree: function (path) {
-            if (!_.isUndefined(path)) {
-                return $('#' + path.replace(/\//g, '\\/')).length === 1;
-            }
-
-            return false;
+        isFolderRendered: function (path) {
+            return _.isUndefined(path) ? false : $('#' + path.replace(/\//g, '\\/')).length === 1;
         },
 
         /**
-         * Check if need to select directory by filters state
+         * Get directory requested from MediabrowserUtility
          *
-         * @param {String} currentFilterPath
+         * @return {String|Null}
          */
-        isFiltersApplied: function (currentFilterPath) {
-            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '';
+        getRequestedDirectory: function () {
+            return !_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== ''
+                ? Base64.idDecode(window.MediabrowserUtility.pathId)
+                : null;
         },
 
         /**
@@ -296,62 +251,40 @@ define([
          * @param {String} path
          */
         locateNode: function (path) {
-            var selectedId =  $(this.directoryTreeSelector).jstree('get_selected').attr('id');
-
-            if (path === selectedId) {
+            if (path === $(this.directoryTreeSelector).jstree('get_selected').attr('id')) {
                 return;
             }
             path = path.replace(/\//g, '\\/');
             $(this.directoryTreeSelector).jstree('open_node', '#' + path);
             $(this.directoryTreeSelector).jstree('select_node', '#' + path, true);
-
-        },
-
-        /**
-         * Clear filters
-         */
-        clearFiltersHandle: function () {
-            $(this.directoryTreeSelector).jstree('deselect_all');
-            this.activeNode(null);
-            this.directories().setInActive();
         },
 
         /**
          * Set active node filter, or deselect if the same node clicked
          *
-         * @param {String} nodePath
+         * @param {String} path
          */
-        setActiveNodeFilter: function (nodePath) {
-
-            if (this.activeNode() === nodePath && !this.jsTreeReloaded) {
-                this.selectStorageRoot();
-            } else {
-                this.selectFolder(nodePath);
-            }
+        toggleSelectedDirectory: function (path) {
+            this.activeNode() === path ? this.selectStorageRoot() : this.selectFolder(path);
         },
 
         /**
          * Remove folders selection -> select storage root
          */
         selectStorageRoot: function () {
-            var filters = {},
-                applied = this.filterChips().get('applied');
-
             $(this.directoryTreeSelector).jstree('deselect_all');
-
-            filters = $.extend(true, filters, applied);
-            delete filters.path;
-            this.filterChips().set('applied', filters);
             this.activeNode(null);
+
             this.waitForCondition(
-              function () {
-                return _.isUndefined(this.directories());
-            }.bind(this),
                 function () {
-                this.directories().setInActive();
-            }.bind(this)
-          );
+                    return _.isUndefined(this.directories());
+                }.bind(this),
+                function () {
+                    this.directories().setInActive();
+                }.bind(this)
+            );
 
+            this.dropFilter();
         },
 
         /**
@@ -360,7 +293,9 @@ define([
          * @param {String} path
          */
         selectFolder: function (path) {
-            this.activeNode(path);
+            if (_.isUndefined(path) || _.isNull(path)) {
+                return;
+            }
 
             this.waitForCondition(
                 function () {
@@ -372,11 +307,12 @@ define([
             );
 
             this.applyFilter(path);
+            this.activeNode(path);
         },
 
         /**
-          * Remove active node from directory tree, and select next
-          */
+         * Remove active node from directory tree, and select next
+         */
         removeNode: function () {
             $(this.directoryTreeSelector).jstree('remove');
         },
@@ -387,13 +323,29 @@ define([
          * @param {String} path
          */
         applyFilter: function (path) {
+            this.filterChips().set(
+                'applied',
+                $.extend(
+                    true,
+                    {},
+                    this.filterChips().get('applied'),
+                    {
+                        path: path
+                    }
+                )
+            );
+        },
+
+        /**
+         * Drop path filter
+         */
+        dropFilter: function () {
             var filters = {},
                 applied = this.filterChips().get('applied');
 
             filters = $.extend(true, filters, applied);
-            filters.path = path;
+            delete filters.path;
             this.filterChips().set('applied', filters);
-
         },
 
         /**
@@ -404,7 +356,6 @@ define([
 
             this.getJsonTree().then(function (data) {
                 this.createTree(data);
-                this.setJsTreeReloaded(true);
                 this.initEvents();
                 deferred.resolve();
             }.bind(this));
@@ -416,35 +367,11 @@ define([
          * Get json data for jstree
          */
         getJsonTree: function () {
-            var deferred = $.Deferred();
-
-            $.ajax({
+            return $.ajax({
                 url: this.getDirectoryTreeUrl,
                 type: 'GET',
-                dataType: 'json',
-
-                /**
-                 * Success handler for request
-                 *
-                 * @param {Object} data
-                 */
-                success: function (data) {
-                    deferred.resolve(data);
-                },
-
-                /**
-                 * Error handler for request
-                 *
-                 * @param {Object} jqXHR
-                 * @param {String} textStatus
-                 */
-                error: function (jqXHR, textStatus) {
-                    deferred.reject();
-                    throw textStatus;
-                }
+                dataType: 'json'
             });
-
-            return deferred.promise();
         },
 
         /**
@@ -454,7 +381,7 @@ define([
          */
         createTree: function (data) {
             $(this.directoryTreeSelector).jstree({
-                plugins: ['json_data', 'themes',  'ui', 'crrm', 'types', 'hotkeys'],
+                plugins: ['json_data', 'themes', 'ui', 'crrm', 'types', 'hotkeys'],
                 vcheckbox: {
                     'two_state': true,
                     'real_checkboxes': true

From 17ea5667e61c730ff53f062f97e4d542c9e5b0ed Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 18 Aug 2020 13:23:24 +0100
Subject: [PATCH 344/671] magento/magento2#29411: Naming update

---
 .../Adminhtml/Directories/GetTree.php         | 16 ++---
 ...GetFolderTree.php => GetDirectoryTree.php} | 59 ++++++-------------
 app/code/Magento/MediaGalleryUi/etc/di.xml    |  5 --
 3 files changed, 28 insertions(+), 52 deletions(-)
 rename app/code/Magento/MediaGalleryUi/Model/Directories/{GetFolderTree.php => GetDirectoryTree.php} (77%)

diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
index d4885cae055dd..d9a38895e1fa0 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\ResultFactory;
-use Magento\MediaGalleryUi\Model\Directories\GetFolderTree;
+use Magento\MediaGalleryUi\Model\Directories\GetDirectoryTree;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -33,25 +33,25 @@ class GetTree extends Action implements HttpGetActionInterface
     private $logger;
 
     /**
-     * @var GetFolderTree
+     * @var GetDirectoryTree
      */
-    private $getFolderTree;
+    private $getDirectoryTree;
 
     /**
      * Constructor
      *
      * @param Action\Context $context
      * @param LoggerInterface $logger
-     * @param GetFolderTree $getFolderTree
+     * @param GetDirectoryTree $getDirectoryTree
      */
     public function __construct(
         Action\Context $context,
         LoggerInterface $logger,
-        GetFolderTree $getFolderTree
+        GetDirectoryTree $getDirectoryTree
     ) {
         parent::__construct($context);
         $this->logger = $logger;
-        $this->getFolderTree = $getFolderTree;
+        $this->getDirectoryTree = $getDirectoryTree;
     }
     /**
      * @inheritdoc
@@ -59,7 +59,9 @@ public function __construct(
     public function execute()
     {
         try {
-            $responseContent[] = $this->getFolderTree->execute();
+            $responseContent = [
+                $this->getDirectoryTree->execute()
+            ];
             $responseCode = self::HTTP_OK;
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
similarity index 77%
rename from app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
rename to app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
index f0998a3e120f2..35e34a7e5532c 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
@@ -7,58 +7,61 @@
 
 namespace Magento\MediaGalleryUi\Model\Directories;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Read;
 use Magento\MediaGalleryApi\Api\IsPathExcludedInterface;
 
 /**
- * Build folder tree structure by path
+ * Build media gallery folder tree structure by path
  */
-class GetFolderTree
+class GetDirectoryTree
 {
     /**
      * @var Filesystem
      */
     private $filesystem;
 
-    /**
-     * @var string
-     */
-    private $path;
-
     /**
      * @var IsPathExcludedInterface
      */
     private $isPathExcluded;
 
     /**
-     * Constructor
-     *
      * @param Filesystem $filesystem
-     * @param string $path
      * @param IsPathExcludedInterface $isPathExcluded
      */
     public function __construct(
         Filesystem $filesystem,
-        string $path,
         IsPathExcludedInterface $isPathExcluded
     ) {
         $this->filesystem = $filesystem;
-        $this->path = $path;
         $this->isPathExcluded = $isPathExcluded;
     }
 
     /**
      * Return directory folder structure in array
      *
-     * @param bool $skipRoot
      * @return array
      * @throws ValidatorException
      */
-    public function execute(bool $skipRoot = true): array
+    public function execute(): array
     {
-        return $this->buildFolderTree($this->getDirectories(), $skipRoot);
+        $tree = [
+            'name' => 'root',
+            'path' => '/',
+            'children' => []
+        ];
+        $directories = $this->getDirectories();
+        foreach ($directories as $idx => &$node) {
+            $node['children'] = [];
+            $result = $this->findParent($node, $tree);
+            $parent = &$result['treeNode'];
+
+            $parent['children'][] = &$directories[$idx];
+        }
+        return $tree['children'];
     }
 
     /**
@@ -72,7 +75,7 @@ private function getDirectories(): array
         $directories = [];
 
         /** @var Read $directory */
-        $directory = $this->filesystem->getDirectoryRead($this->path);
+        $directory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
 
         if (!$directory->isDirectory()) {
             return $directories;
@@ -96,30 +99,6 @@ private function getDirectories(): array
         return $directories;
     }
 
-    /**
-     * Build folder tree structure by provided directories path
-     *
-     * @param array $directories
-     * @param bool $skipRoot
-     * @return array
-     */
-    private function buildFolderTree(array $directories, bool $skipRoot): array
-    {
-        $tree = [
-            'name' => 'root',
-            'path' => '/',
-            'children' => []
-        ];
-        foreach ($directories as $idx => &$node) {
-            $node['children'] = [];
-            $result = $this->findParent($node, $tree);
-            $parent = & $result['treeNode'];
-
-            $parent['children'][] =& $directories[$idx];
-        }
-        return $skipRoot ? $tree['children'] : $tree;
-    }
-
     /**
      * Find parent directory
      *
diff --git a/app/code/Magento/MediaGalleryUi/etc/di.xml b/app/code/Magento/MediaGalleryUi/etc/di.xml
index a8c4e2a8d8963..6ed3a98bbf03a 100644
--- a/app/code/Magento/MediaGalleryUi/etc/di.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/di.xml
@@ -28,11 +28,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\MediaGalleryUi\Model\Directories\GetFolderTree">
-        <arguments>
-            <argument name="path" xsi:type="string">media</argument>
-        </arguments>
-    </type>
     <type name="Magento\MediaGallerySynchronizationApi\Model\ImportFilesComposite">
         <plugin name="createMediaGalleryThumbnails" type="Magento\MediaGalleryUi\Plugin\CreateThumbnails"/>
     </type>

From c918a54a77aee4abdec9c53a30fac8833542b81c Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 18 Aug 2020 14:21:19 +0100
Subject: [PATCH 345/671] magento/magento2#29411: Updated requested directory
 selection behaviour

---
 .../web/js/directory/directoryTree.js         | 244 ++++++++++++------
 1 file changed, 163 insertions(+), 81 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 9cf5144808f7d..a5c5de1ccdf73 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -21,13 +21,13 @@ define([
             directoryTreeSelector: '#media-gallery-directory-tree',
             getDirectoryTreeUrl: 'media_gallery/directories/gettree',
             createDirectoryUrl: 'media_gallery/directories/create',
-            activeNode: null,
+            jsTreeReloaded: null,
             modules: {
                 directories: '${ $.name }_directories',
                 filterChips: '${ $.filterChipsProvider }'
             },
             listens: {
-                '${ $.provider }:params.filters.path': 'selectTreeFolder'
+                '${ $.provider }:params.filters.path': 'updateSelectedDirectory'
             },
             viewConfig: [{
                 component: 'Magento_MediaGalleryUi/js/directory/directories',
@@ -62,45 +62,57 @@ define([
         renderDirectoryTree: function () {
             return this.getJsonTree().then(function (data) {
                 this.createFolderIfNotExists(data).then(function (isFolderCreated) {
-                    if (!isFolderCreated) {
+                    if (isFolderCreated) {
+                        this.getJsonTree().then(function (newData) {
+                            this.createTree(newData);
+                        }.bind(this));
+                    } else {
                         this.createTree(data);
-                        return;
                     }
-
-                    this.getJsonTree().then(function (newData) {
-                        this.createTree(newData);
-                    }.bind(this));
                 }.bind(this));
             }.bind(this));
         },
 
+        /**
+         * Set jstree reloaded
+         *
+         * @param {Boolean} value
+         */
+        setJsTreeReloaded: function (value) {
+            this.jsTreeReloaded = value;
+        },
+
         /**
          * Create folder by provided current_tree_path param
          *
          * @param {Array} directories
          */
         createFolderIfNotExists: function (directories) {
-            var requestedDirectoryPath = this.getRequestedDirectory(),
+            var isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
+                currentTreePath = isMediaBrowser ? window.MediabrowserUtility.pathId : null,
                 deferred = $.Deferred(),
+                decodedPath,
                 pathArray;
 
-            if (!requestedDirectoryPath) {
+            if (!currentTreePath) {
                 deferred.resolve(false);
 
                 return deferred.promise();
             }
 
-            if (this.isDirectoryExist(directories[0], requestedDirectoryPath)) {
+            decodedPath = Base64.idDecode(currentTreePath);
+
+            if (this.isDirectoryExist(directories[0], decodedPath)) {
                 deferred.resolve(false);
 
                 return deferred.promise();
             }
 
-            pathArray = this.convertPathToPathsArray(requestedDirectoryPath);
+            pathArray = this.convertPathToPathsArray(decodedPath);
 
-            $.each(pathArray, function (index, directoryId) {
-                if (this.isDirectoryExist(directories[0], directoryId)) {
-                    pathArray.splice(index, 1);
+            $.each(pathArray, function (i, val) {
+                if (this.isDirectoryExist(directories[0], val)) {
+                    pathArray.splice(i, 1);
                 }
             }.bind(this));
 
@@ -118,22 +130,33 @@ define([
          * Verify if directory exists in array
          *
          * @param {Array} directories
-         * @param {String} path
+         * @param {String} directoryId
          */
-        isDirectoryExist: function (directories, path) {
-            var i;
-
-            for (i = 0; i < directories.length; i++) {
-                if (directories[i].attr.id === path
-                    || directories[i].children
-                    && directories[i].children.length
-                    && this.isDirectoryExist(directories[i].children, path)
-                ) {
-                    return true;
+        isDirectoryExist: function (directories, directoryId) {
+            var found = false;
+
+            /**
+             * Recursive search in array
+             *
+             * @param {Array} data
+             * @param {String} id
+             */
+            function recurse(data, id) {
+                var i;
+
+                for (i = 0; i < data.length; i++) {
+                    if (data[i].attr.id === id) {
+                        found = data[i];
+                        break;
+                    } else if (data[i].children && data[i].children.length) {
+                        recurse(data[i].children, id);
+                    }
                 }
             }
 
-            return false;
+            recurse(directories, directoryId);
+
+            return found;
         },
 
         /**
@@ -181,7 +204,7 @@ define([
         /**
          * Remove ability to multiple select on nodes
          */
-        disableMultiselectBehavior: function () {
+        overrideMultiselectBehavior: function () {
             $.jstree.defaults.ui['select_range_modifier'] = false;
             $.jstree.defaults.ui['select_multiple_modifier'] = false;
         },
@@ -190,12 +213,21 @@ define([
          *  Handle jstree events
          */
         initEvents: function () {
-            this.initJsTreeEvents();
-            this.disableMultiselectBehavior();
+            this.firejsTreeEvents();
+            this.overrideMultiselectBehavior();
 
             $(window).on('reload.MediaGallery', function () {
-                this.renderDirectoryTree().then(function () {
-                    this.initJsTreeEvents();
+                this.getJsonTree().then(function (data) {
+                    this.createFolderIfNotExists(data).then(function (isCreated) {
+                        if (isCreated) {
+                            this.renderDirectoryTree().then(function () {
+                                this.setJsTreeReloaded(true);
+                                this.firejsTreeEvents();
+                            }.bind(this));
+                        } else {
+                            this.updateSelectedDirectory();
+                        }
+                    }.bind(this));
                 }.bind(this));
             }.bind(this));
         },
@@ -203,78 +235,124 @@ define([
         /**
          * Fire event for jstree component
          */
-        initJsTreeEvents: function () {
+        firejsTreeEvents: function () {
             $(this.directoryTreeSelector).on('select_node.jstree', function (element, data) {
-                this.toggleSelectedDirectory($(data.rslt.obj).data('path'));
+                this.setActiveNodeFilter($(data.rslt.obj).data('path'));
+                this.setJsTreeReloaded(false);
             }.bind(this));
 
             $(this.directoryTreeSelector).on('loaded.jstree', function () {
-                var path = this.getRequestedDirectory() || this.filterChips().filters.path;
-
-                if (this.activeNode() !== path) {
-                    this.selectFolder(path);
-                }
+                this.updateSelectedDirectory();
             }.bind(this));
+
         },
 
         /**
          * Verify directory filter on init event, select folder per directory filter state
          */
-        selectTreeFolder: function (path) {
-            this.isFolderRendered(path) ? this.locateNode(path) : this.selectStorageRoot();
+        updateSelectedDirectory: function () {
+            var currentFilterPath = this.filterChips().filters.path,
+                requestedDirectory = this.getRequestedDirectory(),
+                currentTreePath;
+
+            if (_.isUndefined(currentFilterPath)) {
+                this.clearFiltersHandle();
+
+                return;
+            }
+
+            currentTreePath = this.isFilterApplied(currentFilterPath) || _.isNull(requestedDirectory)
+                ? currentFilterPath
+                : requestedDirectory;
+
+            if (this.folderExistsInTree(currentTreePath)) {
+                this.locateNode(currentTreePath);
+            } else {
+                this.selectStorageRoot();
+            }
         },
 
         /**
          * Verify if directory exists in folder tree
          *
          * @param {String} path
-         * @return {Boolean}
          */
-        isFolderRendered: function (path) {
-            return _.isUndefined(path) ? false : $('#' + path.replace(/\//g, '\\/')).length === 1;
+        folderExistsInTree: function (path) {
+            if (!_.isUndefined(path)) {
+                return $('#' + path.replace(/\//g, '\\/')).length === 1;
+            }
+
+            return false;
         },
 
-        /**
-         * Get directory requested from MediabrowserUtility
-         *
-         * @return {String|Null}
-         */
         getRequestedDirectory: function () {
-            return !_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== ''
+            return (!_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== '')
                 ? Base64.idDecode(window.MediabrowserUtility.pathId)
                 : null;
         },
 
+        /**
+         * Check if need to select directory by filters state
+         *
+         * @param {String} currentFilterPath
+         */
+        isFilterApplied: function (currentFilterPath) {
+            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '';
+        },
+
         /**
          * Locate and higlight node in jstree by path id.
          *
          * @param {String} path
          */
         locateNode: function (path) {
-            if (path === $(this.directoryTreeSelector).jstree('get_selected').attr('id')) {
+            var selectedId =  $(this.directoryTreeSelector).jstree('get_selected').attr('id');
+
+            if (path === selectedId) {
                 return;
             }
             path = path.replace(/\//g, '\\/');
             $(this.directoryTreeSelector).jstree('open_node', '#' + path);
             $(this.directoryTreeSelector).jstree('select_node', '#' + path, true);
+
+        },
+
+        /**
+         * Clear filters
+         */
+        clearFiltersHandle: function () {
+            $(this.directoryTreeSelector).jstree('deselect_all');
+            this.activeNode(null);
+            this.directories().setInActive();
         },
 
         /**
          * Set active node filter, or deselect if the same node clicked
          *
-         * @param {String} path
+         * @param {String} nodePath
          */
-        toggleSelectedDirectory: function (path) {
-            this.activeNode() === path ? this.selectStorageRoot() : this.selectFolder(path);
+        setActiveNodeFilter: function (nodePath) {
+
+            if (this.activeNode() === nodePath && !this.jsTreeReloaded) {
+                this.selectStorageRoot();
+            } else {
+                this.selectFolder(nodePath);
+            }
         },
 
         /**
          * Remove folders selection -> select storage root
          */
         selectStorageRoot: function () {
+            var filters = {},
+                applied = this.filterChips().get('applied');
+
             $(this.directoryTreeSelector).jstree('deselect_all');
-            this.activeNode(null);
 
+            filters = $.extend(true, filters, applied);
+            delete filters.path;
+            this.filterChips().set('applied', filters);
+            this.activeNode(null);
             this.waitForCondition(
                 function () {
                     return _.isUndefined(this.directories());
@@ -284,7 +362,6 @@ define([
                 }.bind(this)
             );
 
-            this.dropFilter();
         },
 
         /**
@@ -293,9 +370,7 @@ define([
          * @param {String} path
          */
         selectFolder: function (path) {
-            if (_.isUndefined(path) || _.isNull(path)) {
-                return;
-            }
+            this.activeNode(path);
 
             this.waitForCondition(
                 function () {
@@ -307,7 +382,6 @@ define([
             );
 
             this.applyFilter(path);
-            this.activeNode(path);
         },
 
         /**
@@ -323,28 +397,11 @@ define([
          * @param {String} path
          */
         applyFilter: function (path) {
-            this.filterChips().set(
-                'applied',
-                $.extend(
-                    true,
-                    {},
-                    this.filterChips().get('applied'),
-                    {
-                        path: path
-                    }
-                )
-            );
-        },
-
-        /**
-         * Drop path filter
-         */
-        dropFilter: function () {
             var filters = {},
                 applied = this.filterChips().get('applied');
 
             filters = $.extend(true, filters, applied);
-            delete filters.path;
+            filters.path = path;
             this.filterChips().set('applied', filters);
         },
 
@@ -356,6 +413,7 @@ define([
 
             this.getJsonTree().then(function (data) {
                 this.createTree(data);
+                this.setJsTreeReloaded(true);
                 this.initEvents();
                 deferred.resolve();
             }.bind(this));
@@ -367,11 +425,35 @@ define([
          * Get json data for jstree
          */
         getJsonTree: function () {
-            return $.ajax({
+            var deferred = $.Deferred();
+
+            $.ajax({
                 url: this.getDirectoryTreeUrl,
                 type: 'GET',
-                dataType: 'json'
+                dataType: 'json',
+
+                /**
+                 * Success handler for request
+                 *
+                 * @param {Object} data
+                 */
+                success: function (data) {
+                    deferred.resolve(data);
+                },
+
+                /**
+                 * Error handler for request
+                 *
+                 * @param {Object} jqXHR
+                 * @param {String} textStatus
+                 */
+                error: function (jqXHR, textStatus) {
+                    deferred.reject();
+                    throw textStatus;
+                }
             });
+
+            return deferred.promise();
         },
 
         /**
@@ -381,7 +463,7 @@ define([
          */
         createTree: function (data) {
             $(this.directoryTreeSelector).jstree({
-                plugins: ['json_data', 'themes', 'ui', 'crrm', 'types', 'hotkeys'],
+                plugins: ['json_data', 'themes',  'ui', 'crrm', 'types', 'hotkeys'],
                 vcheckbox: {
                     'two_state': true,
                     'real_checkboxes': true

From 3f02497278ef8b0cce764d7b43ad72c6500c3bbf Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 18 Aug 2020 14:33:35 +0100
Subject: [PATCH 346/671] magento/magento2#29411: Formatting fixes

---
 .../web/js/directory/directoryTree.js         | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index a5c5de1ccdf73..4749593f08d4f 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -21,6 +21,7 @@ define([
             directoryTreeSelector: '#media-gallery-directory-tree',
             getDirectoryTreeUrl: 'media_gallery/directories/gettree',
             createDirectoryUrl: 'media_gallery/directories/create',
+            deleteDirectoryUrl: 'media_gallery/directories/delete',
             jsTreeReloaded: null,
             modules: {
                 directories: '${ $.name }_directories',
@@ -88,27 +89,23 @@ define([
          * @param {Array} directories
          */
         createFolderIfNotExists: function (directories) {
-            var isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
-                currentTreePath = isMediaBrowser ? window.MediabrowserUtility.pathId : null,
+            var requestedDirectory = this.getRequestedDirectory(),
                 deferred = $.Deferred(),
-                decodedPath,
                 pathArray;
 
-            if (!currentTreePath) {
+            if (_.isNull(requestedDirectory)) {
                 deferred.resolve(false);
 
                 return deferred.promise();
             }
 
-            decodedPath = Base64.idDecode(currentTreePath);
-
-            if (this.isDirectoryExist(directories[0], decodedPath)) {
+            if (this.isDirectoryExist(directories[0], requestedDirectory)) {
                 deferred.resolve(false);
 
                 return deferred.promise();
             }
 
-            pathArray = this.convertPathToPathsArray(decodedPath);
+            pathArray = this.convertPathToPathsArray(requestedDirectory);
 
             $.each(pathArray, function (i, val) {
                 if (this.isDirectoryExist(directories[0], val)) {
@@ -204,7 +201,7 @@ define([
         /**
          * Remove ability to multiple select on nodes
          */
-        overrideMultiselectBehavior: function () {
+        disableMultiselectBehavior : function () {
             $.jstree.defaults.ui['select_range_modifier'] = false;
             $.jstree.defaults.ui['select_multiple_modifier'] = false;
         },
@@ -213,8 +210,8 @@ define([
          *  Handle jstree events
          */
         initEvents: function () {
-            this.firejsTreeEvents();
-            this.overrideMultiselectBehavior();
+            this.initJsTreeEvents();
+            this.disableMultiselectBehavior();
 
             $(window).on('reload.MediaGallery', function () {
                 this.getJsonTree().then(function (data) {
@@ -222,7 +219,7 @@ define([
                         if (isCreated) {
                             this.renderDirectoryTree().then(function () {
                                 this.setJsTreeReloaded(true);
-                                this.firejsTreeEvents();
+                                this.initJsTreeEvents();
                             }.bind(this));
                         } else {
                             this.updateSelectedDirectory();
@@ -235,7 +232,7 @@ define([
         /**
          * Fire event for jstree component
          */
-        firejsTreeEvents: function () {
+        initJsTreeEvents: function () {
             $(this.directoryTreeSelector).on('select_node.jstree', function (element, data) {
                 this.setActiveNodeFilter($(data.rslt.obj).data('path'));
                 this.setJsTreeReloaded(false);
@@ -244,7 +241,6 @@ define([
             $(this.directoryTreeSelector).on('loaded.jstree', function () {
                 this.updateSelectedDirectory();
             }.bind(this));
-
         },
 
         /**
@@ -285,6 +281,11 @@ define([
             return false;
         },
 
+        /**
+         * Get requested directory from MediabrowserUtility
+         *
+         * @returns {String|null}
+         */
         getRequestedDirectory: function () {
             return (!_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== '')
                 ? Base64.idDecode(window.MediabrowserUtility.pathId)
@@ -306,9 +307,7 @@ define([
          * @param {String} path
          */
         locateNode: function (path) {
-            var selectedId =  $(this.directoryTreeSelector).jstree('get_selected').attr('id');
-
-            if (path === selectedId) {
+            if (path === $(this.directoryTreeSelector).jstree('get_selected').attr('id')) {
                 return;
             }
             path = path.replace(/\//g, '\\/');
@@ -332,7 +331,6 @@ define([
          * @param {String} nodePath
          */
         setActiveNodeFilter: function (nodePath) {
-
             if (this.activeNode() === nodePath && !this.jsTreeReloaded) {
                 this.selectStorageRoot();
             } else {
@@ -361,7 +359,6 @@ define([
                     this.directories().setInActive();
                 }.bind(this)
             );
-
         },
 
         /**

From fe307294d112c79f58fb55564e60e7aaef75776c Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 18 Aug 2020 18:24:51 +0100
Subject: [PATCH 347/671] magento/magento2#29411: Fixed static tests

---
 .../view/adminhtml/web/js/directory/directoryTree.js          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 4749593f08d4f..0309b11296181 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -201,7 +201,7 @@ define([
         /**
          * Remove ability to multiple select on nodes
          */
-        disableMultiselectBehavior : function () {
+        disableMultiselectBehavior: function () {
             $.jstree.defaults.ui['select_range_modifier'] = false;
             $.jstree.defaults.ui['select_multiple_modifier'] = false;
         },
@@ -287,7 +287,7 @@ define([
          * @returns {String|null}
          */
         getRequestedDirectory: function () {
-            return (!_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== '')
+            return !_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== ''
                 ? Base64.idDecode(window.MediabrowserUtility.pathId)
                 : null;
         },

From faceaacb768d9dec1030208f3b054f16b4e3796b Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 24 Aug 2020 17:56:31 +0100
Subject: [PATCH 348/671] magento/magento2#29411: Fixed MFTF test

---
 .../Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index ca7a71258fead..3dd294fa50605 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -36,6 +36,7 @@
         <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImage"/>
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategoryForm"/>
         <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
         <actionGroup ref="AdminMediaGalleryAssertImageInGridActionGroup" stepKey="assertImageInGrid">
             <argument name="title" value="ProductImage.filename"/>
         </actionGroup>

From 950a18b68e76d1f2286cd8ee5893b32fbd483c96 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 24 Aug 2020 20:11:29 +0100
Subject: [PATCH 349/671] Fixed static tests

---
 .../view/adminhtml/web/js/directory/directoryTree.js       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 0309b11296181..00a23e4a5fe08 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -257,16 +257,15 @@ define([
                 return;
             }
 
-            currentTreePath = this.isFilterApplied(currentFilterPath) || _.isNull(requestedDirectory)
-                ? currentFilterPath
-                : requestedDirectory;
+            currentTreePath = this.isFilterApplied(currentFilterPath) || _.isNull(requestedDirectory) ?
+                currentFilterPath : requestedDirectory;
 
             if (this.folderExistsInTree(currentTreePath)) {
                 this.locateNode(currentTreePath);
             } else {
                 this.selectStorageRoot();
             }
-        },
+        },g
 
         /**
          * Verify if directory exists in folder tree

From 7e4fc5d181479ef2755138e06d2194e64d5d21a5 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 25 Aug 2020 12:00:17 +0100
Subject: [PATCH 350/671] Fixed static tests

---
 .../view/adminhtml/web/js/directory/directoryTree.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index 00a23e4a5fe08..cf894a7395b31 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -265,7 +265,7 @@ define([
             } else {
                 this.selectStorageRoot();
             }
-        },g
+        },
 
         /**
          * Verify if directory exists in folder tree

From 66e67c3afbf2bdddbc885aee06fe97d300bf3fec Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 25 Aug 2020 13:27:02 +0100
Subject: [PATCH 351/671] Fixed static tests

---
 .../view/adminhtml/web/js/directory/directoryTree.js         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
index cf894a7395b31..2e1e9a980cd59 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js
@@ -286,9 +286,8 @@ define([
          * @returns {String|null}
          */
         getRequestedDirectory: function () {
-            return !_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== ''
-                ? Base64.idDecode(window.MediabrowserUtility.pathId)
-                : null;
+            return !_.isUndefined(window.MediabrowserUtility) && window.MediabrowserUtility.pathId !== '' ?
+                Base64.idDecode(window.MediabrowserUtility.pathId) : null;
         },
 
         /**

From 8d92b990968ddb43b9bb388ce3ae511d988cbbb6 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Sun, 6 Sep 2020 19:15:58 +0100
Subject: [PATCH 352/671] magento/adobe-stock-integration#1810: Fixed saving
 asset keywords links for db prefix

---
 .../Model/ResourceModel/Keyword/SaveAssetLinks.php            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
index eb6bd2aad236c..87f9359d4fc37 100644
--- a/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
+++ b/app/code/Magento/MediaGallery/Model/ResourceModel/Keyword/SaveAssetLinks.php
@@ -133,7 +133,7 @@ private function deleteAssetKeywords(int $assetId, array $obsoleteKeywordIds): v
             /** @var Mysql $connection */
             $connection = $this->resourceConnection->getConnection();
             $connection->delete(
-                $connection->getTableName(
+                $this->resourceConnection->getTableName(
                     self::TABLE_ASSET_KEYWORD
                 ),
                 [
@@ -196,7 +196,7 @@ private function setAssetUpdatedAt(int $assetId): void
         try {
             $connection = $this->resourceConnection->getConnection();
             $connection->update(
-                $connection->getTableName(self::TABLE_MEDIA_ASSET),
+                $this->resourceConnection->getTableName(self::TABLE_MEDIA_ASSET),
                 ['updated_at' => null],
                 ['id =?' => $assetId]
             );

From c04c4f3e886d3551448b8e56c627d22969d614a4 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 7 Sep 2020 11:32:31 +0100
Subject: [PATCH 353/671] magento/magento2#29921: Fixed unit tests

---
 .../Model/ResourceModel/Keyword/SaveAssetLinksTest.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
index d027f0ed21b53..6531cddf628df 100644
--- a/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
+++ b/app/code/Magento/MediaGallery/Test/Unit/Model/ResourceModel/Keyword/SaveAssetLinksTest.php
@@ -78,10 +78,14 @@ public function testAssetKeywordsSave(int $assetId, array $keywordIds, array $va
             $this->resourceConnectionMock->expects($this->exactly(2))
                 ->method('getConnection')
                 ->willReturn($this->connectionMock);
-            $this->resourceConnectionMock->expects($this->once())
+            $this->resourceConnectionMock->expects($this->any())
                 ->method('getTableName')
-                ->with('media_gallery_asset_keyword')
-                ->willReturn('prefix_media_gallery_asset_keyword');
+                ->willReturnMap(
+                    [
+                        ['media_gallery_asset_keyword', 'default', 'prefix_media_gallery_asset_keyword'],
+                        ['media_gallery_asset', 'default', 'prefix_media_gallery_asset']
+                    ]
+                );
             $this->connectionMock->expects($this->once())
                 ->method('insertArray')
                 ->with(

From 7b63b6c9cb59f2a068687512ebd0f96f35fbc7e5 Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@abovethefray.io>
Date: Fri, 4 Sep 2020 02:38:33 +0800
Subject: [PATCH 354/671] magento/adobe-stock-integration#1798: Move Add
 Selected button to be the last in Old Media Gallery - moved add selected
 button

---
 app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
index 9efd24e5003ca..d1c6b0fe7956d 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Content.php
@@ -102,7 +102,7 @@ protected function _construct()
                 'type' => 'button'
             ],
             0,
-            0,
+            100,
             'header'
         );
     }

From a9f2a5df20ab796feb90d4c086daff70bb7c4639 Mon Sep 17 00:00:00 2001
From: janmonteros <janraymonteros@gmail.com>
Date: Wed, 26 Aug 2020 22:01:08 +0800
Subject: [PATCH 355/671] magento/adobe-stock-integration#1784: Remove area
 emulation from media-content:sync command  - remove area emulation

---
 .../Console/Command/Synchronize.php           | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php b/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php
index 55f99697c289b..e591b4f2339b1 100644
--- a/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php
+++ b/app/code/Magento/MediaContentSynchronization/Console/Command/Synchronize.php
@@ -7,8 +7,6 @@
 
 namespace Magento\MediaContentSynchronization\Console\Command;
 
-use Magento\Framework\App\Area;
-use Magento\Framework\App\State;
 use Magento\Framework\Console\Cli;
 use Magento\MediaContentSynchronizationApi\Api\SynchronizeInterface;
 use Symfony\Component\Console\Command\Command;
@@ -25,21 +23,13 @@ class Synchronize extends Command
      */
     private $synchronizeContent;
 
-    /**
-     * @var State $state
-     */
-    private $state;
-
     /**
      * @param SynchronizeInterface $synchronizeContent
-     * @param State $state
      */
     public function __construct(
-        SynchronizeInterface $synchronizeContent,
-        State $state
+        SynchronizeInterface $synchronizeContent
     ) {
         $this->synchronizeContent = $synchronizeContent;
-        $this->state = $state;
         parent::__construct();
     }
 
@@ -58,12 +48,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $output->writeln('Synchronizing content with assets...');
-        $this->state->emulateAreaCode(
-            Area::AREA_ADMINHTML,
-            function () {
-                $this->synchronizeContent->execute();
-            }
-        );
+        $this->synchronizeContent->execute();
         $output->writeln('Completed content synchronization.');
         return Cli::RETURN_SUCCESS;
     }

From b140c963491fb645c63bdc6e085c0091f158ad60 Mon Sep 17 00:00:00 2001
From: Nazar Klovanych <nazarn96@gmail.com>
Date: Tue, 1 Sep 2020 21:54:04 +0300
Subject: [PATCH 356/671] Fix issue with saving filters from url-applier to
 default view of bookmark

---
 .../Ui/view/base/web/js/grid/url-filter-applier.js   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
index be9044143c5a4..3c5e72d4d66ed 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
@@ -13,10 +13,12 @@ define([
     return Component.extend({
         defaults: {
             listingNamespace: null,
+            bookmarkProvider: 'componentType = bookmark, ns = ${ $.listingNamespace }',
             filterProvider: 'componentType = filters, ns = ${ $.listingNamespace }',
             filterKey: 'filters',
             searchString: location.search,
             modules: {
+                bookmarks: '${ $.bookmarkProvider }',
                 filterComponent: '${ $.filterProvider }'
             }
         },
@@ -49,6 +51,16 @@ define([
                 return;
             }
 
+            if (!_.isUndefined(this.bookmarks())) {
+                if (!_.size(this.bookmarks().getViewData(this.bookmarks().defaultIndex))) {
+                    setTimeout(function () {
+                        this.apply();
+                    }.bind(this), 500);
+
+                    return;
+                }
+            }
+
             if (Object.keys(urlFilter).length) {
                 applied = this.filterComponent().get('applied');
                 filters = $.extend({}, applied, urlFilter);

From fff396a9e010f7ae22cee21ea7b7df7811a399e3 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Mon, 7 Sep 2020 17:17:24 +0100
Subject: [PATCH 357/671] MC-37236: Skipped PayPal tests

---
 .../Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml     | 3 +++
 ...torefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
index d27ac4c4a92f5..b8adcc3630351 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml
@@ -16,6 +16,9 @@
             <description value="Users are able to place order using Paypal Smart Button on Checkout Page, payment action is Sale"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
+            <skip>
+                <issueId value="MC-37236"/>
+            </skip>
             <group value="paypalExpress"/>
         </annotations>
         <before>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
index 3fd5f44d5a4b6..a4d99ecbf7e61 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml
@@ -16,6 +16,9 @@
             <description value="Users are able to place order using Paypal Smart Button using Euro currency and merchant country is France"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
+            <skip>
+                <issueId value="MC-37236"/>
+            </skip>
             <group value="paypalExpress"/>
         </annotations>
         <before>

From 3487aff4175bdc5af289094503d9ef44f57723dc Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 8 Sep 2020 16:54:02 +0300
Subject: [PATCH 358/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Product/Indexer/Price/Configurable.php    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 6031ab6f8f8ae..2e0e7d82eb050 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -6,6 +6,7 @@
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
 
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Indexer\DimensionalIndexerInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
@@ -140,6 +141,30 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
         $this->applyConfigurableOption($temporaryPriceTable, $dimensions, iterator_to_array($entityIds));
     }
 
+    /**
+     * Filter select by inventory
+     *
+     * @param Select $select
+     * @return Select
+     */
+    public function filterSelectByInventory(Select $select)
+    {
+        $select->join(
+            ['si' => $this->getTable('cataloginventory_stock_item')],
+            'si.product_id = l.product_id',
+            []
+        );
+        $select->join(
+            ['si_parent' => $this->getTable('cataloginventory_stock_item')],
+            'si_parent.product_id = l.parent_id',
+            []
+        );
+        $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
+        $select->orWhere('si_parent.is_in_stock = ?', Stock::STOCK_OUT_OF_STOCK);
+
+        return $select;
+    }
+
     /**
      * Apply configurable option
      *
@@ -200,12 +225,7 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
 
         // Does not make sense to extend query if out of stock products won't appear in tables for indexing
         if ($this->isConfigShowOutOfStock()) {
-            $select->join(
-                ['si' => $this->getTable('cataloginventory_stock_item')],
-                'si.product_id = l.product_id',
-                []
-            );
-            $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
+            $select = $this->filterSelectByInventory($select);
         }
 
         $select->columns(

From 69eca0706fdfd74222b8a5aaab5a57bf0c4f0ea7 Mon Sep 17 00:00:00 2001
From: Stanislav Idolov <sidolov@adobe.com>
Date: Tue, 8 Sep 2020 09:40:50 -0500
Subject: [PATCH 359/671] Remove useless doc block

---
 .../Amqp/Test/Unit/Topology/ArgumentProcessorTest.php          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php
index ef1098da318ab..8aaf57bf36543 100644
--- a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/ArgumentProcessorTest.php
@@ -14,9 +14,6 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-/**
- * Class ArgumentProcessorTest
- */
 class ArgumentProcessorTest extends TestCase
 {
     /**

From 87f5b98dc7d556f2662c75238f7a4267637ac0a7 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 9 Sep 2020 17:12:09 +0300
Subject: [PATCH 360/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Indexer/Price/ConfigurableTest.php        | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
index ffa84ca740e62..6c0a92372ae3d 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
 
 use Magento\Catalog\Api\ProductRepositoryInterface;
@@ -157,6 +159,41 @@ public function testReindexWithCorrectPriority()
         $this->assertEquals($childProduct1->getPrice(), $configurableProduct->getMinimalPrice());
     }
 
+    /**
+     * Test get product minimal price if all children is out of stock
+     *
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testReindexIfAllChildrenIsOutOfStock(): void
+    {
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
+
+        $childProduct1 = $this->productRepository->getById(10, false, null, true);
+        $stockItem = $childProduct1->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $childProduct2 = $this->productRepository->getById(20, false, null, true);
+        $stockItem = $childProduct2->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $priceIndexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
+        $priceIndexerProcessor->reindexList(
+            [$configurableProduct->getId(), $childProduct1->getId(), $childProduct2->getId()],
+            true
+        );
+
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
+    }
+
     /**
      * Retrieve configurable product.
      * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php

From 7442aece17d4f3d5e341595b060babc2a8ae112d Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 10 Sep 2020 10:58:12 +0300
Subject: [PATCH 361/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Product/Indexer/Price/ConfigurableTest.php             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
index 6c0a92372ae3d..700746ebbd3ad 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
@@ -155,7 +155,7 @@ public function testReindexWithCorrectPriority()
             true
         );
 
-        $configurableProduct = $this->getConfigurableProductFromCollection($configurableProduct->getId());
+        $configurableProduct = $this->getConfigurableProductFromCollection((int)$configurableProduct->getId());
         $this->assertEquals($childProduct1->getPrice(), $configurableProduct->getMinimalPrice());
     }
 
@@ -184,6 +184,11 @@ public function testReindexIfAllChildrenIsOutOfStock(): void
         $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
         $this->stockRepository->save($stockItem);
 
+        $configurableProduct1 = $this->productRepository->getById(1, false, null, true);
+        $stockItem = $configurableProduct1->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
         $priceIndexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
         $priceIndexerProcessor->reindexList(
             [$configurableProduct->getId(), $childProduct1->getId(), $childProduct2->getId()],

From 7ee934df7e141f0b9285fc8ec3f1532e6f8f95ef Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 10 Sep 2020 12:19:10 +0300
Subject: [PATCH 362/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Product/Indexer/Price/Configurable.php    | 36 +++++-----
 .../Price/StockStatusBaseSelectProcessor.php  | 68 +++++++++++++++++++
 .../Magento/ConfigurableProduct/etc/di.xml    |  1 +
 3 files changed, 85 insertions(+), 20 deletions(-)
 create mode 100644 app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php

diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 2e0e7d82eb050..903aa837f2d3b 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
 
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Indexer\DimensionalIndexerInterface;
@@ -14,10 +17,8 @@
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\CatalogInventory\Model\Stock;
-use Magento\CatalogInventory\Model\Configuration;
 
 /**
  * Configurable Products Price Indexer Resource model
@@ -76,6 +77,11 @@ class Configurable implements DimensionalIndexerInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var BaseSelectProcessorInterface
+     */
+    private $baseSelectProcessor;
+
     /**
      * @param BaseFinalPrice $baseFinalPrice
      * @param IndexTableStructureFactory $indexTableStructureFactory
@@ -86,6 +92,9 @@ class Configurable implements DimensionalIndexerInterface
      * @param bool $fullReindexAction
      * @param string $connectionName
      * @param ScopeConfigInterface $scopeConfig
+     * @param BaseSelectProcessorInterface|null $baseSelectProcessor
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         BaseFinalPrice $baseFinalPrice,
@@ -96,7 +105,8 @@ public function __construct(
         BasePriceModifier $basePriceModifier,
         $fullReindexAction = false,
         $connectionName = 'indexer',
-        ScopeConfigInterface $scopeConfig = null
+        ScopeConfigInterface $scopeConfig = null,
+        ?BaseSelectProcessorInterface $baseSelectProcessor = null
     ) {
         $this->baseFinalPrice = $baseFinalPrice;
         $this->indexTableStructureFactory = $indexTableStructureFactory;
@@ -107,6 +117,8 @@ public function __construct(
         $this->fullReindexAction = $fullReindexAction;
         $this->basePriceModifier = $basePriceModifier;
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->baseSelectProcessor = $baseSelectProcessor ?:
+            ObjectManager::getInstance()->get(BaseSelectProcessorInterface::class);
     }
 
     /**
@@ -223,10 +235,7 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
             []
         );
 
-        // Does not make sense to extend query if out of stock products won't appear in tables for indexing
-        if ($this->isConfigShowOutOfStock()) {
-            $select = $this->filterSelectByInventory($select);
-        }
+        $this->baseSelectProcessor->process($select);
 
         $select->columns(
             [
@@ -315,17 +324,4 @@ private function getTable($tableName)
     {
         return $this->resource->getTableName($tableName, $this->connectionName);
     }
-
-    /**
-     * Is flag Show Out Of Stock setted
-     *
-     * @return bool
-     */
-    private function isConfigShowOutOfStock(): bool
-    {
-        return $this->scopeConfig->isSetFlag(
-            Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
-            ScopeInterface::SCOPE_STORE
-        );
-    }
 }
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
new file mode 100644
index 0000000000000..bd4a5dd5fa39a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
+
+use Magento\CatalogInventory\Model\Stock;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Select;
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
+use Magento\CatalogInventory\Api\StockConfigurationInterface;
+
+/**
+ * A Select object processor.
+ *
+ * Adds stock status limitations to a given Select object.
+ */
+class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
+{
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @var StockConfigurationInterface
+     */
+    private $stockConfig;
+
+    /**
+     * @param ResourceConnection $resource
+     * @param StockConfigurationInterface $stockConfig
+     */
+    public function __construct(
+        ResourceConnection $resource,
+        StockConfigurationInterface $stockConfig
+    ) {
+        $this->resource = $resource;
+        $this->stockConfig = $stockConfig;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(Select $select)
+    {
+        // Does not make sense to extend query if out of stock products won't appear in tables for indexing
+        if ($this->stockConfig->isShowOutOfStock()) {
+            $select->join(
+                ['si' => $this->resource->getTableName('cataloginventory_stock_item')],
+                'si.product_id = l.product_id',
+                []
+            );
+            $select->join(
+                ['si_parent' => $this->resource->getTableName('cataloginventory_stock_item')],
+                'si_parent.product_id = l.parent_id',
+                []
+            );
+            $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
+            $select->orWhere('si_parent.is_in_stock = ?', Stock::STOCK_OUT_OF_STOCK);
+        }
+
+        return $select;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index c8a278df92dc6..9f01af66f9713 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -198,6 +198,7 @@
         <arguments>
             <argument name="tableStrategy" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\TemporaryTableStrategy</argument>
             <argument name="connectionName" xsi:type="string">indexer</argument>
+            <argument name="baseSelectProcessor" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\StockStatusBaseSelectProcessor</argument>
         </arguments>
     </type>
     <type name="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Product">

From 5a93a3a7dacf94b5a7f7cf4e5ecca151c175daca Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Wed, 9 Sep 2020 18:31:24 -0500
Subject: [PATCH 363/671] MC-37137: Advance Reporting generated csv files are
 not properly escaped which causes reports to fail on MBI side (continuation)

- Fix escaped quotes with backslash are not properly escaped in the generated csv
---
 .../Magento/Analytics/Model/ReportWriter.php  |  8 +-
 .../Test/Unit/Model/ReportWriterTest.php      | 79 ++++++++++++++++---
 2 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Analytics/Model/ReportWriter.php b/app/code/Magento/Analytics/Model/ReportWriter.php
index d5bd36d068d20..c1df4e1af508b 100644
--- a/app/code/Magento/Analytics/Model/ReportWriter.php
+++ b/app/code/Magento/Analytics/Model/ReportWriter.php
@@ -103,14 +103,14 @@ public function write(WriteInterface $directory, $path)
     /**
      * Replace wrong symbols in row
      *
+     * Strip backslashes before double quotes so they will be properly escaped in the generated csv
+     *
+     * @see fputcsv()
      * @param array $row
      * @return array
      */
     private function prepareRow(array $row): array
     {
-        $row = preg_replace('/(?<!\\\\)"/', '\\"', $row);
-        $row = preg_replace('/[\\\\]+/', '\\', $row);
-
-        return $row;
+        return preg_replace('/\\\+(?=\")/', '', $row);
     }
 }
diff --git a/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php b/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
index 8fb135fb4d9ed..1cf69cd33db7b 100644
--- a/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/Model/ReportWriterTest.php
@@ -103,7 +103,7 @@ protected function setUp(): void
      * @param array $expectedFileData
      * @return void
      *
-     * @dataProvider configDataProvider
+     * @dataProvider writeDataProvider
      */
     public function testWrite(array $configData, array $fileData, array $expectedFileData): void
     {
@@ -162,7 +162,7 @@ public function testWrite(array $configData, array $fileData, array $expectedFil
      * @param array $configData
      * @return void
      *
-     * @dataProvider configDataProvider
+     * @dataProvider writeErrorFileDataProvider
      */
     public function testWriteErrorFile(array $configData): void
     {
@@ -195,10 +195,75 @@ public function testWriteEmptyReports(): void
     /**
      * @return array
      */
-    public function configDataProvider(): array
+    public function writeDataProvider(): array
+    {
+        $configData = [
+            'providers' => [
+                [
+                    'name' => $this->providerName,
+                    'class' => $this->providerClass,
+                    'parameters' => [
+                        'name' => $this->reportName
+                    ],
+                ]
+            ]
+        ];
+        return [
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'Shoes"" Usual"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello \"World\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello \\"World\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+            [
+                'configData' => $configData,
+                'fileData' => [
+                    ['number' => 1, 'type' => 'hello \\\"World\\\"']
+                ],
+                'expectedFileData' => [
+                    ['number' => 1, 'type' => 'hello "World"']
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function writeErrorFileDataProvider(): array
     {
         return [
-            'reportProvider' => [
+            [
                 'configData' => [
                     'providers' => [
                         [
@@ -210,12 +275,6 @@ public function configDataProvider(): array
                         ]
                     ]
                 ],
-                'fileData' => [
-                    ['number' => 1, 'type' => 'Shoes\"" Usual\\\\"']
-                ],
-                'expectedFileData' => [
-                    ['number' => 1, 'type' => 'Shoes\"\" Usual\\"']
-                ]
             ],
         ];
     }

From 4ec639803c33d0d020c40ec20fdf41083b764400 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 10 Sep 2020 15:59:47 +0300
Subject: [PATCH 364/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Indexer/Price/ConfigurableTest.php        | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
index 700746ebbd3ad..ba3d5e46b98fb 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
@@ -159,46 +159,6 @@ public function testReindexWithCorrectPriority()
         $this->assertEquals($childProduct1->getPrice(), $configurableProduct->getMinimalPrice());
     }
 
-    /**
-     * Test get product minimal price if all children is out of stock
-     *
-     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
-     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
-     * @magentoDbIsolation disabled
-     *
-     * @return void
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    public function testReindexIfAllChildrenIsOutOfStock(): void
-    {
-        $configurableProduct = $this->getConfigurableProductFromCollection(1);
-        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
-
-        $childProduct1 = $this->productRepository->getById(10, false, null, true);
-        $stockItem = $childProduct1->getExtensionAttributes()->getStockItem();
-        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
-        $this->stockRepository->save($stockItem);
-
-        $childProduct2 = $this->productRepository->getById(20, false, null, true);
-        $stockItem = $childProduct2->getExtensionAttributes()->getStockItem();
-        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
-        $this->stockRepository->save($stockItem);
-
-        $configurableProduct1 = $this->productRepository->getById(1, false, null, true);
-        $stockItem = $configurableProduct1->getExtensionAttributes()->getStockItem();
-        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
-        $this->stockRepository->save($stockItem);
-
-        $priceIndexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
-        $priceIndexerProcessor->reindexList(
-            [$configurableProduct->getId(), $childProduct1->getId(), $childProduct2->getId()],
-            true
-        );
-
-        $configurableProduct = $this->getConfigurableProductFromCollection(1);
-        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
-    }
-
     /**
      * Retrieve configurable product.
      * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php

From f5d690232c5fc9fd163844cddc1dc8b43811fb93 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 11 Sep 2020 10:23:31 +0300
Subject: [PATCH 365/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Product/Indexer/Price/Configurable.php    | 24 -------------------
 .../Price/StockStatusBaseSelectProcessor.php  |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 903aa837f2d3b..d00e5c72a4622 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -153,30 +153,6 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds)
         $this->applyConfigurableOption($temporaryPriceTable, $dimensions, iterator_to_array($entityIds));
     }
 
-    /**
-     * Filter select by inventory
-     *
-     * @param Select $select
-     * @return Select
-     */
-    public function filterSelectByInventory(Select $select)
-    {
-        $select->join(
-            ['si' => $this->getTable('cataloginventory_stock_item')],
-            'si.product_id = l.product_id',
-            []
-        );
-        $select->join(
-            ['si_parent' => $this->getTable('cataloginventory_stock_item')],
-            'si_parent.product_id = l.parent_id',
-            []
-        );
-        $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
-        $select->orWhere('si_parent.is_in_stock = ?', Stock::STOCK_OUT_OF_STOCK);
-
-        return $select;
-    }
-
     /**
      * Apply configurable option
      *
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
index bd4a5dd5fa39a..b5cbaa57858c9 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
@@ -43,7 +43,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process(Select $select)
     {

From 2d5c3b24567eb9d590536a6ca285d5f9fa8562f7 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Fri, 11 Sep 2020 13:44:31 -0500
Subject: [PATCH 366/671] MC-35855: CSP cannot be configured from a theme

---
 .../CspWhitelistXml/FileResolver.php          |  95 ++++++++++++++++
 app/code/Magento/Csp/etc/di.xml               |   1 +
 .../Config/CompositeFileIterator.php          | 102 ++++++++++++++++++
 .../Test/Unit/CompositeFileIteratorTest.php   |  73 +++++++++++++
 4 files changed, 271 insertions(+)
 create mode 100644 app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
 create mode 100644 lib/internal/Magento/Framework/Config/CompositeFileIterator.php
 create mode 100644 lib/internal/Magento/Framework/Config/Test/Unit/CompositeFileIteratorTest.php

diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
new file mode 100644
index 0000000000000..bbab95fcf7ab9
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector\CspWhitelistXml;
+
+use Magento\Framework\Config\FileResolverInterface;
+use Magento\Framework\Filesystem;
+use Magento\Framework\View\Design\ThemeInterface;
+use Magento\Framework\View\DesignInterface;
+use Magento\Framework\View\Design\Theme\CustomizationInterface;
+use Magento\Framework\View\Design\Theme\CustomizationInterfaceFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\ReadInterface as DirectoryRead;
+use Magento\Framework\Config\CompositeFileIteratorFactory;
+
+/**
+ * Combines configuration files from both modules and current theme.
+ */
+class FileResolver implements FileResolverInterface
+{
+    /**
+     * @var FileResolverInterface
+     */
+    private $moduleFileResolver;
+
+    /**
+     * @var ThemeInterface
+     */
+    private $theme;
+
+    /**
+     * @var CustomizationInterfaceFactory
+     */
+    private $themeInfoFactory;
+
+    /**
+     * @var DirectoryRead
+     */
+    private $rootDir;
+
+    /**
+     * @var CompositeFileIteratorFactory
+     */
+    private $iteratorFactory;
+
+    /**
+     * @param FileResolverInterface $moduleFileResolver
+     * @param DesignInterface $design
+     * @param CustomizationInterfaceFactory $customizationFactory
+     * @param Filesystem $filesystem
+     * @param CompositeFileIteratorFactory $iteratorFactory
+     */
+    public function __construct(
+        FileResolverInterface $moduleFileResolver,
+        DesignInterface $design,
+        CustomizationInterfaceFactory $customizationFactory,
+        Filesystem $filesystem,
+        CompositeFileIteratorFactory $iteratorFactory
+    )  {
+        $this->moduleFileResolver = $moduleFileResolver;
+        $this->theme = $design->getDesignTheme();
+        $this->themeInfoFactory = $customizationFactory;
+        $this->rootDir = $filesystem->getDirectoryRead(DirectoryList::ROOT);
+        $this->iteratorFactory = $iteratorFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function get($filename, $scope)
+    {
+         $configs = $this->moduleFileResolver->get($filename, $scope);
+        if ($scope === 'global') {
+            $files = [];
+            $theme = $this->theme;
+            while ($theme) {
+                /** @var CustomizationInterface $info */
+                $info = $this->themeInfoFactory->create(['theme' => $theme]);
+                $file = $info->getThemeFilesPath() .'/etc/' .$filename;
+                if ($this->rootDir->isExist($file)) {
+                    $files[] = $file;
+                }
+                $theme = $theme->getParentTheme();
+            }
+            $configs = $this->iteratorFactory->create(['paths' => $files, 'existingIterator' => $configs]);
+        }
+
+        return $configs;
+    }
+}
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 7b1129a0e1a41..049259752a0b5 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -46,6 +46,7 @@
         <arguments>
             <argument name="converter" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\Converter</argument>
             <argument name="schemaLocator" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\SchemaLocator</argument>
+            <argument name="fileResolver" xsi:type="object">Magento\Csp\Model\Collector\CspWhitelistXml\FileResolver</argument>
             <argument name="fileName" xsi:type="string">csp_whitelist.xml</argument>
         </arguments>
     </type>
diff --git a/lib/internal/Magento/Framework/Config/CompositeFileIterator.php b/lib/internal/Magento/Framework/Config/CompositeFileIterator.php
new file mode 100644
index 0000000000000..904afa4f00c49
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/CompositeFileIterator.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Config;
+
+use Magento\Framework\Filesystem\File\ReadFactory;
+
+/**
+ * Combine existing file iterator and new files.
+ */
+class CompositeFileIterator extends FileIterator
+{
+    /**
+     * @var FileIterator
+     */
+    private $existingIterator;
+
+    /**
+     * @param ReadFactory $readFactory
+     * @param array $paths
+     * @param FileIterator $existingIterator
+     */
+    public function __construct(ReadFactory $readFactory, array $paths, FileIterator $existingIterator)
+    {
+        parent::__construct($readFactory, $paths);
+        $this->existingIterator = $existingIterator;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function rewind()
+    {
+        $this->existingIterator->rewind();
+        parent::rewind();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function current()
+    {
+        if ($this->existingIterator->valid()) {
+            return $this->existingIterator->current();
+        }
+
+        return parent::current();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function key()
+    {
+        if ($this->existingIterator->valid()) {
+            return $this->existingIterator->key();
+        }
+
+        return parent::key();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function next()
+    {
+        if ($this->existingIterator->valid()) {
+            $this->existingIterator->next();
+        } else {
+            parent::next();
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function valid()
+    {
+        return $this->existingIterator->valid() || parent::valid();
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function toArray()
+    {
+        return array_merge($this->existingIterator->toArray(), parent::toArray());
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function count()
+    {
+        return $this->existingIterator->count() + parent::count();
+    }
+}
diff --git a/lib/internal/Magento/Framework/Config/Test/Unit/CompositeFileIteratorTest.php b/lib/internal/Magento/Framework/Config/Test/Unit/CompositeFileIteratorTest.php
new file mode 100644
index 0000000000000..eece996f91d5d
--- /dev/null
+++ b/lib/internal/Magento/Framework/Config/Test/Unit/CompositeFileIteratorTest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Framework\Config\Test\Unit;
+
+use Magento\Framework\Config\CompositeFileIterator;
+use Magento\Framework\Config\FileIterator;
+use Magento\Framework\Filesystem\File\ReadFactory;
+use Magento\Framework\Filesystem\File\Read;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test composition of file iterators.
+ */
+class CompositeFileIteratorTest extends TestCase
+{
+    /**
+     * @var ReadFactory|MockObject
+     */
+    private $readFactoryMock;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->readFactoryMock = $this->createMock(ReadFactory::class);
+        $this->readFactoryMock->method('create')
+            ->willReturnCallback(
+                function (string $file): Read {
+                    $readMock = $this->createMock(Read::class);
+                    $readMock->method('readAll')->willReturn('Content of ' .$file);
+
+                    return $readMock;
+                }
+            );
+    }
+
+    /**
+     * Test the composite.
+     */
+    public function testComposition(): void
+    {
+        $existingFiles = [
+            '/etc/magento/somefile.ext',
+            '/etc/magento/somefile2.ext',
+            '/etc/magento/somefile3.ext'
+        ];
+        $newFiles = [
+            '/etc/magento/some-other-file.ext',
+            '/etc/magento/some-other-file2.ext'
+        ];
+
+        $existing = new FileIterator($this->readFactoryMock, $existingFiles);
+        $composite = new CompositeFileIterator($this->readFactoryMock, $newFiles, $existing);
+        $found = [];
+        foreach ($composite as $file => $content) {
+            $this->assertNotEmpty($content);
+            $found[] = $file;
+        }
+        $this->assertEquals(array_merge($existingFiles, $newFiles), $found);
+        $this->assertEquals(count($existingFiles) + count($newFiles), $composite->count());
+        $this->assertEquals(array_merge($existingFiles, $newFiles), array_keys($composite->toArray()));
+    }
+}

From efc9b2190a3870eaed76bf2876a50ab8e4ea2ecf Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Sat, 12 Sep 2020 15:16:01 -0500
Subject: [PATCH 367/671] MC-35855: CSP cannot be configured from a theme

---
 .../Csp/Model/Collector/CspWhitelistXml/FileResolver.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
index bbab95fcf7ab9..bfbc88219ca94 100644
--- a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
@@ -61,7 +61,7 @@ public function __construct(
         CustomizationInterfaceFactory $customizationFactory,
         Filesystem $filesystem,
         CompositeFileIteratorFactory $iteratorFactory
-    )  {
+    ) {
         $this->moduleFileResolver = $moduleFileResolver;
         $this->theme = $design->getDesignTheme();
         $this->themeInfoFactory = $customizationFactory;

From d4931f79648bfd1677a861257697d5f8a57cecd6 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 14 Sep 2020 11:45:49 +0300
Subject: [PATCH 368/671] fix duplicate image during import products, refactor
 tests

---
 .../Model/Import/Product.php                  | 136 +++++++-----------
 .../Import/Product/MediaGalleryProcessor.php  |  20 ---
 .../Catalog/_files/magento_image_2.jpg        | Bin 12137 -> 0 bytes
 .../Model/Import/ProductTest.php              |  46 +++---
 ...mport_media_additional_long_name_image.csv |   2 +
 .../_files/import_media_update_images.csv     |   2 -
 .../_files/import_with_filesystem_images.php  |   4 -
 7 files changed, 75 insertions(+), 135 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image_2.jpg
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_additional_long_name_image.csv
 delete mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index b11f1951b49cb..4384cec88bc46 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -23,6 +23,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\Intl\DateTimeFactory;
 use Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor;
 use Magento\Framework\Model\ResourceModel\Db\TransactionManagerInterface;
@@ -766,6 +767,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     private $linkProcessor;
 
+    /**
+     * @var File
+     */
+    private $fileDriver;
+
     /**
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param \Magento\ImportExport\Helper\Data $importExportData
@@ -814,6 +820,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param StatusProcessor|null $statusProcessor
      * @param StockProcessor|null $stockProcessor
      * @param LinkProcessor|null $linkProcessor
+     * @param File|null $fileDriver
      * @throws LocalizedException
      * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -866,7 +873,8 @@ public function __construct(
         ProductRepositoryInterface $productRepository = null,
         StatusProcessor $statusProcessor = null,
         StockProcessor $stockProcessor = null,
-        LinkProcessor $linkProcessor = null
+        LinkProcessor $linkProcessor = null,
+        ?File $fileDriver = null
     ) {
         $this->_eventManager = $eventManager;
         $this->stockRegistry = $stockRegistry;
@@ -930,6 +938,7 @@ public function __construct(
         $this->dateTimeFactory = $dateTimeFactory ?? ObjectManager::getInstance()->get(DateTimeFactory::class);
         $this->productRepository = $productRepository ?? ObjectManager::getInstance()
                 ->get(ProductRepositoryInterface::class);
+        $this->fileDriver = $fileDriver ?: ObjectManager::getInstance()->get(File::class);
     }
 
     /**
@@ -1148,6 +1157,7 @@ protected function _replaceProducts()
      * Save products data.
      *
      * @return $this
+     * @throws LocalizedException
      */
     protected function _saveProductsData()
     {
@@ -1155,7 +1165,7 @@ protected function _saveProductsData()
         foreach ($this->_productTypeModels as $productTypeModel) {
             $productTypeModel->saveData();
         }
-        $this->_saveLinks();
+        $this->linkProcessor->saveLinks($this, $this->_dataSourceModel, $this->getProductEntityLinkField());
         $this->_saveStockItem();
         if ($this->_replaceFlag) {
             $this->getOptionEntity()->clearProductsSkuToId();
@@ -1563,15 +1573,13 @@ protected function _saveProducts()
             $this->categoriesCache = [];
             $tierPrices = [];
             $mediaGallery = [];
-            $uploadedFiles = [];
-            $galleryItemsToRemove = [];
             $labelsForUpdate = [];
             $imagesForChangeVisibility = [];
             $uploadedImages = [];
             $previousType = null;
             $prevAttributeSet = null;
 
-            $importDir = $this->_mediaDirectory->getAbsolutePath($this->getImportDir());
+            $importDir = $this->_mediaDirectory->getAbsolutePath($this->getUploader()->getTmpDir());
             $existingImages = $this->getExistingImages($bunch);
             $this->addImageHashes($existingImages);
 
@@ -1721,11 +1729,12 @@ protected function _saveProducts()
                 foreach (array_keys($imageHiddenStates) as $image) {
                     //Mark image as uploaded if it exists
                     if (array_key_exists($image, $rowExistingImages)) {
-                        $rowImages[self::COL_MEDIA_IMAGE][] = $image;
                         $uploadedImages[$image] = $image;
                     }
-
-                    if (empty($rowImages)) {
+                    //Add image to hide to images list if it does not exist
+                    if (empty($rowImages[self::COL_MEDIA_IMAGE])
+                        || !in_array($image, $rowImages[self::COL_MEDIA_IMAGE])
+                    ) {
                         $rowImages[self::COL_MEDIA_IMAGE][] = $image;
                     }
                 }
@@ -1743,8 +1752,11 @@ protected function _saveProducts()
                         $hash = '';
                         if (filter_var($columnImage, FILTER_VALIDATE_URL) === false) {
                             $filename = $importDir . DIRECTORY_SEPARATOR . $columnImage;
-                            if (file_exists($filename)) {
-                                $hash = hash_file('sha256', $importDir . DIRECTORY_SEPARATOR . $columnImage);
+                            if ($this->fileDriver->isExists($filename)) {
+                                $hash = hash_file(
+                                    'sha256',
+                                    $importDir . DIRECTORY_SEPARATOR . $columnImage
+                                );
                             }
                         } else {
                             $hash = hash_file('sha256', $columnImage);
@@ -1760,11 +1772,11 @@ function ($exists, $file) use ($hash) {
                                     if ($exists) {
                                         return $exists;
                                     }
-                                    if (isset($file['hash']) &&
-                                        !empty($file['hash']) &&
-                                        $file['hash'] === $hash) {
+
+                                    if (isset($file['hash']) && $file['hash'] === $hash) {
                                         return $file['value'];
                                     }
+
                                     return $exists;
                                 },
                                 ''
@@ -1773,35 +1785,29 @@ function ($exists, $file) use ($hash) {
 
                         if ($imageAlreadyExists) {
                             $uploadedFile = $imageAlreadyExists;
-                        } else {
-                            if (!isset($uploadedImages[$columnImage])) {
-                                $uploadedFile = $this->uploadMediaFiles($columnImage);
-                                $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
-                                if ($uploadedFile) {
-                                    $uploadedImages[$columnImage] = $uploadedFile;
-                                } else {
-                                    unset($rowData[$column]);
-                                    $this->addRowError(
-                                        ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
-                                        $rowNum,
-                                        null,
-                                        null,
-                                        ProcessingError::ERROR_LEVEL_NOT_CRITICAL
-                                    );
-                                }
+                        } elseif (!isset($uploadedImages[$columnImage])) {
+                            $uploadedFile = $this->uploadMediaFiles($columnImage);
+                            $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
+                            if ($uploadedFile) {
+                                $uploadedImages[$columnImage] = $uploadedFile;
                             } else {
-                                $uploadedFile = $uploadedImages[$columnImage];
+                                unset($rowData[$column]);
+                                $this->addRowError(
+                                    ValidatorInterface::ERROR_MEDIA_URL_NOT_ACCESSIBLE,
+                                    $rowNum,
+                                    null,
+                                    null,
+                                    ProcessingError::ERROR_LEVEL_NOT_CRITICAL
+                                );
                             }
+                        } else {
+                            $uploadedFile = $uploadedImages[$columnImage];
                         }
 
                         if ($uploadedFile && $column !== self::COL_MEDIA_IMAGE) {
                             $rowData[$column] = $uploadedFile;
                         }
 
-                        if ($uploadedFile) {
-                            $uploadedFiles[] = $uploadedFile;
-                        }
-
                         if (!$uploadedFile || isset($mediaGallery[$storeId][$rowSku][$uploadedFile])) {
                             continue;
                         }
@@ -1823,8 +1829,7 @@ function ($exists, $file) use ($hash) {
                             }
 
                             if (isset($rowLabels[$column][$columnImageKey])
-                                && $rowLabels[$column][$columnImageKey] !=
-                                $currentFileData['label']
+                                && $rowLabels[$column][$columnImageKey] !== $currentFileData['label']
                             ) {
                                 $labelsForUpdate[] = [
                                     'label' => $rowLabels[$column][$columnImageKey],
@@ -1833,7 +1838,7 @@ function ($exists, $file) use ($hash) {
                                 ];
                             }
                         } else {
-                            if ($column == self::COL_MEDIA_IMAGE) {
+                            if ($column === self::COL_MEDIA_IMAGE) {
                                 $rowData[$column][] = $uploadedFile;
                             }
                             $mediaGallery[$storeId][$rowSku][$uploadedFile] = [
@@ -1850,14 +1855,6 @@ function ($exists, $file) use ($hash) {
                     }
                 }
 
-                // 5.1 Items to remove phase
-                if (!empty($rowExistingImages)) {
-                    $galleryItemsToRemove[] = \array_diff(
-                        \array_keys($rowExistingImages),
-                        $uploadedFiles
-                    );
-                }
-
                 // 6. Attributes phase
                 $rowStore = (self::SCOPE_STORE == $rowScope)
                     ? $this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])
@@ -1968,8 +1965,6 @@ function ($exists, $file) use ($hash) {
                 $tierPrices
             )->_saveMediaGallery(
                 $mediaGallery
-            )->_removeOldMediaGalleryItems(
-                $galleryItemsToRemove
             )->_saveProductAttributes(
                 $attributes
             )->updateMediaGalleryVisibility(
@@ -1988,29 +1983,31 @@ function ($exists, $file) use ($hash) {
     }
     //phpcs:enable Generic.Metrics.NestingLevel
 
+    // phpcs:enable
+
     /**
      * Generate hashes for existing images for comparison with newly uploaded images.
      *
      * @param array $images
+     * @return void
      */
-    public function addImageHashes(&$images)
+    private function addImageHashes(array &$images): void
     {
         $productMediaPath = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)
-            ->getAbsolutePath('/catalog/product');
+            ->getAbsolutePath(DS . 'catalog' . DS . 'product');
 
         foreach ($images as $storeId => $skus) {
             foreach ($skus as $sku => $files) {
                 foreach ($files as $path => $file) {
-                    if (file_exists($productMediaPath . $file['value'])) {
-                        $images[$storeId][$sku][$path]['hash'] = hash_file('sha256', $productMediaPath . $file['value']);
+                    if ($this->fileDriver->isExists($productMediaPath . $file['value'])) {
+                        $fileName = $productMediaPath . $file['value'];
+                        $images[$storeId][$sku][$path]['hash'] = hash_file('sha256', $fileName);
                     }
                 }
             }
         }
     }
 
-    // phpcs:enable
-
     /**
      * Clears entries from Image Set and Row Data marked as no_selection
      *
@@ -2172,17 +2169,14 @@ protected function _saveProductTierPrices(array $tierPriceData)
      *
      * @return string
      */
-    protected function getImportDir()
+    private function getImportDir(): string
     {
         $dirConfig = DirectoryList::getDefaultConfig();
         $dirAddon = $dirConfig[DirectoryList::MEDIA][DirectoryList::PATH];
 
-        if (!empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])) {
-            $tmpPath = $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
-        } else {
-            $tmpPath = $dirAddon . '/' . $this->_mediaDirectory->getRelativePath('import');
-        }
-        return $tmpPath;
+        return empty($this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR])
+            ? $dirAddon . DS . $this->_mediaDirectory->getRelativePath('import')
+            : $this->_parameters[Import::FIELD_NAME_IMG_FILE_DIR];
     }
 
     /**
@@ -2286,28 +2280,6 @@ protected function _saveMediaGallery(array $mediaGalleryData)
         return $this;
     }
 
-    /**
-     * Remove old media gallery items.
-     *
-     * @param array $itemsToRemove
-     * @return $this
-     */
-    protected function _removeOldMediaGalleryItems(array $itemsToRemove)
-    {
-        if (empty($itemsToRemove)) {
-            return $this;
-        }
-
-        $itemsToRemove = array_merge(...$itemsToRemove);
-        if (empty($itemsToRemove)) {
-            return $this;
-        }
-
-        $this->mediaProcessor->removeOldMediaItems($itemsToRemove);
-
-        return $this;
-    }
-
     /**
      * Save product websites.
      *
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
index a608d792ff6fb..d4694b72ba64f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php
@@ -104,7 +104,6 @@ public function __construct(
      *
      * @param array $mediaGalleryData
      * @return void
-     * @throws \Exception
      */
     public function saveMediaGallery(array $mediaGalleryData)
     {
@@ -271,7 +270,6 @@ private function prepareMediaGalleryValueData(
      *
      * @param array $labels
      * @return void
-     * @throws \Exception
      */
     public function updateMediaGalleryLabels(array $labels)
     {
@@ -283,7 +281,6 @@ public function updateMediaGalleryLabels(array $labels)
      *
      * @param array $images
      * @return void
-     * @throws \Exception
      */
     public function updateMediaGalleryVisibility(array $images)
     {
@@ -296,7 +293,6 @@ public function updateMediaGalleryVisibility(array $images)
      * @param array $data
      * @param string $field
      * @return void
-     * @throws \Exception
      */
     private function updateMediaGalleryField(array $data, $field)
     {
@@ -341,7 +337,6 @@ private function updateMediaGalleryField(array $data, $field)
      *
      * @param array $bunch
      * @return array
-     * @throws \Exception
      */
     public function getExistingImages(array $bunch)
     {
@@ -451,25 +446,10 @@ private function getLastMediaPositionPerProduct(array $productIds): array
         return $result;
     }
 
-    /**
-     * Remove old media gallery items.
-     *
-     * @param array $oldMediaValues
-     * @return void
-     */
-    public function removeOldMediaItems(array $oldMediaValues)
-    {
-        $this->connection->delete(
-            $this->mediaGalleryTableName,
-            $this->connection->quoteInto('value IN (?)', $oldMediaValues)
-        );
-    }
-
     /**
      * Get product entity link field.
      *
      * @return string
-     * @throws \Exception
      */
     private function getProductEntityLinkField()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image_2.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image_2.jpg
deleted file mode 100644
index 2c21e0238ede73faf93b6ae9641a2f649f537f55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12137
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
PY$<|U+}aCC>xlmWy16?N

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 7368d755036de..4c4f2138abf35 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -34,6 +34,7 @@
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap as BootstrapHelper;
+use Magento\TestFramework\Indexer\TestCase;
 use Magento\UrlRewrite\Model\ResourceModel\UrlRewriteCollection;
 use Psr\Log\LoggerInterface;
 
@@ -50,8 +51,10 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * phpcs:disable Generic.PHP.NoSilencedErrors, Generic.Metrics.NestingLevel, Magento2.Functions.StaticFunction
  */
-class ProductTest extends \Magento\TestFramework\Indexer\TestCase
+class ProductTest extends TestCase
 {
+    private const LONG_FILE_NAME_IMAGE = 'magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg';
+
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product
      */
@@ -602,7 +605,6 @@ private function createImportModel($pathToFile, $behavior = \Magento\ImportExpor
     /**
      * @param string $productSku
      * @return array ['optionId' => ['optionValueId' => 'optionValueTitle', ...], ...]
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     private function getCustomOptionValues($productSku)
     {
@@ -1030,13 +1032,12 @@ function (\Magento\Framework\DataObject $item) {
             )
         );
 
-        $this->importDataForMediaTest('import_media_additional_images.csv');
+        $this->importDataForMediaTest('import_media_additional_long_name_image.csv');
         $product->cleanModelCache();
         $product = $this->getProductBySku('simple_new');
         $items = array_values($product->getMediaGalleryImages()->getItems());
-        $images[] = ['file' => '/m/a/magento_additional_image_three.jpg', 'label' => ''];
-        $images[] = ['file' => '/m/a/magento_additional_image_four.jpg', 'label' => ''];
-        $this->assertCount(7, $items);
+        $images[] = ['file' => '/m/a/' . self::LONG_FILE_NAME_IMAGE, 'label' => ''];
+        $this->assertCount(6, $items);
         $this->assertEquals(
             $images,
             array_map(
@@ -1049,33 +1050,20 @@ function (\Magento\Framework\DataObject $item) {
     }
 
     /**
-     * Test that product import with images works properly
+     * Test import twice and check that image will not be duplicate
      *
      * @magentoDataFixture mediaImportImageFixture
-     * @magentoAppIsolation enabled
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @return void
      */
-    public function testSaveMediaImageDuplicateImages()
+    public function testSaveMediaImageDuplicateImages(): void
     {
-        // Will check that existing product update works
-        // New unique images as per MD5 should be added, images not mentioned in the import should be removed
-        $this->importDataForMediaTest('import_media_update_images.csv');
-
-        $product = $this->getProductBySku('simple_new');
-
-        $gallery = $product->getMediaGalleryImages();
-        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('image'));
-
-        // small_image should be skipped from update as it is a duplicate (md5 is the same)
-        $this->assertEquals('/m/a/magento_small_image.jpg', $product->getData('small_image'));
-        $this->assertEquals('/m/a/magento_thumbnail.jpg', $product->getData('thumbnail'));
-        $this->assertEquals('/m/a/magento_image.jpg', $product->getData('swatch_image'));
+        $this->importDataForMediaTest('import_media.csv');
+        $imagesCount = count($this->getProductBySku('simple_new')->getMediaGalleryImages()->getItems());
 
-        $gallery = $product->getMediaGalleryImages();
-        $this->assertInstanceOf(\Magento\Framework\Data\Collection::class, $gallery);
+        // import the same file again
+        $this->importDataForMediaTest('import_media.csv');
 
-        $items = $gallery->getItems();
-        $this->assertCount(4, $items);
+        $this->assertCount($imagesCount, $this->getProductBySku('simple_new')->getMediaGalleryImages()->getItems());
     }
 
     /**
@@ -1120,6 +1108,10 @@ public static function mediaImportImageFixture()
                 'source' => __DIR__ . '/../../../../Magento/Catalog/_files/magento_thumbnail.jpg',
                 'dest' => $dirPath . '/magento_thumbnail.jpg',
             ],
+            [
+                'source' => __DIR__ . '/../../../../Magento/Catalog/_files/' . self::LONG_FILE_NAME_IMAGE,
+                'dest' => $dirPath . '/' . self::LONG_FILE_NAME_IMAGE,
+            ],
             [
                 'source' => __DIR__ . '/_files/magento_additional_image_one.jpg',
                 'dest' => $dirPath . '/magento_additional_image_one.jpg',
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_additional_long_name_image.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_additional_long_name_image.csv
new file mode 100644
index 0000000000000..2d2a192ed6c7c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_additional_long_name_image.csv
@@ -0,0 +1,2 @@
+sku,additional_images
+simple_new,magento_long_image_name_magento_long_image_name_magento_long_image_name.jpg
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv
deleted file mode 100644
index 56dd5b4e977bf..0000000000000
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_media_update_images.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label1,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,crosssell_skus,upsell_skus,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,associated_skus
-simple_new,,Default,simple,,base,New Product,,,,1,Taxable Goods,"Catalog, Search",10,,,,new-product,New Product,New Product,New Product ,magento_image_2.jpg,Image Label,magento_small_image_2.jpg,Small Image Label,magento_thumbnail.jpg,Thumbnail Label,magento_image.jpg,Image Label,10/20/15 07:05,10/20/15 07:05,,,Block after Info Column,,,,,,,,,,,,,"has_options=1,quantity_and_stock_status=In Stock,required_options=1",100,0,1,0,0,1,1,1,10000,1,1,1,1,1,0,1,1,0,0,0,1,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
index d426a1521e5b6..0ee59aedd8979 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/import_with_filesystem_images.php
@@ -29,10 +29,6 @@
         'source' => __DIR__ . '/../../../../../Magento/Catalog/_files/magento_image.jpg',
         'dest' => $dirPath . '/magento_image.jpg',
     ],
-    [
-        'source' => __DIR__ . '/../../../../../Magento/Catalog/_files/magento_image_2.jpg',
-        'dest' => $dirPath . '/magento_image_2.jpg',
-    ],
     [
         'source' => __DIR__ . '/../../../../../Magento/Catalog/_files/magento_small_image.jpg',
         'dest' => $dirPath . '/magento_small_image.jpg',

From a44b2000b7a590ecb4dc30190a5595c4a6106e3f Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 14 Sep 2020 17:52:48 +0300
Subject: [PATCH 369/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Indexer/Price/ConfigurableTest.php        | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
index ba3d5e46b98fb..28cbf80703d51 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/ConfigurableTest.php
@@ -159,6 +159,40 @@ public function testReindexWithCorrectPriority()
         $this->assertEquals($childProduct1->getPrice(), $configurableProduct->getMinimalPrice());
     }
 
+    /**
+     * Test get product minimal price if all children is out of stock
+     *
+     * @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function testReindexIfAllChildrenIsOutOfStock(): void
+    {
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
+
+        $childProduct1 = $this->productRepository->getById(10, false, null, true);
+        $stockItem = $childProduct1->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $childProduct2 = $this->productRepository->getById(20, false, null, true);
+        $stockItem = $childProduct2->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $configurableProduct1 = $this->productRepository->getById(1, false, null, true);
+        $stockItem = $configurableProduct1->getExtensionAttributes()->getStockItem();
+        $stockItem->setIsInStock(Stock::STOCK_OUT_OF_STOCK);
+        $this->stockRepository->save($stockItem);
+
+        $configurableProduct = $this->getConfigurableProductFromCollection(1);
+        $this->assertEquals(10, $configurableProduct->getMinimalPrice());
+    }
+
     /**
      * Retrieve configurable product.
      * Returns Configurable product that was created by Magento/ConfigurableProduct/_files/product_configurable.php

From 893910efd99c804f03af07ee489f18222e28c0e5 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 15 Sep 2020 11:36:24 +0300
Subject: [PATCH 370/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 .../Magento/Catalog/Block/Product/ListProduct/SortingTest.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php
index 52e2047917e8e..b88edc656176c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/ListProduct/SortingTest.php
@@ -439,7 +439,7 @@ public function productListWithOutOfStockSortOrderDataProvider(): array
             'default_order_price_desc' => [
                 'sort' => 'price',
                 'direction' => Collection::SORT_ORDER_DESC,
-                'expectation' => ['simple3', 'simple2', 'simple1', 'configurable'],
+                'expectation' => ['configurable', 'simple3', 'simple2', 'simple1'],
             ],
         ];
     }

From b97c6c3c4b63e6dc14f996dfcbf34d24051a6bd0 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 15 Sep 2020 16:25:09 +0300
Subject: [PATCH 371/671] add style for input

---
 .../web/css/source/module/checkout/_payments.less         | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
index 494483ff60dda..8fbe67abe2960 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_payments.less
@@ -49,6 +49,10 @@
             form {
                 &.form-purchase-order {
                     margin-bottom: 15px;
+
+                    .input-text {
+                        width: 40%;
+                    }
                 }
             }
         }
@@ -119,7 +123,7 @@
             margin: 0 0 @indent__base;
 
             .primary {
-                .action-update {                    
+                .action-update {
                     margin-bottom: 20px;
                     margin-right: 0;
                 }
@@ -133,7 +137,7 @@
                 .lib-css(line-height, @checkout-billing-address-details__line-height);
                 .lib-css(padding, @checkout-billing-address-details__padding);
             }
-            
+
             input[type="checkbox"] {
                 vertical-align: top;
             }

From 0442e1b47952e6c59b0f691943acf48f8f8b2269 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Tue, 15 Sep 2020 09:29:37 -0500
Subject: [PATCH 372/671] MC-36785: Unable to set YouTube API key by CLI

---
 app/code/Magento/ProductVideo/etc/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/ProductVideo/etc/config.xml b/app/code/Magento/ProductVideo/etc/config.xml
index 8afefa14a3651..55b7def6fb8ef 100644
--- a/app/code/Magento/ProductVideo/etc/config.xml
+++ b/app/code/Magento/ProductVideo/etc/config.xml
@@ -12,6 +12,7 @@
                 <play_if_base>0</play_if_base>
                 <show_related>0</show_related>
                 <video_auto_restart>0</video_auto_restart>
+                <youtube_api_key/>
             </product_video>
         </catalog>
     </default>

From cfd0808fab93dd07882831ef2bf632b639e62d0e Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Tue, 15 Sep 2020 18:11:36 +0300
Subject: [PATCH 373/671] magento/security-package#274: [B2B only] Save button
 is not displayed on Edit Account Information page.

---
 .../Customer/view/frontend/templates/form/edit.phtml     | 6 +++++-
 .../Customer/view/frontend/templates/form/register.phtml | 4 ++++
 .../luma/Magento_Customer/web/css/source/_module.less    | 9 +++++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
index 9821cff73a3dd..b64ad58c17afc 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/edit.phtml
@@ -105,7 +105,11 @@ use Magento\Customer\Block\Widget\Name;
             </div>
         </div>
     </fieldset>
-    <?= $block->getChildHtml('form_additional_info') ?>
+
+    <fieldset class="fieldset additional_info">
+        <?= $block->getChildHtml('form_additional_info') ?>
+    </fieldset>
+
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>">
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 99040706e50ac..5e58f94683ec1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -259,8 +259,12 @@ $formData = $block->getFormData();
                        autocomplete="off">
             </div>
         </div>
+    </fieldset>
+
+    <fieldset class="fieldset additional_info">
         <?= $block->getChildHtml('form_additional_info') ?>
     </fieldset>
+
     <div class="actions-toolbar">
         <div class="primary">
             <button type="submit"
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
index a0a36f55574fe..28ab32d13c88b 100644
--- a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -83,6 +83,11 @@
         .fieldset.password {
             display: none;
         }
+        fieldset {
+            &.additional_info {
+                clear: both;
+            }
+        }
     }
 
     .form-create-account {
@@ -349,9 +354,9 @@
         }
     }
 
-    .additional-addresses { 
+    .additional-addresses {
         table > thead > tr > th {
-            white-space: nowrap;  
+            white-space: nowrap;
         }
     }
 }

From b70851de42e1430dc09f0ac88b4ecc8f82abc4fd Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 18:38:31 +0200
Subject: [PATCH 374/671] ADD: formatting rules for json and yaml

---
 .editorconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 37cfad78c270b..877666f2aba34 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,3 +10,9 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{yml,yaml,json}]
+indent_size = 2
+
+[composer.{json,lock}]
+indent_size = 4

From f7f5dce0d1415661441e9c8f5ccf0b24bea30f28 Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 18:39:06 +0200
Subject: [PATCH 375/671] IMP: formatting for grunt config files

---
 dev/tools/grunt/configs/autoprefixer.json | 23 +++++++--------
 dev/tools/grunt/configs/concat.json       | 18 ++++++------
 dev/tools/grunt/configs/cssmin.json       | 28 +++++++++---------
 dev/tools/grunt/configs/eslint.json       | 30 +++++++++----------
 dev/tools/grunt/configs/jscs.json         | 26 ++++++++--------
 dev/tools/grunt/configs/mage-minify.json  | 36 +++++++++++------------
 dev/tools/grunt/configs/styledocco.json   | 22 +++++++-------
 7 files changed, 89 insertions(+), 94 deletions(-)

diff --git a/dev/tools/grunt/configs/autoprefixer.json b/dev/tools/grunt/configs/autoprefixer.json
index 28cd9c8a1255f..ea6301c2fd7ae 100644
--- a/dev/tools/grunt/configs/autoprefixer.json
+++ b/dev/tools/grunt/configs/autoprefixer.json
@@ -1,14 +1,11 @@
 {
-    "options": {
-        "browsers": [
-            "last 2 versions",
-            "ie 11"
-        ]
-    },
-    "setup": {
-        "src": "<%= path.css.setup %>/setup.css"
-    },
-    "updater": {
-        "src": "<%= path.css.updater %>/updater.css"
-    }
-}
\ No newline at end of file
+  "options": {
+    "browsers": ["last 2 versions", "ie 11"]
+  },
+  "setup": {
+    "src": "<%= path.css.setup %>/setup.css"
+  },
+  "updater": {
+    "src": "<%= path.css.updater %>/updater.css"
+  }
+}
diff --git a/dev/tools/grunt/configs/concat.json b/dev/tools/grunt/configs/concat.json
index b02024c38559f..de3e5a73cc266 100644
--- a/dev/tools/grunt/configs/concat.json
+++ b/dev/tools/grunt/configs/concat.json
@@ -1,10 +1,10 @@
 {
-    "options": {
-        "stripBanners": true,
-        "banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n"
-    },
-    "setup": {
-        "src": "<%= path.css.setup %>/setup.css",
-        "dest": "<%= path.css.setup %>/setup.css"
-    }
-}
\ No newline at end of file
+  "options": {
+    "stripBanners": true,
+    "banner": "/**\n * Copyright © <%= grunt.template.today(\"yyyy\") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n"
+  },
+  "setup": {
+    "src": "<%= path.css.setup %>/setup.css",
+    "dest": "<%= path.css.setup %>/setup.css"
+  }
+}
diff --git a/dev/tools/grunt/configs/cssmin.json b/dev/tools/grunt/configs/cssmin.json
index 032657cc3ed81..7b56ec43eccdd 100644
--- a/dev/tools/grunt/configs/cssmin.json
+++ b/dev/tools/grunt/configs/cssmin.json
@@ -1,16 +1,16 @@
 {
-    "options": {
-        "report": "gzip",
-        "keepSpecialComments": 0
-    },
-    "setup": {
-        "files": {
-            "<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css"
-        }
-    },
-    "updater": {
-        "files": {
-            "<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css"
-        }
+  "options": {
+    "report": "gzip",
+    "keepSpecialComments": 0
+  },
+  "setup": {
+    "files": {
+      "<%= path.css.setup %>/setup.css": "<%= path.css.setup %>/setup.css"
     }
-}
\ No newline at end of file
+  },
+  "updater": {
+    "files": {
+      "<%= path.css.updater %>/updater.css": "<%= path.css.updater %>/updater.css"
+    }
+  }
+}
diff --git a/dev/tools/grunt/configs/eslint.json b/dev/tools/grunt/configs/eslint.json
index 78719ce9548f6..ec0d821a1c0d8 100644
--- a/dev/tools/grunt/configs/eslint.json
+++ b/dev/tools/grunt/configs/eslint.json
@@ -1,18 +1,18 @@
 {
-    "file": {
-        "options": {
-            "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
-            "reset": true,
-            "useEslintrc": false
-        }
-    },
-    "test": {
-        "options": {
-            "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
-            "reset": true,
-            "outputFile": "dev/tests/static/eslint-error-report.xml",
-            "format": "junit",
-            "quiet": true
-        }
+  "file": {
+    "options": {
+      "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
+      "reset": true,
+      "useEslintrc": false
     }
+  },
+  "test": {
+    "options": {
+      "configFile": "dev/tests/static/testsuite/Magento/Test/Js/_files/eslint/.eslintrc",
+      "reset": true,
+      "outputFile": "dev/tests/static/eslint-error-report.xml",
+      "format": "junit",
+      "quiet": true
+    }
+  }
 }
diff --git a/dev/tools/grunt/configs/jscs.json b/dev/tools/grunt/configs/jscs.json
index dd9254abbdc68..e4002f035f824 100644
--- a/dev/tools/grunt/configs/jscs.json
+++ b/dev/tools/grunt/configs/jscs.json
@@ -1,16 +1,16 @@
 {
-    "file": {
-        "options": {
-            "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc"
-        },
-        "src": ""
+  "file": {
+    "options": {
+      "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc"
     },
-    "test": {
-        "options": {
-            "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc",
-            "reporterOutput": "dev/tests/static/jscs-error-report.xml",
-            "reporter": "junit"
-        },
-        "src": ""
-    }
+    "src": ""
+  },
+  "test": {
+    "options": {
+      "config": "dev/tests/static/testsuite/Magento/Test/Js/_files/jscs/.jscsrc",
+      "reporterOutput": "dev/tests/static/jscs-error-report.xml",
+      "reporter": "junit"
+    },
+    "src": ""
+  }
 }
diff --git a/dev/tools/grunt/configs/mage-minify.json b/dev/tools/grunt/configs/mage-minify.json
index 1ddfa3910a3a8..c6ecfc5579701 100644
--- a/dev/tools/grunt/configs/mage-minify.json
+++ b/dev/tools/grunt/configs/mage-minify.json
@@ -1,21 +1,21 @@
 {
-    "legacy": {
-        "options": {
-            "compressor": "yui-js"
-        },
-        "files": {
-            "<%= path.uglify.legacy %>": [
-                "lib/web/prototype/prototype.js",
-                "lib/web/prototype/window.js",
-                "lib/web/scriptaculous/builder.js",
-                "lib/web/scriptaculous/effects.js",
-                "lib/web/lib/ccard.js",
-                "lib/web/prototype/validation.js",
-                "lib/web/varien/js.js",
-                "lib/web/mage/adminhtml/varienLoader.js",
-                "lib/web/mage/adminhtml/tools.js",
-                "dev/tools/grunt/assets/legacy-build/shim.js"
-            ]
-        }
+  "legacy": {
+    "options": {
+      "compressor": "yui-js"
+    },
+    "files": {
+      "<%= path.uglify.legacy %>": [
+        "lib/web/prototype/prototype.js",
+        "lib/web/prototype/window.js",
+        "lib/web/scriptaculous/builder.js",
+        "lib/web/scriptaculous/effects.js",
+        "lib/web/lib/ccard.js",
+        "lib/web/prototype/validation.js",
+        "lib/web/varien/js.js",
+        "lib/web/mage/adminhtml/varienLoader.js",
+        "lib/web/mage/adminhtml/tools.js",
+        "dev/tools/grunt/assets/legacy-build/shim.js"
+      ]
     }
+  }
 }
diff --git a/dev/tools/grunt/configs/styledocco.json b/dev/tools/grunt/configs/styledocco.json
index 8a75d43ac35e4..1527b26114b97 100644
--- a/dev/tools/grunt/configs/styledocco.json
+++ b/dev/tools/grunt/configs/styledocco.json
@@ -1,14 +1,12 @@
 {
-    "documentation": {
-        "options": {
-            "name": "Magento UI Library",
-            "verbose": true,
-            "include": [
-                "<%= path.doc %>/docs.css"
-            ]
-        },
-        "files": {
-            "<%= path.doc %>": "<%= path.doc %>/source"
-        }
+  "documentation": {
+    "options": {
+      "name": "Magento UI Library",
+      "verbose": true,
+      "include": ["<%= path.doc %>/docs.css"]
+    },
+    "files": {
+      "<%= path.doc %>": "<%= path.doc %>/source"
     }
-}
\ No newline at end of file
+  }
+}

From 9ef8d9ddb9dbdc185489f0fe3475aade28da167a Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 18:39:31 +0200
Subject: [PATCH 376/671] IMP: formatting for dev test config file

---
 dev/tests/acceptance/staticRuleset.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/tests/acceptance/staticRuleset.json b/dev/tests/acceptance/staticRuleset.json
index 82cc9dfe74152..91521d5f16bcc 100644
--- a/dev/tests/acceptance/staticRuleset.json
+++ b/dev/tests/acceptance/staticRuleset.json
@@ -1,8 +1,8 @@
 {
-    "tests": [
-        "actionGroupArguments",
-        "deprecatedEntityUsage",
-        "annotations",
-        "pauseActionUsage"
-    ]
+  "tests": [
+    "actionGroupArguments",
+    "deprecatedEntityUsage",
+    "annotations",
+    "pauseActionUsage"
+  ]
 }

From 93d79b8d638568ac5a529b833cbb043333d3be0d Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 18:39:53 +0200
Subject: [PATCH 377/671] IMP: formatting for auth.json

---
 auth.json.sample | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/auth.json.sample b/auth.json.sample
index be1c70cfe1e18..bd4b61d607328 100644
--- a/auth.json.sample
+++ b/auth.json.sample
@@ -1,8 +1,8 @@
 {
-    "http-basic": {
-        "repo.magento.com": {
-            "username": "<public-key>",
-            "password": "<private-key>"
-        }
+  "http-basic": {
+    "repo.magento.com": {
+      "username": "<public-key>",
+      "password": "<private-key>"
     }
+  }
 }

From 0533f2e35f4779d8b6fc14ed316c3c0e483698cb Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 18:40:21 +0200
Subject: [PATCH 378/671] IMP: formatting for grunt-config

---
 grunt-config.json.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grunt-config.json.sample b/grunt-config.json.sample
index 7ef28a856f925..5704e5f012e17 100644
--- a/grunt-config.json.sample
+++ b/grunt-config.json.sample
@@ -1,3 +1,3 @@
 {
-    "themes": "dev/tools/grunt/configs/local-themes"
+  "themes": "dev/tools/grunt/configs/local-themes"
 }

From 5b476475ad8eb2a99db7543f2881978b9b7fbe53 Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 18:40:39 +0200
Subject: [PATCH 379/671] IMP: formatting for package.json

---
 package.json.sample | 80 ++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/package.json.sample b/package.json.sample
index 93fe72afbd24a..1d07bcff26d8d 100644
--- a/package.json.sample
+++ b/package.json.sample
@@ -1,42 +1,42 @@
 {
-    "name": "magento2",
-    "author": "Magento Commerce Inc.",
-    "description": "Magento2 node modules dependencies for local development",
-    "license": "(OSL-3.0 OR AFL-3.0)",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/magento/magento2.git"
-    },
-    "homepage": "http://magento.com/",
-    "devDependencies": {
-        "glob": "~7.1.1",
-        "grunt": "~1.0.1",
-        "grunt-autoprefixer": "~3.0.4",
-        "grunt-banner": "~0.6.0",
-        "grunt-continue": "~0.1.0",
-        "grunt-contrib-clean": "~1.1.0",
-        "grunt-contrib-connect": "~1.0.2",
-        "grunt-contrib-cssmin": "~2.2.1",
-        "grunt-contrib-imagemin": "~2.0.1",
-        "grunt-contrib-jasmine": "~1.2.0",
-        "grunt-contrib-less": "~1.4.1",
-        "grunt-contrib-watch": "~1.0.0",
-        "grunt-eslint": "~20.1.0",
-        "grunt-exec": "~3.0.0",
-        "grunt-jscs": "~3.0.1",
-        "grunt-replace": "~1.0.1",
-        "grunt-styledocco": "~0.3.0",
-        "grunt-template-jasmine-requirejs": "~0.2.3",
-        "grunt-text-replace": "~0.4.0",
-        "imagemin-svgo": "~5.2.1",
-        "load-grunt-config": "~0.19.2",
-        "morgan": "~1.9.0",
-        "node-minify": "~2.3.1",
-        "path": "~0.12.7",
-        "serve-static": "~1.13.1",
-        "squirejs": "~0.2.1",
-        "strip-json-comments": "~2.0.1",
-        "time-grunt": "~1.4.0",
-        "underscore": "~1.8.0"
-    }
+  "name": "magento2",
+  "author": "Magento Commerce Inc.",
+  "description": "Magento2 node modules dependencies for local development",
+  "license": "(OSL-3.0 OR AFL-3.0)",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/magento/magento2.git"
+  },
+  "homepage": "http://magento.com/",
+  "devDependencies": {
+    "glob": "~7.1.1",
+    "grunt": "~1.0.1",
+    "grunt-autoprefixer": "~3.0.4",
+    "grunt-banner": "~0.6.0",
+    "grunt-continue": "~0.1.0",
+    "grunt-contrib-clean": "~1.1.0",
+    "grunt-contrib-connect": "~1.0.2",
+    "grunt-contrib-cssmin": "~2.2.1",
+    "grunt-contrib-imagemin": "~2.0.1",
+    "grunt-contrib-jasmine": "~1.2.0",
+    "grunt-contrib-less": "~1.4.1",
+    "grunt-contrib-watch": "~1.0.0",
+    "grunt-eslint": "~20.1.0",
+    "grunt-exec": "~3.0.0",
+    "grunt-jscs": "~3.0.1",
+    "grunt-replace": "~1.0.1",
+    "grunt-styledocco": "~0.3.0",
+    "grunt-template-jasmine-requirejs": "~0.2.3",
+    "grunt-text-replace": "~0.4.0",
+    "imagemin-svgo": "~5.2.1",
+    "load-grunt-config": "~0.19.2",
+    "morgan": "~1.9.0",
+    "node-minify": "~2.3.1",
+    "path": "~0.12.7",
+    "serve-static": "~1.13.1",
+    "squirejs": "~0.2.1",
+    "strip-json-comments": "~2.0.1",
+    "time-grunt": "~1.4.0",
+    "underscore": "~1.8.0"
+  }
 }

From c2f29b40dbef2ed1cc43136945e4ed94b15991f3 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Tue, 15 Sep 2020 14:40:41 -0500
Subject: [PATCH 380/671] MC-35855: CSP cannot be configured from a theme

---
 .../Csp/Model/Collector/CspWhitelistXml/FileResolver.php      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
index bfbc88219ca94..acc0dd1600db1 100644
--- a/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
+++ b/app/code/Magento/Csp/Model/Collector/CspWhitelistXml/FileResolver.php
@@ -87,7 +87,9 @@ public function get($filename, $scope)
                 }
                 $theme = $theme->getParentTheme();
             }
-            $configs = $this->iteratorFactory->create(['paths' => $files, 'existingIterator' => $configs]);
+            $configs = $this->iteratorFactory->create(
+                ['paths' => array_reverse($files), 'existingIterator' => $configs]
+            );
         }
 
         return $configs;

From 9d8a772c4f0efeb15f4fac12e294123f27e9f81b Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Tue, 15 Sep 2020 22:50:25 +0200
Subject: [PATCH 381/671] IMP: formatting by keeping auth.json indent, same as
 composer

---
 .editorconfig    |  3 +++
 auth.json.sample | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 877666f2aba34..0452085768830 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,3 +16,6 @@ indent_size = 2
 
 [composer.{json,lock}]
 indent_size = 4
+
+[auth.json]
+indent_size = 4
diff --git a/auth.json.sample b/auth.json.sample
index bd4b61d607328..be1c70cfe1e18 100644
--- a/auth.json.sample
+++ b/auth.json.sample
@@ -1,8 +1,8 @@
 {
-  "http-basic": {
-    "repo.magento.com": {
-      "username": "<public-key>",
-      "password": "<private-key>"
+    "http-basic": {
+        "repo.magento.com": {
+            "username": "<public-key>",
+            "password": "<private-key>"
+        }
     }
-  }
 }

From e7e156cb426737e0bc50a8032853407641cb0b7e Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Tue, 15 Sep 2020 20:22:24 -0500
Subject: [PATCH 382/671] MC-36785: Unable to set YouTube API key by CLI

---
 .../App/Config/Source/ModularConfigSource.php | 68 ++++++++++++++++---
 app/code/Magento/ProductVideo/etc/config.xml  |  1 -
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
index 01cea0a8ee4e7..c047fb61e828c 100644
--- a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\Config\App\Config\Source;
 
+use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
+use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\DataObject;
-use Magento\Framework\App\Config\Initial\Reader;
+use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
 
 /**
  * Class for retrieving initial configuration from modules
@@ -18,16 +20,25 @@
 class ModularConfigSource implements ConfigSourceInterface
 {
     /**
-     * @var Reader
+     * @var InitialConfigReader
      */
-    private $reader;
+    private $initialConfigReader;
 
     /**
-     * @param Reader $reader
+     * @var ConfigStructureReader
      */
-    public function __construct(Reader $reader)
-    {
-        $this->reader = $reader;
+    private $configStructureReader;
+
+    /**
+     * @param InitialConfigReader $initialConfigReader
+     * @param ConfigStructureReader $configStructureReader
+     */
+    public function __construct(
+        InitialConfigReader $initialConfigReader,
+        ConfigStructureReader $configStructureReader
+    ) {
+        $this->initialConfigReader = $initialConfigReader;
+        $this->configStructureReader = $configStructureReader;
     }
 
     /**
@@ -39,10 +50,51 @@ public function __construct(Reader $reader)
      */
     public function get($path = '')
     {
-        $data = new DataObject($this->reader->read());
+        $initialConfig = $this->initialConfigReader->read();
+        $configStructure = $this->configStructureReader->read(Area::AREA_ADMINHTML);
+        $sections = $configStructure['config']['system']['sections'] ?? [];
+        $defaultConfig = $initialConfig['data']['default'] ?? [];
+        $initialConfig['data']['default'] = $this->merge($defaultConfig, $sections);
+
+        $data = new DataObject($initialConfig);
         if ($path !== '') {
             $path = '/' . $path;
         }
         return $data->getData('data' . $path) ?: [];
     }
+
+    private function addPathKey(array $data, string $path): array
+    {
+        if (strpos($path, '/') !== false) {
+            list ($key, $subPath) = explode('/', $path, 2);
+            $data[$key] = $this->addPathKey($data[$key] ?? [], $subPath);
+        } else {
+            $data += [$path => null];
+        }
+
+        return $data;
+    }
+
+    /**
+     * Merge initial config with config structure
+     *
+     * @param array $config
+     * @param array $sections
+     * @return array
+     */
+    private function merge(array $config, array $sections): array
+    {
+        foreach ($sections as $key => $section) {
+            if (isset($section['children'])) {
+                $config[$section['id']] = $this->merge(
+                    $config[$section['id']] ?? [],
+                    $section['children']
+                );
+            } elseif ($section['_elementType'] === 'field') {
+                $config += [$section['id'] => null];
+            }
+        }
+
+        return $config;
+    }
 }
diff --git a/app/code/Magento/ProductVideo/etc/config.xml b/app/code/Magento/ProductVideo/etc/config.xml
index 55b7def6fb8ef..8afefa14a3651 100644
--- a/app/code/Magento/ProductVideo/etc/config.xml
+++ b/app/code/Magento/ProductVideo/etc/config.xml
@@ -12,7 +12,6 @@
                 <play_if_base>0</play_if_base>
                 <show_related>0</show_related>
                 <video_auto_restart>0</video_auto_restart>
-                <youtube_api_key/>
             </product_video>
         </catalog>
     </default>

From d1c39819eb17900e4965d7ebf2c14dbff52d1ff7 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Wed, 16 Sep 2020 14:24:47 -0500
Subject: [PATCH 383/671] MC-36785: Unable to set YouTube API key by CLI

---
 .../App/Config/Source/ModularConfigSource.php | 22 +++++------------
 .../Config/Source/ModularConfigSourceTest.php | 24 ++++++++++++-------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
index c047fb61e828c..17ea535951bd6 100644
--- a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
@@ -8,6 +8,7 @@
 use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
 use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
 
@@ -31,14 +32,15 @@ class ModularConfigSource implements ConfigSourceInterface
 
     /**
      * @param InitialConfigReader $initialConfigReader
-     * @param ConfigStructureReader $configStructureReader
+     * @param ConfigStructureReader|null $configStructureReader
      */
     public function __construct(
         InitialConfigReader $initialConfigReader,
-        ConfigStructureReader $configStructureReader
+        ?ConfigStructureReader $configStructureReader = null
     ) {
         $this->initialConfigReader = $initialConfigReader;
-        $this->configStructureReader = $configStructureReader;
+        $this->configStructureReader = $configStructureReader
+            ?? ObjectManager::getInstance()->get(ConfigStructureReader::class);
     }
 
     /**
@@ -63,18 +65,6 @@ public function get($path = '')
         return $data->getData('data' . $path) ?: [];
     }
 
-    private function addPathKey(array $data, string $path): array
-    {
-        if (strpos($path, '/') !== false) {
-            list ($key, $subPath) = explode('/', $path, 2);
-            $data[$key] = $this->addPathKey($data[$key] ?? [], $subPath);
-        } else {
-            $data += [$path => null];
-        }
-
-        return $data;
-    }
-
     /**
      * Merge initial config with config structure
      *
@@ -84,7 +74,7 @@ private function addPathKey(array $data, string $path): array
      */
     private function merge(array $config, array $sections): array
     {
-        foreach ($sections as $key => $section) {
+        foreach ($sections as $section) {
             if (isset($section['children'])) {
                 $config[$section['id']] = $this->merge(
                     $config[$section['id']] ?? [],
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
index d9ff44c2e05d0..6cfce1959d0b1 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
@@ -8,7 +8,8 @@
 namespace Magento\Config\Test\Unit\App\Config\Source;
 
 use Magento\Config\App\Config\Source\ModularConfigSource;
-use Magento\Framework\App\Config\Initial\Reader;
+use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
+use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -18,9 +19,14 @@
 class ModularConfigSourceTest extends TestCase
 {
     /**
-     * @var Reader|MockObject
+     * @var InitialConfigReader|MockObject
      */
-    private $reader;
+    private $initialConfigReader;
+
+    /**
+     * @var ConfigStructureReader|MockObject
+     */
+    private $configStructureReader;
 
     /**
      * @var ModularConfigSource
@@ -29,15 +35,17 @@ class ModularConfigSourceTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->reader = $this->getMockBuilder(Reader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->source = new ModularConfigSource($this->reader);
+        $this->initialConfigReader = $this->createMock(InitialConfigReader::class);
+        $this->configStructureReader = $this->createMock(ConfigStructureReader::class);
+        $this->source = new ModularConfigSource(
+            $this->initialConfigReader,
+            $this->configStructureReader
+        );
     }
 
     public function testGet()
     {
-        $this->reader->expects($this->once())
+        $this->initialConfigReader->expects($this->once())
             ->method('read')
             ->willReturn(['data' => ['path' => 'value']]);
         $this->assertEquals('value', $this->source->get('path'));

From 10bcde3d6a9f664670e2e944af0b447203e71c8c Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Wed, 16 Sep 2020 14:53:38 -0500
Subject: [PATCH 384/671] MC-34385: Filter fields allowing HTML

---
 .../Magento/Cms/Model/Wysiwyg/Validator.php   | 36 +++++++++++++++----
 .../Test/Unit/Model/Wysiwyg/ValidatorTest.php | 13 +++++--
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Validator.php b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
index eb17a0f3127ea..39360e6350967 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
@@ -10,9 +10,11 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Message\Factory as MessageFactory;
 
 /**
  * Processes backend validator results.
@@ -41,22 +43,30 @@ class Validator implements WYSIWYGValidatorInterface
      */
     private $logger;
 
+    /**
+     * @var MessageFactory
+     */
+    private $messageFactory;
+
     /**
      * @param WYSIWYGValidatorInterface $validator
      * @param ManagerInterface $messages
      * @param ScopeConfigInterface $config
      * @param LoggerInterface $logger
+     * @param MessageFactory $messageFactory
      */
     public function __construct(
         WYSIWYGValidatorInterface $validator,
         ManagerInterface $messages,
         ScopeConfigInterface $config,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        MessageFactory $messageFactory
     ) {
         $this->validator = $validator;
         $this->messages = $messages;
         $this->config = $config;
         $this->logger = $logger;
+        $this->messageFactory = $messageFactory;
     }
 
     /**
@@ -71,18 +81,30 @@ public function validate(string $content): void
             if ($throwException) {
                 throw $exception;
             } else {
-                $this->messages->addWarningMessage(
-                    __(
-                        'Temporarily allowed to save HTML value that contains restricted elements. %1',
-                        $exception->getMessage()
-                    )
+                $this->messages->addUniqueMessages(
+                    [
+                        $this->messageFactory->create(
+                            MessageInterface::TYPE_WARNING,
+                            (string)__(
+                                'Temporarily allowed to save HTML value that contains restricted elements. %1',
+                                $exception->getMessage()
+                            )
+                        )
+                    ]
                 );
             }
         } catch (\Throwable $exception) {
             if ($throwException) {
                 throw $exception;
             } else {
-                $this->messages->addWarningMessage(__('Invalid HTML provided')->render());
+                $this->messages->addUniqueMessages(
+                    [
+                        $this->messageFactory->create(
+                            MessageInterface::TYPE_WARNING,
+                            (string)__('Invalid HTML provided')
+                        )
+                    ]
+                );
                 $this->logger->error($exception);
             }
         }
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
index b14ad81aa2c1a..8e2fa44a24545 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
@@ -11,10 +11,12 @@
 use Magento\Cms\Model\Wysiwyg\Validator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Message\ManagerInterface;
+use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
+use Magento\Framework\Message\Factory as MessageFactory;
 
 class ValidatorTest extends TestCase
 {
@@ -45,6 +47,13 @@ public function testValidate(bool $isFlagSet, ?\Throwable $thrown, bool $excepti
     {
         $actuallyWarned = false;
 
+        $messageFactoryMock = $this->createMock(MessageFactory::class);
+        $messageFactoryMock->method('create')
+            ->willReturnCallback(
+                function () {
+                    return $this->getMockForAbstractClass(MessageInterface::class);
+                }
+            );
         $configMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $configMock->method('isSetFlag')
             ->with(Validator::CONFIG_PATH_THROW_EXCEPTION)
@@ -56,7 +65,7 @@ public function testValidate(bool $isFlagSet, ?\Throwable $thrown, bool $excepti
         }
 
         $messagesMock = $this->getMockForAbstractClass(ManagerInterface::class);
-        $messagesMock->method('addWarningMessage')
+        $messagesMock->method('addUniqueMessages')
             ->willReturnCallback(
                 function () use (&$actuallyWarned): void {
                     $actuallyWarned = true;
@@ -65,7 +74,7 @@ function () use (&$actuallyWarned): void {
 
         $loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
 
-        $validator = new Validator($backendMock, $messagesMock, $configMock, $loggerMock);
+        $validator = new Validator($backendMock, $messagesMock, $configMock, $loggerMock, $messageFactoryMock);
         try {
             $validator->validate('content');
             $actuallyThrown = false;

From e8f7b175543c698959ae6e645b4277c7768135c6 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 16 Sep 2020 23:21:19 +0300
Subject: [PATCH 385/671] add AdminOpenCustomersGridActionGroup

---
 .../Test/CheckTierPricingOfProductsTest.xml   |  3 +--
 .../AdminOpenCustomersGridActionGroup.xml     | 19 +++++++++++++++++++
 ...aultBillingShippingCustomerAddressTest.xml |  2 +-
 ...hangeCustomerGenderInCustomersGridTest.xml |  3 +--
 .../Mftf/Test/AdminCreateCustomerTest.xml     |  3 +--
 ...stomerOnStorefrontSignupNewsletterTest.xml |  3 +--
 ...DeleteCustomerAddressesFromTheGridTest.xml |  2 +-
 ...AddressesFromTheGridViaMassActionsTest.xml |  2 +-
 ...eleteDefaultBillingCustomerAddressTest.xml |  2 +-
 ...aultBillingShippingCustomerAddressTest.xml |  2 +-
 ...dminExactMatchSearchInCustomerGridTest.xml |  4 ++--
 ...dminSearchCustomerAddressByKeywordTest.xml |  2 +-
 ...inSetCustomerDefaultBillingAddressTest.xml |  2 +-
 ...nSetCustomerDefaultShippingAddressTest.xml |  2 +-
 ...ustomerInfoFromDefaultToNonDefaultTest.xml |  8 ++------
 ...tomerAddressStateContainValuesOnceTest.xml |  4 +---
 ...CountriesRestrictionApplyOnBackendTest.xml |  3 +--
 .../Test/SearchByEmailInCustomerGridTest.xml  |  4 ++--
 .../CreateOrderFromEditCustomerPageTest.xml   |  2 +-
 ...rableProductsInComparedOnOrderPageTest.xml |  4 +---
 ...impleProductsInComparedOnOrderPageTest.xml |  4 +---
 .../AdminNavigateWhileUserExpiredTest.xml     |  2 +-
 22 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
index 55d697e35deba..8436c94acc685 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml
@@ -127,8 +127,7 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <see userInput="You saved the customer." stepKey="CustomerIsSaved"/>
 
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForPageLoad1" />
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomers"/>
         <click selector="{{AdminCustomerFiltersSection.clearAll}}" stepKey="ClearFilters"/>
         <waitForPageLoad stepKey="waitForFiltersClear"/>
 
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml
new file mode 100644
index 0000000000000..c1dedfefda309
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="AdminOpenCustomersGridActionGroup">
+        <annotations>
+            <description>Open the Admin Customers grid page.</description>
+        </annotations>
+
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
index b061b6a256471..2220f69700265 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminAddNewDefaultBillingShippingCustomerAddressTest.xml
@@ -30,7 +30,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
index 423954a7d9bf7..d1934a82bea0e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
@@ -26,8 +26,7 @@
         <after>
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <!-- Reset customer grid filter -->
-            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGridPage"/>
-            <waitForPageLoad stepKey="waitForCustomersGrid"/>
+            <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="goToCustomersGridPage"/>
             <actionGroup ref="AdminResetFilterInCustomerGrid" stepKey="resetFilter"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index cb003ed837294..d12a89f01cb96 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -29,8 +29,7 @@
         </after>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForLoad1"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomers"/>
         <click selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}" stepKey="clickCreateCustomer"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
index 683b275ca1ed6..44eab9d0c19ae 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateNewCustomerOnStorefrontSignupNewsletterTest.xml
@@ -35,8 +35,7 @@
         </actionGroup>
 
         <!--Assert verify created new customer in grid-->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
-        <waitForPageLoad stepKey="waitForNavigateToCustomersPageLoad"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomers"/>
         <click selector="{{AdminCustomerFiltersSection.filtersButton}}" stepKey="clickFilterButton"/>
         <fillField userInput="{{CustomerEntityOne.email}}" selector="{{AdminCustomerFiltersSection.emailInput}}" stepKey="filterEmail"/>
         <click selector="{{AdminCustomerFiltersSection.apply}}" stepKey="clickApplyFilter"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
index 615a6ebcf24cc..62dcd6fc4d894 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridTest.xml
@@ -34,7 +34,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
index 57446a1ee0c72..c6e72901b062c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
@@ -34,7 +34,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
index f08ea83a70da6..52c8029b8f778 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
@@ -33,7 +33,7 @@
         Step1. Login to admin and go to Customers > All Customers.
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
index 6e44fe96b0d7b..72bda91445256 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
@@ -30,7 +30,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
index ea4b3645d371f..14d569ed9101d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
@@ -28,12 +28,12 @@
         <after>
             <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
             <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
-            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+            <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
             <actionGroup ref="AdminResetFilterInCustomerAddressGrid" stepKey="clearCustomerGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Step 1: Go to Customers > All Customers-->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <!--Step 2: On Customers grid page search customer by keyword with quotes-->
         <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchCustomer">
             <argument name="keyword" value="$$createSecondCustomer.firstname$$"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
index b13a06b9ef858..bac1c665cbe78 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
@@ -34,7 +34,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
index 5ce96a8dcab3c..65dcf572f19fb 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
@@ -30,7 +30,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
index a9832c86562f1..bf76e29b185ba 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
@@ -30,7 +30,7 @@
         Step2. On *Customers* page choose customer from preconditions and open it to edit
         Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
         <!- -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="Simple_US_Customer_Multiple_Addresses_No_Default_Address"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
index 8af07bc2c2d53..fb6793b1751a6 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
@@ -27,9 +27,7 @@
         </before>
         <after>
             <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-            <!-- Reset customer grid filter -->
-            <amOnPage stepKey="goToCustomersGridPage" url="{{AdminCustomerPage.url}}"/>
-            <waitForPageLoad stepKey="waitForCustomersGrid"/>
+            <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="goToCustomersGridPage"/>
             <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerGrid"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -47,9 +45,7 @@
             <argument name="customerAddress" value="CustomerAddressSimple"/>
         </actionGroup>
         <actionGroup stepKey="saveAndCheckSuccessMessage" ref="AdminSaveCustomerAndAssertSuccessMessage"/>
-        <!-- Assert Customer in Customer grid -->
-        <amOnPage stepKey="goToCustomersGridPage" url="{{AdminCustomerPage.url}}"/>
-        <waitForPageLoad stepKey="waitForCustomersGrid"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="goToCustomersGridPage"/>
         <actionGroup stepKey="resetFilter" ref="AdminResetFilterInCustomerGrid"/>
         <actionGroup stepKey="filterByEamil" ref="AdminFilterCustomerGridByEmail">
             <argument name="email" value="updated$$customer.email$$"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml
index 2aa85f8c966a9..785ee1a02abe1 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminVerifyCustomerAddressStateContainValuesOnceTest.xml
@@ -31,9 +31,7 @@
             <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-
-        <!-- Go to Customers > All Customers.-->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
 
         <!--Select created customer, Click Edit mode-->
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPageWithAddresses">
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index 781d721fd5132..6a157c6312530 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -116,8 +116,7 @@
         <waitForPageLoad stepKey="waitForCustomersPage"/>
         <!--Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount-->
         <comment userInput="Go to Customers grid and check that filter countries amount is the same as initial allowed countries amount" stepKey="compareCountriesAmount"/>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersGrid"/>
-        <waitForPageLoad stepKey="waitForCustomersGrid"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="goToCustomersGrid"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openFiltersSectionOnCustomersGrid"/>
         <executeJS function="var len = document.querySelectorAll('{{AdminCustomerFiltersSection.countryOptions}}').length; return len-1;" stepKey="countriesAmount2"/>
         <assertEquals stepKey="assertCountryAmounts">
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml
index d4351c8bcdc84..b2a78686cdad5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml
@@ -26,12 +26,12 @@
         <after>
             <deleteData createDataKey="createFirstCustomer" stepKey="deleteFirstCustomer"/>
             <deleteData createDataKey="createSecondCustomer" stepKey="deleteSecondCustomer"/>
-            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+            <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
             <actionGroup ref="AdminResetFilterInCustomerAddressGrid" stepKey="clearCustomerGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Step 1: Go to Customers > All Customers-->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <!--Step 2: On Customers grid page search customer by keyword-->
         <actionGroup ref="SearchAdminDataGridByKeywordActionGroup" stepKey="searchCustomer">
             <argument name="keyword" value="$$createSecondCustomer.email$$"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index ca705405809bd..77b119dd583de 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -91,7 +91,7 @@
             <deleteData createDataKey="createConfigProduct" stepKey="deleteConfigurableProduct"/>
             <deleteData createDataKey="createConfigProductAttribute" stepKey="deleteProductAttribute"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerIndexPage"/>
+            <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomerIndexPage"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearCustomerGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
 
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
index c3058ca6ede87..bace51cea17d5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveConfigurableProductsInComparedOnOrderPageTest.xml
@@ -132,9 +132,7 @@
         <!-- Login as admin -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
-        <!-- Open Customers -> All Customers -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="$$createCustomer$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
index 176fb05bc74b3..00e401941036e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
@@ -70,9 +70,7 @@
         <!-- Login as admin -->
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
 
-        <!-- Open Customers -> All Customers -->
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomersGridPage"/>
-        <waitForPageLoad stepKey="waitForCustomerPageLoad"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomersGridPage"/>
         <actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="openEditCustomerPage">
             <argument name="customer" value="$$createCustomer$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Security/Test/Mftf/Test/AdminNavigateWhileUserExpiredTest.xml b/app/code/Magento/Security/Test/Mftf/Test/AdminNavigateWhileUserExpiredTest.xml
index c1a951afd87ec..dc88ad9d2cbf1 100644
--- a/app/code/Magento/Security/Test/Mftf/Test/AdminNavigateWhileUserExpiredTest.xml
+++ b/app/code/Magento/Security/Test/Mftf/Test/AdminNavigateWhileUserExpiredTest.xml
@@ -46,7 +46,7 @@
         </actionGroup>
         <actionGroup ref="AssertAdminDashboardPageIsVisibleActionGroup" stepKey="seeDashboardPage"/>
         <wait time="120" stepKey="waitForUserToExpire"/>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomers"/>
         <!-- Confirm that user is logged out -->
         <seeInCurrentUrl url="{{AdminLoginPage.url}}" stepKey="seeAdminLoginUrl"/>
 

From 075ddb4b76367df4e123ab71e2d1fb37e821160e Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Mon, 14 Sep 2020 09:59:35 +0300
Subject: [PATCH 386/671] Fix URL generation for new store

Emulate adminhtml area where url rewrites are created
---
 .../Command/App/ConfigImportCommand.php       | 79 ++++++++++++++++---
 .../Command/App/ConfigImportCommandTest.php   | 76 +++++++++++++++++-
 app/code/Magento/Deploy/etc/di.xml            |  6 ++
 3 files changed, 148 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php b/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
index 8a75ad0def222..eb87a9c12125b 100644
--- a/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
+++ b/app/code/Magento/Deploy/Console/Command/App/ConfigImportCommand.php
@@ -3,14 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Deploy\Console\Command\App;
 
+use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
+use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\RuntimeException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Magento\Framework\Console\Cli;
-use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
 
 /**
  * Runs the process of importing configuration data from shared source to appropriate application sources
@@ -21,9 +28,6 @@
  */
 class ConfigImportCommand extends Command
 {
-    /**
-     * Command name.
-     */
     const COMMAND_NAME = 'app:config:import';
 
     /**
@@ -33,12 +37,40 @@ class ConfigImportCommand extends Command
      */
     private $processor;
 
+    /**
+     * @var EmulatedAdminhtmlAreaProcessor
+     */
+    private $adminhtmlAreaProcessor;
+
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
+    /**
+     * @var AreaList
+     */
+    private $areaList;
+
     /**
      * @param Processor $processor the configuration importer
+     * @param DeploymentConfig|null $deploymentConfig
+     * @param EmulatedAdminhtmlAreaProcessor|null $adminhtmlAreaProcessor
+     * @param AreaList|null $areaList
      */
-    public function __construct(Processor $processor)
-    {
+    public function __construct(
+        Processor $processor,
+        DeploymentConfig $deploymentConfig = null,
+        EmulatedAdminhtmlAreaProcessor $adminhtmlAreaProcessor = null,
+        AreaList $areaList = null
+    ) {
         $this->processor = $processor;
+        $this->deploymentConfig = $deploymentConfig
+            ?? ObjectManager::getInstance()->get(DeploymentConfig::class);
+        $this->adminhtmlAreaProcessor = $adminhtmlAreaProcessor
+            ?? ObjectManager::getInstance()->get(EmulatedAdminhtmlAreaProcessor::class);
+        $this->areaList = $areaList
+            ?? ObjectManager::getInstance()->get(AreaList::class);
 
         parent::__construct();
     }
@@ -55,12 +87,26 @@ protected function configure()
     }
 
     /**
-     * Imports data from deployment configuration files to the DB. {@inheritdoc}
+     * Imports data from deployment configuration files to the DB.
+     * {@inheritdoc}
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws \Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         try {
-            $this->processor->execute($input, $output);
+            if ($this->canEmulateAdminhtmlArea()) {
+                // Emulate adminhtml area in order to execute all needed plugins declared only for this area
+                // For instance URL rewrite generation during creating store view
+                $this->adminhtmlAreaProcessor->process(function () use ($input, $output) {
+                    $this->processor->execute($input, $output);
+                });
+            } else {
+                $this->processor->execute($input, $output);
+            }
         } catch (RuntimeException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
 
@@ -69,4 +115,19 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * Detects if we can emulate adminhtml area
+     *
+     * This area could be not available for instance during setup:install
+     *
+     * @return bool
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    private function canEmulateAdminhtmlArea(): bool
+    {
+        return $this->deploymentConfig->isAvailable()
+            && in_array(Area::AREA_ADMINHTML, $this->areaList->getCodes());
+    }
 }
diff --git a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
index da790a19f480a..32bdd63ef4638 100644
--- a/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
+++ b/app/code/Magento/Deploy/Test/Unit/Console/Command/App/ConfigImportCommandTest.php
@@ -7,8 +7,11 @@
 
 namespace Magento\Deploy\Test\Unit\Console\Command\App;
 
+use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
 use Magento\Deploy\Console\Command\App\ConfigImport\Processor;
 use Magento\Deploy\Console\Command\App\ConfigImportCommand;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\RuntimeException;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -27,16 +30,37 @@ class ConfigImportCommandTest extends TestCase
      */
     private $commandTester;
 
+    /**
+     * @var DeploymentConfig|MockObject
+     */
+    private $deploymentConfigMock;
+
+    /**
+     * @var EmulatedAdminhtmlAreaProcessor|MockObject
+     */
+    private $adminhtmlAreaProcessorMock;
+
+    /**
+     * @var AreaList|MockObject
+     */
+    private $areaListMock;
+
     /**
      * @return void
      */
     protected function setUp(): void
     {
-        $this->processorMock = $this->getMockBuilder(Processor::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->processorMock = $this->createMock(Processor::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->adminhtmlAreaProcessorMock = $this->createMock(EmulatedAdminhtmlAreaProcessor::class);
+        $this->areaListMock = $this->createMock(AreaList::class);
 
-        $configImportCommand = new ConfigImportCommand($this->processorMock);
+        $configImportCommand = new ConfigImportCommand(
+            $this->processorMock,
+            $this->deploymentConfigMock,
+            $this->adminhtmlAreaProcessorMock,
+            $this->areaListMock
+        );
 
         $this->commandTester = new CommandTester($configImportCommand);
     }
@@ -46,6 +70,13 @@ protected function setUp(): void
      */
     public function testExecute()
     {
+        $this->deploymentConfigMock->expects($this->once())->method('isAvailable')->willReturn(true);
+        $this->adminhtmlAreaProcessorMock->expects($this->once())
+            ->method('process')->willReturnCallback(function (callable $callback, array $params = []) {
+                return $callback(...$params);
+            });
+        $this->areaListMock->expects($this->once())->method('getCodes')->willReturn(['adminhtml']);
+
         $this->processorMock->expects($this->once())
             ->method('execute');
 
@@ -57,6 +88,13 @@ public function testExecute()
      */
     public function testExecuteWithException()
     {
+        $this->deploymentConfigMock->expects($this->once())->method('isAvailable')->willReturn(true);
+        $this->adminhtmlAreaProcessorMock->expects($this->once())
+            ->method('process')->willReturnCallback(function (callable $callback, array $params = []) {
+                return $callback(...$params);
+            });
+        $this->areaListMock->expects($this->once())->method('getCodes')->willReturn(['adminhtml']);
+
         $this->processorMock->expects($this->once())
             ->method('execute')
             ->willThrowException(new RuntimeException(__('Some error')));
@@ -64,4 +102,34 @@ public function testExecuteWithException()
         $this->assertSame(Cli::RETURN_FAILURE, $this->commandTester->execute([]));
         $this->assertStringContainsString('Some error', $this->commandTester->getDisplay());
     }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithDeploymentConfigNotAvailable()
+    {
+        $this->deploymentConfigMock->expects($this->once())->method('isAvailable')->willReturn(false);
+        $this->adminhtmlAreaProcessorMock->expects($this->never())->method('process');
+        $this->areaListMock->expects($this->never())->method('getCodes');
+
+        $this->processorMock->expects($this->once())
+            ->method('execute');
+
+        $this->assertSame(Cli::RETURN_SUCCESS, $this->commandTester->execute([]));
+    }
+
+    /**
+     * @return void
+     */
+    public function testExecuteWithMissingAdminhtmlLocale()
+    {
+        $this->deploymentConfigMock->expects($this->once())->method('isAvailable')->willReturn(true);
+        $this->adminhtmlAreaProcessorMock->expects($this->never())->method('process');
+        $this->areaListMock->expects($this->once())->method('getCodes')->willReturn([]);
+
+        $this->processorMock->expects($this->once())
+            ->method('execute');
+
+        $this->assertSame(Cli::RETURN_SUCCESS, $this->commandTester->execute([]));
+    }
 }
diff --git a/app/code/Magento/Deploy/etc/di.xml b/app/code/Magento/Deploy/etc/di.xml
index 0c32baebf12df..d40ed3144e7e6 100644
--- a/app/code/Magento/Deploy/etc/di.xml
+++ b/app/code/Magento/Deploy/etc/di.xml
@@ -35,6 +35,12 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Deploy\Console\Command\App\ConfigImportCommand">
+        <arguments>
+            <argument name="adminhtmlAreaProcessor" xsi:type="object">Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor\Proxy</argument>
+            <argument name="areaList" xsi:type="object">Magento\Framework\App\AreaList\Proxy</argument>
+        </arguments>
+    </type>
     <type name="Magento\Deploy\Model\Filesystem">
         <arguments>
             <argument name="shell" xsi:type="object">Magento\Framework\App\Shell</argument>

From b2139152bcdb50a3c4972c9c84f5af8b57b463e5 Mon Sep 17 00:00:00 2001
From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com>
Date: Thu, 17 Sep 2020 18:05:52 +0300
Subject: [PATCH 387/671] Integration test has been added

---
 .../Adminhtml/Order/AddToPackageTest.php      | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php
new file mode 100644
index 0000000000000..0455181d42b00
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Shipping\Block\Adminhtml\Order;
+
+use Magento\Backend\Block\Template;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\Data\ShipmentTrackInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Class verifies packaging popup.
+ *
+ * @magentoAppArea adminhtml
+ */
+class AddToPackageTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Registry */
+    private $registry;
+    /**
+     * @var OrderInterfaceFactory|mixed
+     */
+    private $orderFactory;
+
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
+    }
+
+    /**
+     * Test that Packaging popup renders
+     *
+     * @magentoDataFixture Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
+     */
+    public function testGetCommentsHtml()
+    {
+        /** @var Template $block */
+        $block = $this->objectManager->get(Packaging::class);
+
+        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
+
+        /** @var ShipmentTrackInterface $track */
+        $shipment = $order->getShipmentsCollection()->getFirstItem();
+
+        $this->registry->register('current_shipment', $shipment);
+
+        $block->setTemplate('Magento_Shipping::order/packaging/popup.phtml');
+        $html = $block->toHtml();
+        $expectedNeedle = "packaging.setItemQtyCallback(function(itemId){
+            var item = $$('[name=\"shipment[items]['+itemId+']\"]')[0],
+                itemTitle = $('order_item_' + itemId + '_title');
+            if (!itemTitle && !item) {
+                return 0;
+            }
+            if (item && !isNaN(item.value)) {
+                return item.value;
+            }
+        });";
+        $this->assertStringContainsString($expectedNeedle, $html);
+    }
+}

From fbb40c25f05d6fdfea18087772e381805506b861 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Thu, 17 Sep 2020 10:39:53 -0500
Subject: [PATCH 388/671] MC-34385: Filter fields allowing HTML

---
 app/code/Magento/Cms/Model/BlockRepository.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index c26e2d809d996..ef57f8ca7b849 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -217,6 +217,7 @@ public function deleteById($blockId)
      */
     private function getCollectionProcessor()
     {
+        //phpcs:disable Magento2.PHP.LiteralNamespaces
         if (!$this->collectionProcessor) {
             $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
                 'Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor'

From fee7c0cf8b18a1fc2d4ef6b8f127189efff77565 Mon Sep 17 00:00:00 2001
From: "taras.gamanov" <engcom-vendorworker-hotel@adobe.com>
Date: Tue, 22 Sep 2020 15:44:30 +0300
Subject: [PATCH 389/671] Code refactoring, fixture has been updated.

---
 .../Adminhtml/Order/AddToPackageTest.php      | 39 ++++++++++++---
 .../_files/shipping_with_carrier_data.php     | 49 +++++++++++++++++++
 .../shipping_with_carrier_data_rollback.php   |  9 ++++
 3 files changed, 89 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php b/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php
index 0455181d42b00..fbbc6ef25cc09 100644
--- a/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Shipping/Block/Adminhtml/Order/AddToPackageTest.php
@@ -6,12 +6,15 @@
 namespace Magento\Shipping\Block\Adminhtml\Order;
 
 use Magento\Backend\Block\Template;
+use Magento\Framework\Api\SearchCriteria;
+use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
-use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\ShipmentTrackInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
+use Magento\Sales\Api\OrderRepositoryInterface;
 
 /**
  * Class verifies packaging popup.
@@ -20,34 +23,54 @@
  */
 class AddToPackageTest extends TestCase
 {
+    /**
+     * @var OrderRepositoryInterface
+     */
+    private $orderRepository;
+
     /** @var ObjectManagerInterface */
     private $objectManager;
 
     /** @var Registry */
     private $registry;
-    /**
-     * @var OrderInterfaceFactory|mixed
-     */
-    private $orderFactory;
 
     protected function setUp(): void
     {
         $this->objectManager = Bootstrap::getObjectManager();
         $this->registry = $this->objectManager->get(Registry::class);
-        $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
+        $this->orderRepository = $this->objectManager->get(OrderRepositoryInterface::class);
+    }
+
+    /**
+     * Loads order entity by provided order increment ID.
+     *
+     * @param string $incrementId
+     * @return OrderInterface
+     */
+    private function getOrderByIncrementId(string $incrementId) : OrderInterface
+    {
+        /** @var SearchCriteria $searchCriteria */
+        $searchCriteria = $this->objectManager->get(SearchCriteriaBuilder::class)
+            ->addFilter('increment_id', $incrementId)
+            ->create();
+
+        $items = $this->orderRepository->getList($searchCriteria)
+            ->getItems();
+
+        return array_pop($items);
     }
 
     /**
      * Test that Packaging popup renders
      *
-     * @magentoDataFixture Magento/GraphQl/Sales/_files/customer_order_with_ups_shipping.php
+     * @magentoDataFixture Magento/Shipping/_files/shipping_with_carrier_data.php
      */
     public function testGetCommentsHtml()
     {
         /** @var Template $block */
         $block = $this->objectManager->get(Packaging::class);
 
-        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
+        $order = $this->getOrderByIncrementId('100000001');
 
         /** @var ShipmentTrackInterface $track */
         $shipment = $order->getShipmentsCollection()->getFirstItem();
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data.php b/dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data.php
new file mode 100644
index 0000000000000..736487ac5c006
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\ShipmentFactory;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Framework\DB\Transaction;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Transaction $transaction */
+$transaction = $objectManager->get(Transaction::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple');
+/** @var Order $order */
+$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
+$order->setShippingDescription('UPS Next Day Air')
+    ->setShippingMethod('ups_11')
+    ->setShippingAmount(0)
+    ->setCouponCode('1234567890')
+    ->setDiscountDescription('1234567890');
+
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->create(OrderRepositoryInterface::class);
+$orderRepository->save($order);
+
+$shipmentItems = [];
+foreach ($order->getItems() as $orderItem) {
+    $shipmentItems[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$tracking = [
+    'carrier_code' => 'ups',
+    'title' => 'United Parcel Service',
+    'number' => '987654321'
+];
+
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $shipmentItems, [$tracking]);
+$shipment->register();
+$transaction->addObject($shipment)->addObject($order)->save();
diff --git a/dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_rollback.php b/dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_rollback.php
new file mode 100644
index 0000000000000..bbb90e0326aec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Shipping/_files/shipping_with_carrier_data_rollback.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_with_customer_rollback.php');

From 819fc7cfef122559826edbfd17ce397527461ae1 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Tue, 22 Sep 2020 16:56:13 +0300
Subject: [PATCH 390/671] refactor

---
 .../Model/Import/Product.php                  | 126 +++++++++---------
 1 file changed, 65 insertions(+), 61 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 4384cec88bc46..e249e5b3722e7 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -45,9 +45,10 @@
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @since 100.0.2
  */
-class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
+class Product extends AbstractEntity
 {
-    const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
+    public const CONFIG_KEY_PRODUCT_TYPES = 'global/importexport/import_product_types';
+    private const HASH_ALGORITHM = 'sha256';
 
     /**
      * Size of bunch - part of products to save in one step.
@@ -1749,43 +1750,12 @@ protected function _saveProducts()
                 $position = 0;
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
-                        $hash = '';
-                        if (filter_var($columnImage, FILTER_VALIDATE_URL) === false) {
-                            $filename = $importDir . DIRECTORY_SEPARATOR . $columnImage;
-                            if ($this->fileDriver->isExists($filename)) {
-                                $hash = hash_file(
-                                    'sha256',
-                                    $importDir . DIRECTORY_SEPARATOR . $columnImage
-                                );
-                            }
-                        } else {
-                            $hash = hash_file('sha256', $columnImage);
-                        }
+                        $filePath = filter_var($columnImage, FILTER_VALIDATE_URL)
+                            ? $columnImage
+                            : $importDir . DS . $columnImage;
 
-                        // Add new images
-                        if (empty($rowExistingImages)) {
-                            $imageAlreadyExists = false;
-                        } else {
-                            $imageAlreadyExists = array_reduce(
-                                $rowExistingImages,
-                                function ($exists, $file) use ($hash) {
-                                    if ($exists) {
-                                        return $exists;
-                                    }
-
-                                    if (isset($file['hash']) && $file['hash'] === $hash) {
-                                        return $file['value'];
-                                    }
-
-                                    return $exists;
-                                },
-                                ''
-                            );
-                        }
-
-                        if ($imageAlreadyExists) {
-                            $uploadedFile = $imageAlreadyExists;
-                        } elseif (!isset($uploadedImages[$columnImage])) {
+                        $uploadedFile = $this->getAlreadyExistedImage($rowExistingImages, $filePath);
+                        if (!$uploadedFile && !isset($uploadedImages[$columnImage])) {
                             $uploadedFile = $this->uploadMediaFiles($columnImage);
                             $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
                             if ($uploadedFile) {
@@ -1800,7 +1770,7 @@ function ($exists, $file) use ($hash) {
                                     ProcessingError::ERROR_LEVEL_NOT_CRITICAL
                                 );
                             }
-                        } else {
+                        } elseif (isset($uploadedImages[$columnImage])) {
                             $uploadedFile = $uploadedImages[$columnImage];
                         }
 
@@ -1954,24 +1924,14 @@ function ($exists, $file) use ($hash) {
                 }
             }
 
-            $this->saveProductEntity(
-                $entityRowsIn,
-                $entityRowsUp
-            )->_saveProductWebsites(
-                $this->websitesCache
-            )->_saveProductCategories(
-                $this->categoriesCache
-            )->_saveProductTierPrices(
-                $tierPrices
-            )->_saveMediaGallery(
-                $mediaGallery
-            )->_saveProductAttributes(
-                $attributes
-            )->updateMediaGalleryVisibility(
-                $imagesForChangeVisibility
-            )->updateMediaGalleryLabels(
-                $labelsForUpdate
-            );
+            $this->saveProductEntity($entityRowsIn, $entityRowsUp)
+                ->_saveProductWebsites($this->websitesCache)
+                ->_saveProductCategories($this->categoriesCache)
+                ->_saveProductTierPrices($tierPrices)
+                ->_saveMediaGallery($mediaGallery)
+                ->_saveProductAttributes($attributes)
+                ->updateMediaGalleryVisibility($imagesForChangeVisibility)
+                ->updateMediaGalleryLabels($labelsForUpdate);
 
             $this->_eventManager->dispatch(
                 'catalog_product_import_bunch_save_after',
@@ -1985,6 +1945,51 @@ function ($exists, $file) use ($hash) {
 
     // phpcs:enable
 
+    /**
+     * Returns image hash by path
+     *
+     * @param string $filePath
+     * @return string
+     */
+    private function getFileHash(string $filePath): string
+    {
+        try {
+            $fileExists = $this->fileDriver->isExists($filePath);
+        } catch (\Exception $exception) {
+            $fileExists = false;
+        }
+
+        return $fileExists ? hash_file(self::HASH_ALGORITHM, $filePath) : '';
+    }
+
+    /**
+     * Returns existed image
+     *
+     * @param array $imageRow
+     * @param string $filePath
+     * @return string
+     */
+    private function getAlreadyExistedImage(array $imageRow, string $filePath): string
+    {
+        $hash = $this->getFileHash($filePath);
+
+        return array_reduce(
+            $imageRow,
+            function ($exists, $file) use ($hash) {
+                if ($exists) {
+                    return $exists;
+                }
+
+                if (isset($file['hash']) && $file['hash'] === $hash) {
+                    return $file['value'];
+                }
+
+                return $exists;
+            },
+            ''
+        );
+    }
+
     /**
      * Generate hashes for existing images for comparison with newly uploaded images.
      *
@@ -2001,7 +2006,7 @@ private function addImageHashes(array &$images): void
                 foreach ($files as $path => $file) {
                     if ($this->fileDriver->isExists($productMediaPath . $file['value'])) {
                         $fileName = $productMediaPath . $file['value'];
-                        $images[$storeId][$sku][$path]['hash'] = hash_file('sha256', $fileName);
+                        $images[$storeId][$sku][$path]['hash'] = $this->getFileHash($fileName);
                     }
                 }
             }
@@ -2019,9 +2024,8 @@ private function clearNoSelectionImages($rowImages, $rowData)
     {
         foreach ($rowImages as $column => $columnImages) {
             foreach ($columnImages as $key => $image) {
-                if ($image == 'no_selection') {
-                    unset($rowImages[$column][$key]);
-                    unset($rowData[$column]);
+                if ($image === 'no_selection') {
+                    unset($rowImages[$column][$key], $rowData[$column]);
                 }
             }
         }

From 5ca23336e4955110bd5ec0d2c5408681ad3a6b98 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Tue, 22 Sep 2020 14:55:46 -0500
Subject: [PATCH 391/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Model/Indexer/Design/IndexerHandler.php   | 59 +++++++++++++++++++
 app/code/Magento/Theme/etc/indexer.xml        |  2 +-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php

diff --git a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
new file mode 100644
index 0000000000000..f1acf01b4fc81
--- /dev/null
+++ b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Theme\Model\Indexer\Design;
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Indexer\IndexStructureInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
+use Magento\Framework\Indexer\SaveHandler\Grid;
+use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+
+class IndexerHandler extends Grid
+{
+    /**
+     * @var FlatScopeResolver
+     */
+    private $flatScopeResolver;
+
+    public function __construct(
+        IndexStructureInterface $indexStructure,
+        ResourceConnection $resource,
+        Batch $batch,
+        IndexScopeResolver $indexScopeResolver,
+        FlatScopeResolver $flatScopeResolver,
+        array $data,
+        $batchSize = 100)
+    {
+        parent::__construct(
+            $indexStructure,
+            $resource,
+            $batch,
+            $indexScopeResolver,
+            $flatScopeResolver,
+            $data,
+            $batchSize);
+
+        $this->flatScopeResolver = $flatScopeResolver;
+    }
+
+    /**
+     * Clean index table by truncation
+     *
+     * @inheritdoc
+     */
+    public function cleanIndex($dimensions)
+    {
+        $adapter = $this->resource->getConnection('write');
+        $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), $dimensions);
+        if ($adapter->isTableExists($tableName)) {
+            $adapter->truncateTable($tableName);
+        }
+    }
+}
diff --git a/app/code/Magento/Theme/etc/indexer.xml b/app/code/Magento/Theme/etc/indexer.xml
index 7ed25878e383c..8cc8971024e48 100644
--- a/app/code/Magento/Theme/etc/indexer.xml
+++ b/app/code/Magento/Theme/etc/indexer.xml
@@ -17,7 +17,7 @@
             <field name="store_group_id" xsi:type="filterable" dataType="int"/>
             <field name="store_id" xsi:type="filterable" dataType="int"/>
         </fieldset>
-        <saveHandler class="Magento\Framework\Indexer\SaveHandler\Grid"/>
+        <saveHandler class="Magento\Theme\Model\Indexer\Design\IndexerHandler"/>
         <structure class="Magento\Framework\Indexer\GridStructure"/>
     </indexer>
 </config>

From 14e84126d62c157ac54951303322f6e307ee05bc Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Tue, 22 Sep 2020 16:52:57 -0500
Subject: [PATCH 392/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Theme/Model/Indexer/Design/Config.php     | 20 ++++++++++++++++++-
 app/code/Magento/Theme/etc/indexer.xml        |  2 +-
 .../Framework/Indexer/SaveHandler/Grid.php    | 14 +++++++++----
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Indexer/Design/Config.php b/app/code/Magento/Theme/Model/Indexer/Design/Config.php
index 43b58257b343c..86a72ebc64391 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/Config.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/Config.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Theme\Model\Indexer\Design;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Framework\Indexer\FieldsetPool;
 use Magento\Framework\Indexer\HandlerPool;
@@ -93,13 +94,30 @@ protected function execute(array $ids = [])
         /** @var \Magento\Theme\Model\ResourceModel\Design\Config\Scope\Collection $collection */
         $collection = $this->collectionFactory->create();
         $this->prepareFields();
-        if (!count($ids)) {
+
+        $tmp = $this->isFlatTableExists();
+
+        if (!$this->isFlatTableExists()) {
+            // instead of clean index check if table exists and create it if not
             $this->getSaveHandler()->cleanIndex([]);
         }
         $this->getSaveHandler()->deleteIndex([], new \ArrayObject($ids));
         $this->getSaveHandler()->saveIndex([], $collection);
     }
 
+    private function isFlatTableExists()
+    {
+        /** @var \Magento\Framework\App\ResourceConnection $resource */
+        $resource = ObjectManager::getInstance()->get(\Magento\Framework\App\ResourceConnection::class);
+
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
+        $connection = ObjectManager::getInstance()->get(\Magento\Framework\App\ResourceConnection::class)->getConnection();
+
+        $tableName = $resource->getTableName('design_config_grid_flat');
+
+        return $connection->isTableExists($tableName);
+    }
+
     /**
      * Execute full indexation
      *
diff --git a/app/code/Magento/Theme/etc/indexer.xml b/app/code/Magento/Theme/etc/indexer.xml
index 8cc8971024e48..7ed25878e383c 100644
--- a/app/code/Magento/Theme/etc/indexer.xml
+++ b/app/code/Magento/Theme/etc/indexer.xml
@@ -17,7 +17,7 @@
             <field name="store_group_id" xsi:type="filterable" dataType="int"/>
             <field name="store_id" xsi:type="filterable" dataType="int"/>
         </fieldset>
-        <saveHandler class="Magento\Theme\Model\Indexer\Design\IndexerHandler"/>
+        <saveHandler class="Magento\Framework\Indexer\SaveHandler\Grid"/>
         <structure class="Magento\Framework\Indexer\GridStructure"/>
     </indexer>
 </config>
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
index 71d937d016e9c..c5307b8823bce 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
@@ -69,10 +69,16 @@ protected function prepareFilterableFields(array $documents)
      */
     public function deleteIndex($dimensions, \Traversable $ids)
     {
-        foreach ($this->batch->getItems($ids, $this->batchSize) as $batchIds) {
-            $this->connection->delete(
-                $this->getTableName('filterable', $dimensions),
-                ['entity_id IN(?)' => $batchIds]
+        if (!empty(iterator_to_array($ids))) {
+            foreach ($this->batch->getItems($ids, $this->batchSize) as $batchIds) {
+                $this->connection->delete(
+                    $this->getTableName('filterable', $dimensions),
+                    ['entity_id IN(?)' => $batchIds]
+                );
+            }
+        } else {
+            $this->connection->truncateTable(
+                $this->getTableName('filterable', $dimensions)
             );
         }
     }

From fab6a16ab94189d640b6d0009f5cb76b95672852 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Tue, 22 Sep 2020 22:29:25 -0500
Subject: [PATCH 393/671] MC-36785: Unable to set YouTube API key by CLI

---
 .../Config/Source/ConfigStructureSource.php   | 68 +++++++++++++++++++
 .../App/Config/Source/ModularConfigSource.php | 58 +++-------------
 .../Config/Source/ModularConfigSourceTest.php | 24 +++----
 app/code/Magento/Config/etc/di.xml            |  4 ++
 4 files changed, 88 insertions(+), 66 deletions(-)
 create mode 100644 app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php

diff --git a/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php b/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
new file mode 100644
index 0000000000000..b2831aee0144c
--- /dev/null
+++ b/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\App\Config\Source;
+
+use Magento\Config\Model\Config\Structure\Reader;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\DataObject;
+
+/**
+ * Class for retrieving configuration structure
+ */
+class ConfigStructureSource implements ConfigSourceInterface
+{
+    /**
+     * @var Reader
+     */
+    private $reader;
+
+    /**
+     * @param Reader $reader
+     */
+    public function __construct(Reader $reader)
+    {
+        $this->reader = $reader;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($path = '')
+    {
+        $configStructure = $this->reader->read(Area::AREA_ADMINHTML);
+        $sections = $configStructure['config']['system']['sections'] ?? [];
+        $defaultConfig = $this->merge([], $sections);
+        $data = new DataObject(['default' => $defaultConfig]);
+
+        return $data->getData($path);
+    }
+
+    /**
+     * Merge existed config with config structure
+     *
+     * @param array $config
+     * @param array $sections
+     * @return array
+     */
+    private function merge(array $config, array $sections): array
+    {
+        foreach ($sections as $section) {
+            if (isset($section['children'])) {
+                $config[$section['id']] = $this->merge(
+                    $config[$section['id']] ?? [],
+                    $section['children']
+                );
+            } elseif ($section['_elementType'] === 'field') {
+                $config += [$section['id'] => null];
+            }
+        }
+
+        return $config;
+    }
+}
diff --git a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
index 17ea535951bd6..01cea0a8ee4e7 100644
--- a/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
+++ b/app/code/Magento/Config/App/Config/Source/ModularConfigSource.php
@@ -5,12 +5,9 @@
  */
 namespace Magento\Config\App\Config\Source;
 
-use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
-use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ConfigSourceInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
-use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
+use Magento\Framework\App\Config\Initial\Reader;
 
 /**
  * Class for retrieving initial configuration from modules
@@ -21,26 +18,16 @@
 class ModularConfigSource implements ConfigSourceInterface
 {
     /**
-     * @var InitialConfigReader
+     * @var Reader
      */
-    private $initialConfigReader;
+    private $reader;
 
     /**
-     * @var ConfigStructureReader
+     * @param Reader $reader
      */
-    private $configStructureReader;
-
-    /**
-     * @param InitialConfigReader $initialConfigReader
-     * @param ConfigStructureReader|null $configStructureReader
-     */
-    public function __construct(
-        InitialConfigReader $initialConfigReader,
-        ?ConfigStructureReader $configStructureReader = null
-    ) {
-        $this->initialConfigReader = $initialConfigReader;
-        $this->configStructureReader = $configStructureReader
-            ?? ObjectManager::getInstance()->get(ConfigStructureReader::class);
+    public function __construct(Reader $reader)
+    {
+        $this->reader = $reader;
     }
 
     /**
@@ -52,39 +39,10 @@ public function __construct(
      */
     public function get($path = '')
     {
-        $initialConfig = $this->initialConfigReader->read();
-        $configStructure = $this->configStructureReader->read(Area::AREA_ADMINHTML);
-        $sections = $configStructure['config']['system']['sections'] ?? [];
-        $defaultConfig = $initialConfig['data']['default'] ?? [];
-        $initialConfig['data']['default'] = $this->merge($defaultConfig, $sections);
-
-        $data = new DataObject($initialConfig);
+        $data = new DataObject($this->reader->read());
         if ($path !== '') {
             $path = '/' . $path;
         }
         return $data->getData('data' . $path) ?: [];
     }
-
-    /**
-     * Merge initial config with config structure
-     *
-     * @param array $config
-     * @param array $sections
-     * @return array
-     */
-    private function merge(array $config, array $sections): array
-    {
-        foreach ($sections as $section) {
-            if (isset($section['children'])) {
-                $config[$section['id']] = $this->merge(
-                    $config[$section['id']] ?? [],
-                    $section['children']
-                );
-            } elseif ($section['_elementType'] === 'field') {
-                $config += [$section['id'] => null];
-            }
-        }
-
-        return $config;
-    }
 }
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
index 6cfce1959d0b1..d9ff44c2e05d0 100644
--- a/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/ModularConfigSourceTest.php
@@ -8,8 +8,7 @@
 namespace Magento\Config\Test\Unit\App\Config\Source;
 
 use Magento\Config\App\Config\Source\ModularConfigSource;
-use Magento\Config\Model\Config\Structure\Reader as ConfigStructureReader;
-use Magento\Framework\App\Config\Initial\Reader as InitialConfigReader;
+use Magento\Framework\App\Config\Initial\Reader;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -19,14 +18,9 @@
 class ModularConfigSourceTest extends TestCase
 {
     /**
-     * @var InitialConfigReader|MockObject
+     * @var Reader|MockObject
      */
-    private $initialConfigReader;
-
-    /**
-     * @var ConfigStructureReader|MockObject
-     */
-    private $configStructureReader;
+    private $reader;
 
     /**
      * @var ModularConfigSource
@@ -35,17 +29,15 @@ class ModularConfigSourceTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->initialConfigReader = $this->createMock(InitialConfigReader::class);
-        $this->configStructureReader = $this->createMock(ConfigStructureReader::class);
-        $this->source = new ModularConfigSource(
-            $this->initialConfigReader,
-            $this->configStructureReader
-        );
+        $this->reader = $this->getMockBuilder(Reader::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->source = new ModularConfigSource($this->reader);
     }
 
     public function testGet()
     {
-        $this->initialConfigReader->expects($this->once())
+        $this->reader->expects($this->once())
             ->method('read')
             ->willReturn(['data' => ['path' => 'value']]);
         $this->assertEquals('value', $this->source->get('path'));
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index 85304e9c20f27..1fa1b2d1cfd5b 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -207,6 +207,10 @@
     <virtualType name="appDumpSystemSource" type="Magento\Config\App\Config\Source\DumpConfigSourceAggregated">
         <arguments>
             <argument name="sources" xsi:type="array">
+                <item name="structure" xsi:type="array">
+                    <item name="source" xsi:type="object">Magento\Config\App\Config\Source\ConfigStructureSource</item>
+                    <item name="sortOrder" xsi:type="string">1</item>
+                </item>
                 <item name="modular" xsi:type="array">
                     <item name="source" xsi:type="object">Magento\Config\App\Config\Source\ModularConfigSource</item>
                     <item name="sortOrder" xsi:type="string">10</item>

From a2b93809864fa6dd645d44a5c818266459f53b95 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Fri, 11 Sep 2020 16:02:15 +0300
Subject: [PATCH 394/671] Use one format in all places for array_merge

Fix potential issues when no items in array
Convert all array_merge into single format
---
 .../Catalog/Block/Product/ListProduct.php        |  2 +-
 .../Block/Product/ProductList/Related.php        |  4 ++--
 .../Catalog/Block/Product/ProductList/Upsell.php | 10 +++++-----
 .../Indexer/Product/Category/Action/Rows.php     |  4 ++--
 .../Indexer/Product/Flat/FlatTableBuilder.php    |  4 ++--
 app/code/Magento/Catalog/Model/Product.php       |  5 +----
 .../Model/Product/Price/TierPriceStorage.php     |  2 +-
 .../Model/ProductLink/ProductLinkQuery.php       |  2 +-
 .../LinkedProductSelectBuilderComposite.php      |  2 +-
 .../LayeredNavigation/Builder/Attribute.php      |  6 +++++-
 .../Product/LayeredNavigation/LayerBuilder.php   |  2 +-
 .../CatalogGraphQl/Model/AttributesJoiner.php    |  2 +-
 .../FilterProcessor/CategoryFilter.php           |  2 +-
 .../CatalogInventory/Model/StockIndex.php        |  8 ++++----
 .../Model/Layer/Filter/Attribute.php             |  2 +-
 .../Model/Category/Plugin/Store/Group.php        |  8 ++++----
 .../Observer/AfterImportDataObserver.php         |  3 +--
 .../CatalogWidget/Block/Product/ProductsList.php |  4 ++--
 .../Model/AgreementsValidator.php                |  4 ++--
 .../templates/browser/content/uploader.phtml     |  4 ++--
 app/code/Magento/Csp/Helper/InlineUtil.php       |  4 ++--
 .../Model/System/Currencysymbol.php              |  4 ++--
 .../Model/Address/CompositeValidator.php         |  4 ++--
 .../Magento/Customer/Model/Metadata/Form.php     |  4 ++--
 .../Attribute/Source/CountryWithWebsites.php     |  4 ++--
 .../Model/Import/Address.php                     |  4 ++--
 .../Model/Import/Customer.php                    |  8 ++++----
 app/code/Magento/Deploy/Package/Package.php      |  8 ++++----
 .../Command/XmlCatalogGenerateCommand.php        |  4 ++--
 app/code/Magento/Dhl/Model/Carrier.php           |  7 +++----
 .../Magento/Directory/Model/AllowedCountries.php |  4 ++--
 .../Magento/Directory/Model/CurrencyConfig.php   |  4 ++--
 .../Adminhtml/Attribute/Edit/Options/Options.php |  4 ++--
 app/code/Magento/Eav/Model/Form.php              |  4 ++--
 .../Magento/Eav/Model/ResourceModel/Helper.php   |  2 +-
 .../Product/CompositeFieldProvider.php           |  4 ++--
 .../Block/Cart/Item/Renderer/Grouped.php         |  2 +-
 .../Block/Stockqty/Type/Grouped.php              |  4 ++--
 .../ProcessingErrorAggregator.php                |  6 +++---
 .../Console/Command/IndexerReindexCommand.php    | 16 ++++++++--------
 .../Activate/Permissions/Tab/Webapi.php          |  4 ++--
 .../PageCache/Model/Layout/LayoutPlugin.php      |  4 ++--
 .../Gateway/Validator/ValidatorComposite.php     |  8 ++++----
 .../Config/Structure/PaymentSectionModifier.php  |  4 ++--
 .../Structure/PaymentSectionModifierTest.php     |  4 ++--
 .../Model/Cart/BuyRequest/BuyRequestBuilder.php  |  2 +-
 .../Model/Cart/BuyRequest/BuyRequestBuilder.php  |  4 ++--
 .../Resolver/Batch/AbstractLikedProducts.php     |  5 ++---
 .../Magento/Reports/Block/Product/Viewed.php     |  4 ++--
 .../Adminhtml/Items/Column/DefaultColumn.php     |  4 ++--
 .../Block/Order/Email/Items/DefaultItems.php     |  4 ++--
 .../Order/Email/Items/Order/DefaultOrder.php     |  4 ++--
 .../Order/Item/Renderer/DefaultRenderer.php      |  4 ++--
 .../Model/Order/Pdf/Items/AbstractItems.php      |  4 ++--
 .../Provider/NotSyncedDataProvider.php           |  4 ++--
 app/code/Magento/Search/Model/Autocomplete.php   |  4 ++--
 .../Search/Model/SynonymGroupRepository.php      |  4 ++--
 .../Calculation/Rate/Collection.php              |  4 ++--
 .../Theme/Model/PageLayout/Config/Builder.php    |  2 +-
 app/code/Magento/Ups/Model/Carrier.php           |  3 ++-
 .../Webapi/Model/Rest/Swagger/Generator.php      |  2 +-
 app/code/Magento/Weee/Model/Total/Quote/Weee.php |  4 ++--
 .../Model/Import/ProductTest.php                 |  4 ++--
 .../Magento/Framework/App/Utility/Files.php      |  4 ++--
 .../Model/EntitySnapshot/AttributeProvider.php   |  2 +-
 .../Framework/Module/ModuleList/Loader.php       |  2 +-
 .../ObjectManager/Factory/AbstractFactory.php    |  2 +-
 .../Magento/Setup/Console/Style/MagentoStyle.php |  4 ++--
 .../Setup/Module/Di/Code/Scanner/PhpScanner.php  |  4 ++--
 69 files changed, 144 insertions(+), 145 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ListProduct.php b/app/code/Magento/Catalog/Block/Product/ListProduct.php
index 6cec9bf3ef88a..b181a5392905b 100644
--- a/app/code/Magento/Catalog/Block/Product/ListProduct.php
+++ b/app/code/Magento/Catalog/Block/Product/ListProduct.php
@@ -367,7 +367,7 @@ public function getIdentities()
                 $identities[] = $item->getIdentities();
             }
         }
-        $identities = array_merge(...$identities);
+        $identities = array_merge([], ...$identities);
 
         return $identities;
     }
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
index 387fac770c5bc..42f610f89768d 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Related.php
@@ -143,11 +143,11 @@ public function getItems()
      */
     public function getIdentities()
     {
-        $identities = [[]];
+        $identities = [];
         foreach ($this->getItems() as $item) {
             $identities[] = $item->getIdentities();
         }
-        return array_merge(...$identities);
+        return array_merge([], ...$identities);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
index ac66392efe5dc..adcb1b5666560 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Upsell.php
@@ -267,10 +267,10 @@ public function getItemLimit($type = '')
      */
     public function getIdentities()
     {
-        $identities = array_map(function (DataObject $item) {
-            return $item->getIdentities();
-        }, $this->getItems()) ?: [[]];
-
-        return array_merge(...$identities);
+        $identities = [];
+        foreach ($this->getItems() as $item) {
+            $identities[] = $item->getIdentities();
+        }
+        return array_merge([], ...$identities);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
index edd68422ec4ac..861f7c9c1c50e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Category/Action/Rows.php
@@ -270,14 +270,14 @@ private function getCategoryIdsFromIndex(array $productIds): array
             );
             $categoryIds[] = $storeCategories;
         }
-        $categoryIds = array_merge(...$categoryIds);
+        $categoryIds = array_merge([], ...$categoryIds);
 
         $parentCategories = [$categoryIds];
         foreach ($categoryIds as $categoryId) {
             $parentIds = explode('/', $this->getPathFromCategoryId($categoryId));
             $parentCategories[] = $parentIds;
         }
-        $categoryIds = array_unique(array_merge(...$parentCategories));
+        $categoryIds = array_unique(array_merge([], ...$parentCategories));
 
         return $categoryIds;
     }
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index 99d75186eca8c..a0af09edf14c5 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -261,7 +261,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
 
         $select->from(
             ['et' => $entityTemporaryTableName],
-            array_merge(...$allColumns)
+            array_merge([], ...$allColumns)
         )->joinInner(
             ['e' => $this->resource->getTableName('catalog_product_entity')],
             'e.entity_id = et.entity_id',
@@ -306,7 +306,7 @@ protected function _fillTemporaryFlatTable(array $tables, $storeId, $valueFieldS
                 $allColumns[] = $columnValueNames;
             }
         }
-        $sql = $select->insertFromSelect($temporaryFlatTableName, array_merge(...$allColumns), false);
+        $sql = $select->insertFromSelect($temporaryFlatTableName, array_merge([], ...$allColumns), false);
         $this->_connection->query($sql);
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 7c463267e5a58..5e6f3ca5fe970 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -835,10 +835,7 @@ public function getStoreIds()
                     $storeIds[] = $websiteStores;
                 }
             }
-            if ($storeIds) {
-                $storeIds = array_merge(...$storeIds);
-            }
-            $this->setStoreIds($storeIds);
+            $this->setStoreIds(array_merge([], ...$storeIds));
         }
         return $this->getData('store_ids');
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
index 36ef1826462b0..7e410f0e5feb3 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
@@ -220,7 +220,7 @@ private function retrieveAffectedIds(array $skus): array
             $affectedIds[] = array_keys($productId);
         }
 
-        return $affectedIds ? array_unique(array_merge(...$affectedIds)) : [];
+        return array_unique(array_merge([], ...$affectedIds));
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php b/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php
index 4bc400605a429..1d5ef722db8b1 100644
--- a/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php
+++ b/app/code/Magento/Catalog/Model/ProductLink/ProductLinkQuery.php
@@ -103,7 +103,7 @@ private function extractRequestedLinkTypes(array $criteria): array
             if (count($linkTypesToLoad) === 1) {
                 $linkTypesToLoad = $linkTypesToLoad[0];
             } else {
-                $linkTypesToLoad = array_merge(...$linkTypesToLoad);
+                $linkTypesToLoad = array_merge([], ...$linkTypesToLoad);
             }
             $linkTypesToLoad = array_flip($linkTypesToLoad);
             $linkTypes = array_filter(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
index 17ca389777c5b..c7c08bc805a1d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderComposite.php
@@ -33,7 +33,7 @@ public function build(int $productId, int $storeId) : array
         foreach ($this->linkedProductSelectBuilder as $productSelectBuilder) {
             $selects[] = $productSelectBuilder->build($productId, $storeId);
         }
-        $selects = array_merge(...$selects);
+        $selects = array_merge([], ...$selects);
 
         return $selects;
     }
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php
index 105e91320de49..5fce0fcdf3ca2 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php
@@ -155,6 +155,10 @@ function (AggregationValueInterface $value) {
             return [];
         }
 
-        return $this->attributeOptionProvider->getOptions(\array_merge(...$attributeOptionIds), $storeId, $attributes);
+        return $this->attributeOptionProvider->getOptions(
+            \array_merge([], ...$attributeOptionIds),
+            $storeId,
+            $attributes
+        );
     }
 }
diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/LayerBuilder.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/LayerBuilder.php
index ff661236be62f..ac3f396b45ef8 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/LayerBuilder.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/LayerBuilder.php
@@ -36,7 +36,7 @@ public function build(AggregationInterface $aggregation, ?int $storeId): array
         foreach ($this->builders as $builder) {
             $layers[] = $builder->build($aggregation, $storeId);
         }
-        $layers = \array_merge(...$layers);
+        $layers = \array_merge([], ...$layers);
 
         return \array_filter($layers);
     }
diff --git a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
index 0bfd9d58ec969..34f5dd831686c 100644
--- a/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
+++ b/app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php
@@ -88,7 +88,7 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
                 }
             }
             if ($fragmentFields) {
-                $selectedFields = array_merge($selectedFields, array_merge(...$fragmentFields));
+                $selectedFields = array_merge([], $selectedFields, ...$fragmentFields);
             }
             $this->setSelectionsForFieldNode($fieldNode, array_unique($selectedFields));
         }
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
index f709f8cd6eb72..8d584d15fff0e 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
@@ -64,7 +64,7 @@ public function apply(Filter $filter, AbstractDb $collection)
             $collection->addCategoryFilter($category);
         }
 
-        $categoryProductIds = array_unique(array_merge(...$categoryProducts));
+        $categoryProductIds = array_unique(array_merge([], ...$categoryProducts));
         $collection->addIdFilter($categoryProductIds);
         return true;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockIndex.php b/app/code/Magento/CatalogInventory/Model/StockIndex.php
index ad0cff43c6ac9..6b659073485ad 100644
--- a/app/code/Magento/CatalogInventory/Model/StockIndex.php
+++ b/app/code/Magento/CatalogInventory/Model/StockIndex.php
@@ -169,11 +169,11 @@ protected function processChildren(
 
         $requiredChildrenIds = $typeInstance->getChildrenIds($productId, true);
         if ($requiredChildrenIds) {
-            $childrenIds = [[]];
+            $childrenIds = [];
             foreach ($requiredChildrenIds as $groupedChildrenIds) {
                 $childrenIds[] = $groupedChildrenIds;
             }
-            $childrenIds = array_merge(...$childrenIds);
+            $childrenIds = array_merge([], ...$childrenIds);
 
             $childrenWebsites = $this->productWebsite->getWebsites($childrenIds);
             foreach ($websitesWithStores as $websiteId => $storeId) {
@@ -232,13 +232,13 @@ protected function getWebsitesWithDefaultStores($websiteId = null)
      */
     protected function processParents($productId, $websiteId)
     {
-        $parentIds = [[]];
+        $parentIds = [];
         foreach ($this->getProductTypeInstances() as $typeInstance) {
             /* @var ProductType\AbstractType $typeInstance */
             $parentIds[] = $typeInstance->getParentIdsByChild($productId);
         }
 
-        $parentIds = array_merge(...$parentIds);
+        $parentIds = array_merge([], ...$parentIds);
 
         if (empty($parentIds)) {
             return;
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index b1aecc6885bf0..080af5daa0322 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -70,7 +70,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
             $label = $this->getOptionText($value);
             $labels[] = is_array($label) ? $label : [$label];
         }
-        $label = implode(',', array_unique(array_merge(...$labels)));
+        $label = implode(',', array_unique(array_merge([], ...$labels)));
         $this->getLayer()
             ->getState()
             ->addFilter($this->_createItem($label, $attributeValue));
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
index 308b82e38c43a..50875b1a418d0 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
@@ -121,7 +121,7 @@ public function afterSave(
      */
     protected function generateProductUrls($websiteId, $originWebsiteId)
     {
-        $urls = [[]];
+        $urls = [];
         $websiteIds = $websiteId != $originWebsiteId
             ? [$websiteId, $originWebsiteId]
             : [$websiteId];
@@ -136,7 +136,7 @@ protected function generateProductUrls($websiteId, $originWebsiteId)
             $urls[] = $this->productUrlRewriteGenerator->generate($product);
         }
 
-        return array_merge(...$urls);
+        return array_merge([], ...$urls);
     }
 
     /**
@@ -148,7 +148,7 @@ protected function generateProductUrls($websiteId, $originWebsiteId)
      */
     protected function generateCategoryUrls($rootCategoryId, $storeIds)
     {
-        $urls = [[]];
+        $urls = [];
         $categories = $this->categoryFactory->create()->getCategories($rootCategoryId, 1, false, true);
         foreach ($categories as $category) {
             /** @var \Magento\Catalog\Model\Category $category */
@@ -157,6 +157,6 @@ protected function generateCategoryUrls($rootCategoryId, $storeIds)
             $urls[] = $this->categoryUrlRewriteGenerator->generate($category);
         }
 
-        return array_merge(...$urls);
+        return array_merge([], ...$urls);
     }
 }
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index b1dfa79373a05..e8e6f55f80051 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -459,8 +459,7 @@ private function categoriesUrlRewriteGenerate(): array
                 }
             }
         }
-        $result = !empty($urls) ? array_merge(...$urls) : [];
-        return $result;
+        return array_merge([], ...$urls);
     }
 
     /**
diff --git a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
index 9934cc9ad106a..0cd2a3137d39a 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/ProductsList.php
@@ -506,7 +506,7 @@ public function getPagerHtml()
      */
     public function getIdentities()
     {
-        $identities = [[]];
+        $identities = [];
         if ($this->getProductCollection()) {
             foreach ($this->getProductCollection() as $product) {
                 if ($product instanceof IdentityInterface) {
@@ -514,7 +514,7 @@ public function getIdentities()
                 }
             }
         }
-        $identities = array_merge(...$identities);
+        $identities = array_merge([], ...$identities);
 
         return $identities ?: [Product::CACHE_TAG];
     }
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
index 2643e69ba1efd..c78c807f9ea20 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
@@ -35,12 +35,12 @@ public function __construct($list = null)
     public function isValid($agreementIds = [])
     {
         $agreementIds = $agreementIds === null ? [] : $agreementIds;
-        $requiredAgreements = [[]];
+        $requiredAgreements = [];
         foreach ($this->agreementsProviders as $agreementsProvider) {
             $requiredAgreements[] = $agreementsProvider->getRequiredAgreementIds();
         }
 
-        $agreementsDiff = array_diff(array_merge(...$requiredAgreements), $agreementIds);
+        $agreementsDiff = array_diff(array_merge([], ...$requiredAgreements), $agreementIds);
 
         return empty($agreementsDiff);
     }
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index d1c204c01ad1c..154e76bd93e41 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -11,14 +11,14 @@ $filters = $block->getConfig()->getFilters() ?? [];
 $allowedExtensions = [];
 $blockHtmlId = $block->getHtmlId();
 
-$listExtensions = [[]];
+$listExtensions = [];
 foreach ($filters as $media_type) {
     $listExtensions[] = array_map(function ($fileExt) {
         return ltrim($fileExt, '.*');
     }, $media_type['files']);
 }
 
-$allowedExtensions = array_merge(...$listExtensions);
+$allowedExtensions = array_merge([], ...$listExtensions);
 
 $resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
     ? "{action: 'resize', maxWidth: "
diff --git a/app/code/Magento/Csp/Helper/InlineUtil.php b/app/code/Magento/Csp/Helper/InlineUtil.php
index f9dd9aafa459e..648ba51e34f7d 100644
--- a/app/code/Magento/Csp/Helper/InlineUtil.php
+++ b/app/code/Magento/Csp/Helper/InlineUtil.php
@@ -110,14 +110,14 @@ private function extractHost(string $url): ?string
      */
     private function extractRemoteFonts(string $styleContent): array
     {
-        $urlsFound = [[]];
+        $urlsFound = [];
         preg_match_all('/\@font\-face\s*?\{([^\}]*)[^\}]*?\}/im', $styleContent, $fontFaces);
         foreach ($fontFaces[1] as $fontFaceContent) {
             preg_match_all('/url\([\'\"]?(http(s)?\:[^\)]+)[\'\"]?\)/i', $fontFaceContent, $urls);
             $urlsFound[] = $urls[1];
         }
 
-        return array_map([$this, 'extractHost'], array_merge(...$urlsFound));
+        return array_map([$this, 'extractHost'], array_merge([], ...$urlsFound));
     }
 
     /**
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index d48df02d9de27..400aa56bc68e9 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -292,7 +292,7 @@ protected function _unserializeStoreConfig($configPath, $storeId = null)
      */
     protected function getAllowedCurrencies()
     {
-        $allowedCurrencies = [[]];
+        $allowedCurrencies = [];
         $allowedCurrencies[] = explode(
             self::ALLOWED_CURRENCIES_CONFIG_SEPARATOR,
             $this->_scopeConfig->getValue(
@@ -330,6 +330,6 @@ protected function getAllowedCurrencies()
                 }
             }
         }
-        return array_unique(array_merge(...$allowedCurrencies));
+        return array_unique(array_merge([], ...$allowedCurrencies));
     }
 }
diff --git a/app/code/Magento/Customer/Model/Address/CompositeValidator.php b/app/code/Magento/Customer/Model/Address/CompositeValidator.php
index 4c77f10c11de4..62308ba329d03 100644
--- a/app/code/Magento/Customer/Model/Address/CompositeValidator.php
+++ b/app/code/Magento/Customer/Model/Address/CompositeValidator.php
@@ -30,11 +30,11 @@ public function __construct(
      */
     public function validate(AbstractAddress $address)
     {
-        $errors = [[]];
+        $errors = [];
         foreach ($this->validators as $validator) {
             $errors[] = $validator->validate($address);
         }
 
-        return array_merge(...$errors);
+        return array_merge([], ...$errors);
     }
 }
diff --git a/app/code/Magento/Customer/Model/Metadata/Form.php b/app/code/Magento/Customer/Model/Metadata/Form.php
index 85637ebf508b8..81ded6dec071a 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form.php
@@ -363,11 +363,11 @@ public function validateData(array $data)
     {
         $validator = $this->_getValidator($data);
         if (!$validator->isValid(false)) {
-            $messages = [[]];
+            $messages = [];
             foreach ($validator->getMessages() as $errorMessages) {
                 $messages[] = (array)$errorMessages;
             }
-            return array_merge(...$messages);
+            return array_merge([], ...$messages);
         }
         return true;
     }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
index 020067570efb4..1ca1c5622803f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
@@ -84,7 +84,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
             $websiteIds = [];
 
             if (!$this->shareConfig->isGlobalScope()) {
-                $allowedCountries = [[]];
+                $allowedCountries = [];
 
                 foreach ($this->storeManager->getWebsites() as $website) {
                     $countries = $this->allowedCountriesReader
@@ -96,7 +96,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
                     }
                 }
 
-                $allowedCountries = array_unique(array_merge(...$allowedCountries));
+                $allowedCountries = array_unique(array_merge([], ...$allowedCountries));
             } else {
                 $allowedCountries = $this->allowedCountriesReader->getAllowedCountries();
             }
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index f15f920fe95f4..0c3be73ec5047 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -525,12 +525,12 @@ public function validateData()
     protected function _importData()
     {
         //Preparing data for mass validation/import.
-        $rows = [[]];
+        $rows = [];
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $rows[] = $bunch;
         }
 
-        $this->prepareCustomerData(array_merge(...$rows));
+        $this->prepareCustomerData(array_merge([], ...$rows));
         unset($bunch, $rows);
         $this->_dataSourceModel->getIterator()->rewind();
 
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index 5ebf242bd6ac4..2a02205bdc7e5 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -514,8 +514,8 @@ protected function _importData()
     {
         while ($bunch = $this->_dataSourceModel->getNextBunch()) {
             $this->prepareCustomerData($bunch);
-            $entitiesToCreate = [[]];
-            $entitiesToUpdate = [[]];
+            $entitiesToCreate = [];
+            $entitiesToUpdate = [];
             $entitiesToDelete = [];
             $attributesToSave = [];
 
@@ -549,8 +549,8 @@ protected function _importData()
                 }
             }
 
-            $entitiesToCreate = array_merge(...$entitiesToCreate);
-            $entitiesToUpdate = array_merge(...$entitiesToUpdate);
+            $entitiesToCreate = array_merge([], ...$entitiesToCreate);
+            $entitiesToUpdate = array_merge([], ...$entitiesToUpdate);
 
             $this->updateItemsCounterStats($entitiesToCreate, $entitiesToUpdate, $entitiesToDelete);
             /**
diff --git a/app/code/Magento/Deploy/Package/Package.php b/app/code/Magento/Deploy/Package/Package.php
index 2a83d0d4c56ec..3c4af7039b4a8 100644
--- a/app/code/Magento/Deploy/Package/Package.php
+++ b/app/code/Magento/Deploy/Package/Package.php
@@ -443,11 +443,11 @@ public function getResultMap()
      */
     public function getParentMap()
     {
-        $map = [[]];
+        $map = [];
         foreach ($this->getParentPackages() as $parentPackage) {
             $map[] = $parentPackage->getMap();
         }
-        return array_merge(...$map);
+        return array_merge([], ...$map);
     }
 
     /**
@@ -458,7 +458,7 @@ public function getParentMap()
      */
     public function getParentFiles($type = null)
     {
-        $files = [[]];
+        $files = [];
         foreach ($this->getParentPackages() as $parentPackage) {
             if ($type === null) {
                 $files[] = $parentPackage->getFiles();
@@ -466,7 +466,7 @@ public function getParentFiles($type = null)
                 $files[] = $parentPackage->getFilesByType($type);
             }
         }
-        return array_merge(...$files);
+        return array_merge([], ...$files);
     }
 
     /**
diff --git a/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php b/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
index 9e473ccaa2d92..8bd827958df15 100644
--- a/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
+++ b/app/code/Magento/Developer/Console/Command/XmlCatalogGenerateCommand.php
@@ -116,7 +116,7 @@ private function getUrnDictionary(OutputInterface $output)
         $files = $this->filesUtility->getXmlCatalogFiles('*.xml');
         $files = array_merge($files, $this->filesUtility->getXmlCatalogFiles('*.xsd'));
 
-        $urns = [[]];
+        $urns = [];
         foreach ($files as $file) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $fileDir = dirname($file[0]);
@@ -130,7 +130,7 @@ private function getUrnDictionary(OutputInterface $output)
                 $urns[] = $matches[1];
             }
         }
-        $urns = array_unique(array_merge(...$urns));
+        $urns = array_unique(array_merge([], ...$urns));
         $paths = [];
         foreach ($urns as $urn) {
             try {
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 204094571ba3b..c5eb27b21e58b 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -826,10 +826,9 @@ protected function _getAllItems()
                 $fullItems[] = array_fill(0, $qty, $this->_getWeight($itemWeight));
             }
         }
-        if ($fullItems) {
-            $fullItems = array_merge(...$fullItems);
-            sort($fullItems);
-        }
+
+        $fullItems = array_merge([], ...$fullItems);
+        sort($fullItems);
 
         return $fullItems;
     }
diff --git a/app/code/Magento/Directory/Model/AllowedCountries.php b/app/code/Magento/Directory/Model/AllowedCountries.php
index 2ceeb70ba5b01..69326439edc03 100644
--- a/app/code/Magento/Directory/Model/AllowedCountries.php
+++ b/app/code/Magento/Directory/Model/AllowedCountries.php
@@ -62,11 +62,11 @@ public function getAllowedCountries(
         switch ($scope) {
             case ScopeInterface::SCOPE_WEBSITES:
             case ScopeInterface::SCOPE_STORES:
-                $allowedCountries = [[]];
+                $allowedCountries = [];
                 foreach ($scopeCode as $singleFilter) {
                     $allowedCountries[] = $this->getCountriesFromConfig($this->getSingleScope($scope), $singleFilter);
                 }
-                $allowedCountries = array_merge(...$allowedCountries);
+                $allowedCountries = array_merge([], ...$allowedCountries);
                 break;
             default:
                 $allowedCountries = $this->getCountriesFromConfig($scope, $scopeCode);
diff --git a/app/code/Magento/Directory/Model/CurrencyConfig.php b/app/code/Magento/Directory/Model/CurrencyConfig.php
index f7230df6e86ea..b574170ac5d3c 100644
--- a/app/code/Magento/Directory/Model/CurrencyConfig.php
+++ b/app/code/Magento/Directory/Model/CurrencyConfig.php
@@ -73,7 +73,7 @@ public function getConfigCurrencies(string $path)
      */
     private function getConfigForAllStores(string $path)
     {
-        $storesResult = [[]];
+        $storesResult = [];
         foreach ($this->storeManager->getStores() as $store) {
             $storesResult[] = explode(
                 ',',
@@ -81,7 +81,7 @@ private function getConfigForAllStores(string $path)
             );
         }
 
-        return array_merge(...$storesResult);
+        return array_merge([], ...$storesResult);
     }
 
     /**
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
index 69f417e1ea732..f53f1e97a872d 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php
@@ -152,7 +152,7 @@ protected function _prepareOptionValues(
             $inputType = '';
         }
 
-        $values = [[]];
+        $values = [];
         $isSystemAttribute = is_array($optionCollection);
         if ($isSystemAttribute) {
             $values[] = $this->getPreparedValues($optionCollection, $isSystemAttribute, $inputType, $defaultValues);
@@ -168,7 +168,7 @@ protected function _prepareOptionValues(
             }
         }
 
-        return array_merge(...$values);
+        return array_merge([], ...$values);
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index 074c6cf46a2f4..b06c084cf6675 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -487,11 +487,11 @@ public function validateData(array $data)
     {
         $validator = $this->_getValidator($data);
         if (!$validator->isValid($this->getEntity())) {
-            $messages = [[]];
+            $messages = [];
             foreach ($validator->getMessages() as $errorMessages) {
                 $messages[] = (array)$errorMessages;
             }
-            return array_merge(...$messages);
+            return array_merge([], ...$messages);
         }
         return true;
     }
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Helper.php b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
index fc8a47994a6aa..569da0ac2bb4f 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
@@ -117,7 +117,7 @@ public function getLoadAttributesSelectGroups($selects)
 
         if (array_key_exists('all', $mainGroup)) {
             // it is better to call array_merge once after loop instead of calling it on each loop
-            $mainGroup['all'] = array_merge(...$mainGroup['all']);
+            $mainGroup['all'] = array_merge([], ...$mainGroup['all']);
         }
 
         return array_values($mainGroup);
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
index b276b67ff7fba..980842d6233b1 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/CompositeFieldProvider.php
@@ -40,12 +40,12 @@ public function __construct(array $providers)
      */
     public function getFields(array $context = []): array
     {
-        $allAttributes = [[]];
+        $allAttributes = [];
 
         foreach ($this->providers as $provider) {
             $allAttributes[] = $provider->getFields($context);
         }
 
-        return array_merge(...$allAttributes);
+        return array_merge([], ...$allAttributes);
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index 197be38fb7f5f..8dc153f28c162 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -49,6 +49,6 @@ public function getIdentities()
         if ($this->getItem()) {
             $identities[] = $this->getGroupedProduct()->getIdentities();
         }
-        return array_merge(...$identities);
+        return array_merge([], ...$identities);
     }
 }
diff --git a/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php b/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php
index 97dc90ec93493..78ae4047c0aad 100644
--- a/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Stockqty/Type/Grouped.php
@@ -32,10 +32,10 @@ protected function _getChildProducts()
      */
     public function getIdentities()
     {
-        $identities = [[]];
+        $identities = [];
         foreach ($this->getChildProducts() as $item) {
             $identities[] = $item->getIdentities();
         }
-        return array_merge(...$identities);
+        return array_merge([], ...$identities);
     }
 }
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index 5ea6227231543..2f8bfdcf70a5e 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -242,7 +242,7 @@ public function getAllErrors()
         }
 
         $errors = array_values($this->items['rows']);
-        return array_merge(...$errors);
+        return array_merge([], ...$errors);
     }
 
     /**
@@ -253,14 +253,14 @@ public function getAllErrors()
      */
     public function getErrorsByCode(array $codes)
     {
-        $result = [[]];
+        $result = [];
         foreach ($codes as $code) {
             if (isset($this->items['codes'][$code])) {
                 $result[] = $this->items['codes'][$code];
             }
         }
 
-        return array_merge(...$result);
+        return array_merge([], ...$result);
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 775f585519947..872ece7aaabb5 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -124,16 +124,16 @@ protected function getIndexers(InputInterface $input)
             return $indexers;
         }
 
-        $relatedIndexers = [[]];
-        $dependentIndexers = [[]];
+        $relatedIndexers = [];
+        $dependentIndexers = [];
 
         foreach ($indexers as $indexer) {
             $relatedIndexers[] = $this->getRelatedIndexerIds($indexer->getId());
             $dependentIndexers[] = $this->getDependentIndexerIds($indexer->getId());
         }
 
-        $relatedIndexers = $relatedIndexers ? array_unique(array_merge(...$relatedIndexers)) : [];
-        $dependentIndexers = $dependentIndexers ? array_merge(...$dependentIndexers) : [];
+        $relatedIndexers = array_unique(array_merge([], ...$relatedIndexers));
+        $dependentIndexers = array_merge([], ...$dependentIndexers);
 
         $invalidRelatedIndexers = [];
         foreach ($relatedIndexers as $relatedIndexer) {
@@ -164,12 +164,12 @@ protected function getIndexers(InputInterface $input)
      */
     private function getRelatedIndexerIds(string $indexerId): array
     {
-        $relatedIndexerIds = [[]];
+        $relatedIndexerIds = [];
         foreach ($this->getDependencyInfoProvider()->getIndexerIdsToRunBefore($indexerId) as $relatedIndexerId) {
             $relatedIndexerIds[] = [$relatedIndexerId];
             $relatedIndexerIds[] = $this->getRelatedIndexerIds($relatedIndexerId);
         }
-        $relatedIndexerIds = $relatedIndexerIds ? array_unique(array_merge(...$relatedIndexerIds)) : [];
+        $relatedIndexerIds = array_unique(array_merge([], ...$relatedIndexerIds));
 
         return $relatedIndexerIds;
     }
@@ -182,7 +182,7 @@ private function getRelatedIndexerIds(string $indexerId): array
      */
     private function getDependentIndexerIds(string $indexerId): array
     {
-        $dependentIndexerIds = [[]];
+        $dependentIndexerIds = [];
         foreach (array_keys($this->getConfig()->getIndexers()) as $id) {
             $dependencies = $this->getDependencyInfoProvider()->getIndexerIdsToRunBefore($id);
             if (array_search($indexerId, $dependencies) !== false) {
@@ -190,7 +190,7 @@ private function getDependentIndexerIds(string $indexerId): array
                 $dependentIndexerIds[] = $this->getDependentIndexerIds($id);
             }
         }
-        $dependentIndexerIds = $dependentIndexerIds ? array_unique(array_merge(...$dependentIndexerIds)) : [];
+        $dependentIndexerIds = array_unique(array_merge([], ...$dependentIndexerIds));
 
         return $dependentIndexerIds;
     }
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
index 2d323fea34e7d..b6ea810666b9b 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
@@ -222,13 +222,13 @@ public function isTreeEmpty()
      */
     protected function _getAllResourceIds(array $resources)
     {
-        $resourceIds = [[]];
+        $resourceIds = [];
         foreach ($resources as $resource) {
             $resourceIds[] = [$resource['id']];
             if (isset($resource['children'])) {
                 $resourceIds[] = $this->_getAllResourceIds($resource['children']);
             }
         }
-        return array_merge(...$resourceIds);
+        return array_merge([], ...$resourceIds);
     }
 }
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
index 1b64f3b635c03..6aff8aef2c2d9 100644
--- a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -84,7 +84,7 @@ public function afterGenerateElements(Layout $subject)
     public function afterGetOutput(Layout $subject, $result)
     {
         if ($subject->isCacheable() && $this->config->isEnabled()) {
-            $tags = [[]];
+            $tags = [];
             $isVarnish = $this->config->getType() === Config::VARNISH;
 
             foreach ($subject->getAllBlocks() as $block) {
@@ -96,7 +96,7 @@ public function afterGetOutput(Layout $subject, $result)
                     $tags[] = $block->getIdentities();
                 }
             }
-            $tags = array_unique(array_merge(...$tags));
+            $tags = array_unique(array_merge([], ...$tags));
             $tags = $this->pageCacheTagsPreprocessor->process($tags);
             $this->response->setHeader('X-Magento-Tags', implode(',', $tags));
         }
diff --git a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
index 8c8d13300849e..af42554484117 100644
--- a/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
+++ b/app/code/Magento/Payment/Gateway/Validator/ValidatorComposite.php
@@ -59,8 +59,8 @@ public function __construct(
     public function validate(array $validationSubject)
     {
         $isValid = true;
-        $failsDescriptionAggregate = [[]];
-        $errorCodesAggregate = [[]];
+        $failsDescriptionAggregate = [];
+        $errorCodesAggregate = [];
         foreach ($this->validators as $key => $validator) {
             $result = $validator->validate($validationSubject);
             if (!$result->isValid()) {
@@ -76,8 +76,8 @@ public function validate(array $validationSubject)
 
         return $this->createResult(
             $isValid,
-            array_merge(...$failsDescriptionAggregate),
-            array_merge(...$errorCodesAggregate)
+            array_merge([], ...$failsDescriptionAggregate),
+            array_merge([], ...$errorCodesAggregate)
         );
     }
 }
diff --git a/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php b/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
index 61410499e956e..a3cef539dc17b 100644
--- a/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
+++ b/app/code/Magento/Paypal/Model/Config/Structure/PaymentSectionModifier.php
@@ -84,7 +84,7 @@ public function modify(array $initialStructure)
      */
     private function getMoveInstructions($section, $data)
     {
-        $moved = [[]];
+        $moved = [];
 
         if (array_key_exists('children', $data)) {
             foreach ($data['children'] as $childSection => $childData) {
@@ -106,6 +106,6 @@ private function getMoveInstructions($section, $data)
             ];
         }
 
-        return array_merge(...$moved);
+        return array_merge([], ...$moved);
     }
 }
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
index dc54b71324a9b..a6a18418e92ac 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
@@ -162,14 +162,14 @@ public function testMovedToTargetSpecialGroup()
      */
     private function fetchAllAvailableGroups($structure)
     {
-        $availableGroups = [[]];
+        $availableGroups = [];
         foreach ($structure as $group => $data) {
             $availableGroups[] = [$group];
             if (isset($data['children'])) {
                 $availableGroups[] = $this->fetchAllAvailableGroups($data['children']);
             }
         }
-        $availableGroups = array_merge(...$availableGroups);
+        $availableGroups = array_merge([], ...$availableGroups);
         $availableGroups = array_values(array_unique($availableGroups));
         sort($availableGroups);
         return $availableGroups;
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
index 13b19e4f79c9a..7e8b4d916334f 100644
--- a/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
@@ -56,6 +56,6 @@ public function build(CartItem $cartItem): DataObject
             $requestData[] = $provider->execute($cartItem);
         }
 
-        return $this->dataObjectFactory->create(['data' => array_merge(...$requestData)]);
+        return $this->dataObjectFactory->create(['data' => array_merge([], ...$requestData)]);
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php
index c14cc1324732c..c4909eef31287 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php
@@ -45,11 +45,11 @@ public function __construct(
      */
     public function build(array $cartItemData): DataObject
     {
-        $requestData = [[]];
+        $requestData = [];
         foreach ($this->providers as $provider) {
             $requestData[] = $provider->execute($cartItemData);
         }
 
-        return $this->dataObjectFactory->create(['data' => array_merge(...$requestData)]);
+        return $this->dataObjectFactory->create(['data' => array_merge([], ...$requestData)]);
     }
 }
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
index e14d8bde6be74..fac7b23d408e3 100644
--- a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
@@ -89,8 +89,7 @@ private function findRelations(array $products, array $loadAttributes, int $link
         if (!$relations) {
             return [];
         }
-        $relatedIds = array_values($relations);
-        $relatedIds = array_unique(array_merge(...$relatedIds));
+        $relatedIds = array_unique(array_merge([], ...array_values($relations)));
         //Loading products data.
         $this->searchCriteriaBuilder->addFilter('entity_id', $relatedIds, 'in');
         $relatedSearchResult = $this->productDataProvider->getList(
@@ -142,7 +141,7 @@ public function resolve(ContextInterface $context, Field $field, array $requests
             $products[] = $request->getValue()['model'];
             $fields[] = $this->productFieldsSelector->getProductFieldsFromInfo($request->getInfo(), $this->getNode());
         }
-        $fields = array_unique(array_merge(...$fields));
+        $fields = array_unique(array_merge([], ...$fields));
 
         //Finding relations.
         $related = $this->findRelations($products, $fields, $this->getLinkType());
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index ba4d03182213a..09d59e475905b 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -76,10 +76,10 @@ protected function _toHtml()
      */
     public function getIdentities()
     {
-        $identities = [[]];
+        $identities = [];
         foreach ($this->getItemsCollection() as $item) {
             $identities[] = $item->getIdentities();
         }
-        return array_merge(...$identities);
+        return array_merge([], ...$identities);
     }
 }
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index efef617acf900..81f670de91805 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -68,7 +68,7 @@ public function getItem()
      */
     public function getOrderOptions()
     {
-        $result = [[]];
+        $result = [];
         if ($options = $this->getItem()->getProductOptions()) {
             if (isset($options['options'])) {
                 $result[] = $options['options'];
@@ -80,7 +80,7 @@ public function getOrderOptions()
                 $result[] = $options['attributes_info'];
             }
         }
-        return array_merge(...$result);
+        return array_merge([], ...$result);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php b/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
index cbb79f188f231..57fc0441fe830 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/DefaultItems.php
@@ -39,7 +39,7 @@ public function getOrder()
      */
     public function getItemOptions()
     {
-        $result = [[]];
+        $result = [];
         if ($options = $this->getItem()->getOrderItem()->getProductOptions()) {
             if (isset($options['options'])) {
                 $result[] = $options['options'];
@@ -52,7 +52,7 @@ public function getItemOptions()
             }
         }
 
-        return array_merge(...$result);
+        return array_merge([], ...$result);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php b/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
index 0291a1275c350..cb9c7315244ac 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
@@ -34,7 +34,7 @@ public function getOrder()
      */
     public function getItemOptions()
     {
-        $result = [[]];
+        $result = [];
         if ($options = $this->getItem()->getProductOptions()) {
             if (isset($options['options'])) {
                 $result[] = $options['options'];
@@ -47,7 +47,7 @@ public function getItemOptions()
             }
         }
 
-        return array_merge(...$result);
+        return array_merge([], ...$result);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index bca6d49760d9a..010878559c2f0 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -105,7 +105,7 @@ public function getOrderItem()
      */
     public function getItemOptions()
     {
-        $result = [[]];
+        $result = [];
         $options = $this->getOrderItem()->getProductOptions();
         if ($options) {
             if (isset($options['options'])) {
@@ -118,7 +118,7 @@ public function getItemOptions()
                 $result[] = $options['attributes_info'];
             }
         }
-        return array_merge(...$result);
+        return array_merge([], ...$result);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
index 29e011217ef20..a7315aeb9e3be 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -326,7 +326,7 @@ public function getItemPricesForDisplay()
      */
     public function getItemOptions()
     {
-        $result = [[]];
+        $result = [];
         $options = $this->getItem()->getOrderItem()->getProductOptions();
         if ($options) {
             if (isset($options['options'])) {
@@ -339,7 +339,7 @@ public function getItemOptions()
                 $result[] = $options['attributes_info'];
             }
         }
-        return array_merge(...$result);
+        return array_merge([], ...$result);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
index 645e411b80b67..10b3ca1bde996 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
@@ -37,11 +37,11 @@ public function __construct(TMapFactory $tmapFactory, array $providers = [])
      */
     public function getIds($mainTableName, $gridTableName)
     {
-        $result = [[]];
+        $result = [];
         foreach ($this->providers as $provider) {
             $result[] = $provider->getIds($mainTableName, $gridTableName);
         }
 
-        return array_unique(array_merge(...$result));
+        return array_unique(array_merge([], ...$result));
     }
 }
diff --git a/app/code/Magento/Search/Model/Autocomplete.php b/app/code/Magento/Search/Model/Autocomplete.php
index 45957e8795744..57364e4c36bde 100644
--- a/app/code/Magento/Search/Model/Autocomplete.php
+++ b/app/code/Magento/Search/Model/Autocomplete.php
@@ -30,11 +30,11 @@ public function __construct(
      */
     public function getItems()
     {
-        $data = [[]];
+        $data = [];
         foreach ($this->dataProviders as $dataProvider) {
             $data[] = $dataProvider->getItems();
         }
 
-        return array_merge(...$data);
+        return array_merge([], ...$data);
     }
 }
diff --git a/app/code/Magento/Search/Model/SynonymGroupRepository.php b/app/code/Magento/Search/Model/SynonymGroupRepository.php
index dbc2b66b1f047..c670235d67adb 100644
--- a/app/code/Magento/Search/Model/SynonymGroupRepository.php
+++ b/app/code/Magento/Search/Model/SynonymGroupRepository.php
@@ -150,7 +150,7 @@ private function create(SynonymGroupInterface $synonymGroup, $errorOnMergeConfli
      */
     private function merge(SynonymGroupInterface $synonymGroupToMerge, array $matchingGroupIds)
     {
-        $mergedSynonyms = [[]];
+        $mergedSynonyms = [];
         foreach ($matchingGroupIds as $groupId) {
             /** @var SynonymGroup $synonymGroupModel */
             $synonymGroupModel = $this->synonymGroupFactory->create();
@@ -160,7 +160,7 @@ private function merge(SynonymGroupInterface $synonymGroupToMerge, array $matchi
         }
         $mergedSynonyms[] = explode(',', $synonymGroupToMerge->getSynonymGroup());
 
-        return array_unique(array_merge(...$mergedSynonyms));
+        return array_unique(array_merge([], ...$mergedSynonyms));
     }
 
     /**
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
index 7863b70f6626a..d34e863d56c54 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
@@ -206,7 +206,7 @@ public function getOptionRates()
     {
         $size = self::TAX_RULES_CHUNK_SIZE;
         $page = 1;
-        $rates = [[]];
+        $rates = [];
         do {
             $offset = $size * ($page - 1);
             $this->getSelect()->reset();
@@ -222,6 +222,6 @@ public function getOptionRates()
             $page++;
         } while ($this->getSize() > $offset);
 
-        return array_merge(...$rates);
+        return array_merge([], ...$rates);
     }
 }
diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 13b8aa23073ce..fb47d415e88d5 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -68,7 +68,7 @@ protected function getConfigFiles()
             foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
                 $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
             }
-            $this->configFiles = array_merge(...$configFiles);
+            $this->configFiles = array_merge([], ...$configFiles);
         }
 
         return $this->configFiles;
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b6e539bdadcb9..b14550451ad7e 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1362,10 +1362,11 @@ public function getAllowedMethods()
     protected function _formShipmentRequest(DataObject $request)
     {
         $packages = $request->getPackages();
+        $shipmentItems = [];
         foreach ($packages as $package) {
             $shipmentItems[] = $package['items'];
         }
-        $shipmentItems = array_merge(...$shipmentItems);
+        $shipmentItems = array_merge([], ...$shipmentItems);
 
         $xmlRequest = $this->_xmlElFactory->create(
             ['data' => '<?xml version = "1.0" ?><ShipmentConfirmRequest xml:lang="en-US"/>']
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index f38c0f0978536..40fe97c61f051 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -758,7 +758,7 @@ private function handleComplex($name, $type, $prefix, $isArray)
             );
         }
 
-        return empty($queryNames) ? [] : array_merge(...$queryNames);
+        return array_merge([], ...$queryNames);
     }
 
     /**
diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
index 449c6cd688668..e7ae84c15a51f 100644
--- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php
+++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php
@@ -306,12 +306,12 @@ protected function getNextIncrement()
      */
     protected function recalculateParent(AbstractItem $item)
     {
-        $associatedTaxables = [[]];
+        $associatedTaxables = [];
         foreach ($item->getChildren() as $child) {
             $associatedTaxables[] = $child->getAssociatedTaxables();
         }
         $item->setAssociatedTaxables(
-            array_unique(array_merge(...$associatedTaxables))
+            array_unique(array_merge([], ...$associatedTaxables))
         );
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index a9699ea4a8050..bb45f2574893c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -729,7 +729,7 @@ function ($input) {
                     )
                 );
                 // phpcs:ignore Magento2.Performance.ForeachArrayMerge
-                $option = array_merge(...$option);
+                $option = array_merge([], ...$option);
 
                 if (!empty($option['type']) && !empty($option['name'])) {
                     $lastOptionKey = $option['type'] . '|' . $option['name'];
@@ -2252,7 +2252,7 @@ function (ProductInterface $item) {
         $collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(\Magento\Catalog\Model\ResourceModel\Category\Collection::class);
         $collection
-            ->addAttributeToFilter('entity_id', ['in' => \array_unique(\array_merge(...$categoryIds))])
+            ->addAttributeToFilter('entity_id', ['in' => \array_unique(\array_merge([], ...$categoryIds))])
             ->load()
             ->delete();
 
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index 4298577f3147b..96bd6d061a13f 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -371,11 +371,11 @@ public function getMainConfigFiles($asDataSet = true)
             }
             $globPaths = [BP . '/app/etc/config.xml', BP . '/app/etc/*/config.xml'];
             $configXmlPaths = array_merge($globPaths, $configXmlPaths);
-            $files = [[]];
+            $files = [];
             foreach ($configXmlPaths as $xmlPath) {
                 $files[] = glob($xmlPath, GLOB_NOSORT);
             }
-            self::$_cache[$cacheKey] = array_merge(...$files);
+            self::$_cache[$cacheKey] = array_merge([], ...$files);
         }
         if ($asDataSet) {
             return self::composeDataSets(self::$_cache[$cacheKey]);
diff --git a/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php b/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php
index 6b7fcd131ba8b..f702b71378bb9 100644
--- a/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php
+++ b/lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php
@@ -74,7 +74,7 @@ public function getAttributes($entityType)
                 $attributes[] = $provider->getAttributes($entityType);
             }
 
-            $this->registry[$entityType] = \array_merge(...$attributes);
+            $this->registry[$entityType] = \array_merge([], ...$attributes);
         }
 
         return $this->registry[$entityType];
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index 7e484407d7a54..f30d38b6e112e 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -210,6 +210,6 @@ private function expandSequence($list, $name, $accumulated = [])
             $allResults[] = $this->expandSequence($list, $relatedName, $accumulated);
         }
         $allResults[] = $result;
-        return array_unique(array_merge(...$allResults));
+        return array_unique(array_merge([], ...$allResults));
     }
 }
diff --git a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
index b662a2a34c813..b57f4665aff21 100644
--- a/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
+++ b/lib/internal/Magento/Framework/ObjectManager/Factory/AbstractFactory.php
@@ -239,7 +239,7 @@ protected function resolveArgumentsInRuntime($requestedType, array $parameters,
             $resolvedArguments[] = $this->getResolvedArgument((string)$requestedType, $parameter, $arguments);
         }
 
-        return empty($resolvedArguments) ? [] : array_merge(...$resolvedArguments);
+        return array_merge([], ...$resolvedArguments);
     }
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
index 60cfcbb67c217..3fa9e9d50d24a 100644
--- a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
+++ b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
@@ -605,7 +605,7 @@ private function getBlockLines(
         int $prefixLength,
         int $indentLength
     ) {
-        $lines = [[]];
+        $lines = [];
         foreach ($messages as $key => $message) {
             $message = OutputFormatter::escape($message);
             $wordwrap = wordwrap($message, $this->lineLength - $prefixLength - $indentLength, PHP_EOL, true);
@@ -614,7 +614,7 @@ private function getBlockLines(
                 $lines[][] = '';
             }
         }
-        $lines = array_merge(...$lines);
+        $lines = array_merge([], ...$lines);
 
         return $lines;
     }
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
index acb55e29afddd..7355ac30ac59d 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
@@ -175,7 +175,7 @@ protected function _fetchMissingExtensionAttributesClasses($reflectionClass, $fi
      */
     public function collectEntities(array $files)
     {
-        $output = [[]];
+        $output = [];
         foreach ($files as $file) {
             $classes = $this->getDeclaredClasses($file);
             foreach ($classes as $className) {
@@ -184,7 +184,7 @@ public function collectEntities(array $files)
                 $output[] = $this->_fetchMissingExtensionAttributesClasses($reflectionClass, $file);
             }
         }
-        return array_unique(array_merge(...$output));
+        return array_unique(array_merge([], ...$output));
     }
 
     /**

From f6c4cbd23fca8a7cd7b73c4c609f5179d644d527 Mon Sep 17 00:00:00 2001
From: Ihor Sviziev <svizev.igor@gmail.com>
Date: Wed, 23 Sep 2020 09:12:11 +0300
Subject: [PATCH 395/671] Use one format in all places for array_merge

Fix failing static tests
---
 app/code/Magento/Catalog/Model/Product.php    |  4 +--
 .../Model/Product/Price/TierPriceStorage.php  |  3 --
 .../Observer/AfterImportDataObserver.php      |  2 --
 app/code/Magento/Deploy/Package/Package.php   |  2 +-
 .../Eav/Model/ResourceModel/Helper.php        |  1 +
 app/code/Magento/Ups/Model/Carrier.php        | 32 +++++++------------
 .../Webapi/Model/Rest/Swagger/Generator.php   |  2 --
 .../Setup/Console/Style/MagentoStyle.php      |  1 +
 8 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 5e6f3ca5fe970..f5363cc591c96 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -1030,7 +1030,7 @@ public function priceReindexCallback()
      */
     public function eavReindexCallback()
     {
-        if ($this->isObjectNew() || $this->isDataChanged($this)) {
+        if ($this->isObjectNew() || $this->isDataChanged()) {
             $this->_productEavIndexerProcessor->reindexRow($this->getEntityId());
         }
     }
@@ -1176,7 +1176,7 @@ public function getTierPrice($qty = null)
     /**
      * Get formatted by currency product price
      *
-     * @return  array|double
+     * @return array|double
      * @since 102.0.6
      */
     public function getFormattedPrice()
diff --git a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
index 7e410f0e5feb3..7d458401c950e 100644
--- a/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
+++ b/app/code/Magento/Catalog/Model/Product/Price/TierPriceStorage.php
@@ -12,9 +12,6 @@
 use Magento\Catalog\Model\Product\Price\Validation\TierPriceValidator;
 use Magento\Catalog\Model\ProductIdLocatorInterface;
 
-/**
- * Tier price storage.
- */
 class TierPriceStorage implements TierPriceStorageInterface
 {
     /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
index e8e6f55f80051..b467771408ec0 100644
--- a/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
+++ b/app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php
@@ -37,8 +37,6 @@
 use RuntimeException;
 
 /**
- * Class AfterImportDataObserver
- *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
diff --git a/app/code/Magento/Deploy/Package/Package.php b/app/code/Magento/Deploy/Package/Package.php
index 3c4af7039b4a8..5780b46365680 100644
--- a/app/code/Magento/Deploy/Package/Package.php
+++ b/app/code/Magento/Deploy/Package/Package.php
@@ -535,7 +535,7 @@ private function collectParentPaths(
         $area,
         $theme,
         $locale,
-        array & $result = [],
+        array &$result = [],
         ThemeInterface $themeModel = null
     ) {
         if (($package->getArea() != $area) || ($package->getTheme() != $theme) || ($package->getLocale() != $locale)) {
diff --git a/app/code/Magento/Eav/Model/ResourceModel/Helper.php b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
index 569da0ac2bb4f..c81db40c608a8 100644
--- a/app/code/Magento/Eav/Model/ResourceModel/Helper.php
+++ b/app/code/Magento/Eav/Model/ResourceModel/Helper.php
@@ -19,6 +19,7 @@ class Helper extends \Magento\Framework\DB\Helper
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param string $modulePrefix
      * @codeCoverageIgnore
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod
      */
     public function __construct(\Magento\Framework\App\ResourceConnection $resource, $modulePrefix = 'Magento_Eav')
     {
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b14550451ad7e..4d0e3efee35aa 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1135,7 +1135,7 @@ protected function _getXmlTracking($trackings)
 </TrackRequest>
 XMLAuth;
 
-            $trackingResponses[] = $this->asyncHttpClient->request(
+            $trackingResponses[$tracking] = $this->asyncHttpClient->request(
                 new Request(
                     $url,
                     Request::METHOD_POST,
@@ -1144,13 +1144,9 @@ protected function _getXmlTracking($trackings)
                 )
             );
         }
-        foreach ($trackingResponses as $response) {
+        foreach ($trackingResponses as $tracking => $response) {
             $httpResponse = $response->get();
-            if ($httpResponse->getStatusCode() >= 400) {
-                $xmlResponse = '';
-            } else {
-                $xmlResponse = $httpResponse->getBody();
-            }
+            $xmlResponse = $httpResponse->getStatusCode() >= 400 ? '' : $httpResponse->getBody();
 
             $this->_parseXmlTrackingResponse($tracking, $xmlResponse);
         }
@@ -1529,24 +1525,18 @@ protected function _formShipmentRequest(DataObject $request)
             }
 
             if ($deliveryConfirmation && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_PACKAGE) {
-                    $serviceOptionsNode = $packagePart[$packageId]->addChild('PackageServiceOptions');
-                    $serviceOptionsNode->addChild(
-                        'DeliveryConfirmation'
-                    )->addChild(
-                        'DCISType',
-                        $deliveryConfirmation
-                    );
+                $serviceOptionsNode = $packagePart[$packageId]->addChild('PackageServiceOptions');
+                $serviceOptionsNode
+                    ->addChild('DeliveryConfirmation')
+                    ->addChild('DCISType', $deliveryConfirmation);
             }
         }
 
         if (isset($deliveryConfirmation) && $deliveryConfirmationLevel === self::DELIVERY_CONFIRMATION_SHIPMENT) {
             $serviceOptionsNode = $shipmentPart->addChild('ShipmentServiceOptions');
-            $serviceOptionsNode->addChild(
-                'DeliveryConfirmation'
-            )->addChild(
-                'DCISType',
-                $deliveryConfirmation
-            );
+            $serviceOptionsNode
+                ->addChild('DeliveryConfirmation')
+                ->addChild('DCISType', $deliveryConfirmation);
         }
 
         $shipmentPart->addChild('PaymentInformation')
@@ -1628,6 +1618,7 @@ protected function _sendShipmentAcceptRequest(Element $shipmentConfirmResponse)
         try {
             $response = $this->_xmlElFactory->create(['data' => $xmlResponse]);
         } catch (Throwable $e) {
+            $response = $this->_xmlElFactory->create(['data' => '']);
             $debugData['result'] = ['error' => $e->getMessage(), 'code' => $e->getCode()];
         }
 
@@ -1801,6 +1792,7 @@ protected function _doShipmentRequest(DataObject $request)
         $this->setXMLAccessRequest();
         $xmlRequest = $this->_xmlAccessRequest . $rawXmlRequest;
         $xmlResponse = $this->_getCachedQuotes($xmlRequest);
+        $debugData = [];
 
         if ($xmlResponse === null) {
             $debugData['request'] = $this->filterDebugData($this->_xmlAccessRequest) . $rawXmlRequest;
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
index 40fe97c61f051..5ead1beb722dd 100644
--- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
+++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -33,10 +33,8 @@ class Generator extends AbstractSchemaGenerator
      */
     const ERROR_SCHEMA = '#/definitions/error-response';
 
-    /** Unauthorized description */
     const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized';
 
-    /** Array signifier */
     const ARRAY_SIGNIFIER = '[0]';
 
     /**
diff --git a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
index 3fa9e9d50d24a..43f85d092b0a7 100644
--- a/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
+++ b/setup/src/Magento/Setup/Console/Style/MagentoStyle.php
@@ -565,6 +565,7 @@ private function createBlock(
     ) {
         $indentLength = 0;
         $prefixLength = Helper::strlenWithoutDecoration($this->getFormatter(), $prefix);
+        $lineIndentation = '';
         if (null !== $type) {
             $type = sprintf('[%s] ', $type);
             $indentLength = strlen($type);

From 9c7bbc7fbb2922cb0962d8810486801e1851943b Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Wed, 23 Sep 2020 11:04:18 +0300
Subject: [PATCH 396/671] MC-37802: Broken Integration tests in Magento
 2.4.1-beta1

---
 .../out_of_stock_product_with_category.php    |  2 +-
 ...f_stock_product_with_category_rollback.php |  2 +-
 .../Magento/Catalog/_files/products_new.php   | 33 ++++++++++++++-----
 .../Catalog/_files/products_new_rollback.php  | 21 +++++++-----
 ...compared_out_of_stock_product_rollback.php |  2 +-
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category.php
index dfaee4e8efdba..c38b77d886bfc 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category.php
@@ -50,5 +50,5 @@
     ->setCanSaveCustomOptions(true)
     ->setHasOptions(true);
 /** @var ProductRepositoryInterface $productRepositoryFactory */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category_rollback.php
index ee25a9c29ded1..e4669597479b6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/out_of_stock_product_with_category_rollback.php
@@ -20,7 +20,7 @@
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 /** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 try {
     $productRepository->deleteById('out-of-stock-product');
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
index 2cd0dd2c77560..e08ded4da7b5d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new.php
@@ -4,19 +4,36 @@
  * See COPYING.txt for license details.
  */
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setAttributeSetId(4)
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+/** @var Product $product */
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setName('New Product')
     ->setSku('simple')
     ->setPrice(10)
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
     ->setWebsiteIds([1])
     ->setStockData(['qty' => 100, 'is_in_stock' => 1, 'manage_stock' => 1])
     ->setNewsFromDate(date('Y-m-d H:i:s', strtotime('-2 day')))
     ->setNewsToDate(date('Y-m-d H:i:s', strtotime('+2 day')))
     ->setDescription('description')
-    ->setShortDescription('short desc')
-    ->save();
+    ->setShortDescription('short desc');
+
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new_rollback.php
index 08451b6fccaa3..4b39f975373f3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_new_rollback.php
@@ -4,21 +4,26 @@
  * See COPYING.txt for license details.
  */
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
 
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 try {
-    $firstProduct = $productRepository->get('simple', false, null, true);
-    $productRepository->delete($firstProduct);
-} catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    $productRepository->deleteById('simple');
+} catch (NoSuchEntityException $exception) {
     //Product already removed
 }
 
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php
index 677bfb32cd8e9..f3d31bee387f6 100644
--- a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_out_of_stock_product_rollback.php
@@ -7,5 +7,5 @@
 
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/out_of_stock_product_with_category_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');

From 5ce73ab1f2b04da9dacd274f6d71ea6bbcc65c1f Mon Sep 17 00:00:00 2001
From: Bas van Poppel <vanpoppel@redkiwi.nl>
Date: Wed, 23 Sep 2020 14:17:03 +0200
Subject: [PATCH 397/671] Set correct discount package value for tablerate

---
 .../Magento/OfflineShipping/Model/Carrier/Tablerate.php    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index bbc199c91263a..112accbae8070 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -140,10 +140,9 @@ public function collectRates(RateRequest $request)
                     $freePackageValue += $item->getBaseRowTotal();
                 }
             }
-            $oldValue = $request->getPackageValue();
-            $newPackageValue = $oldValue - $freePackageValue;
-            $request->setPackageValue($newPackageValue);
-            $request->setPackageValueWithDiscount($newPackageValue);
+            
+            $request->setPackageValue($request->getPackageValue() - $freePackageValue);
+            $request->setPackageValueWithDiscount($request->getPackageValueWithDiscount() - $freePackageValue);
         }
 
         if (!$request->getConditionName()) {

From 09eb0fc98f063983a2cf958ee00f16ef8ad9422c Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Wed, 23 Sep 2020 09:49:05 -0500
Subject: [PATCH 398/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Theme/Model/Indexer/Design/Config.php     | 20 +---------------
 .../Model/Indexer/Design/IndexerHandler.php   | 23 +++++++++++++++----
 app/code/Magento/Theme/etc/indexer.xml        |  2 +-
 .../Framework/Indexer/SaveHandler/Grid.php    | 14 ++++-------
 4 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Indexer/Design/Config.php b/app/code/Magento/Theme/Model/Indexer/Design/Config.php
index 86a72ebc64391..43b58257b343c 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/Config.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/Config.php
@@ -5,7 +5,6 @@
  */
 namespace Magento\Theme\Model\Indexer\Design;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\ActionInterface;
 use Magento\Framework\Indexer\FieldsetPool;
 use Magento\Framework\Indexer\HandlerPool;
@@ -94,30 +93,13 @@ protected function execute(array $ids = [])
         /** @var \Magento\Theme\Model\ResourceModel\Design\Config\Scope\Collection $collection */
         $collection = $this->collectionFactory->create();
         $this->prepareFields();
-
-        $tmp = $this->isFlatTableExists();
-
-        if (!$this->isFlatTableExists()) {
-            // instead of clean index check if table exists and create it if not
+        if (!count($ids)) {
             $this->getSaveHandler()->cleanIndex([]);
         }
         $this->getSaveHandler()->deleteIndex([], new \ArrayObject($ids));
         $this->getSaveHandler()->saveIndex([], $collection);
     }
 
-    private function isFlatTableExists()
-    {
-        /** @var \Magento\Framework\App\ResourceConnection $resource */
-        $resource = ObjectManager::getInstance()->get(\Magento\Framework\App\ResourceConnection::class);
-
-        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $connection */
-        $connection = ObjectManager::getInstance()->get(\Magento\Framework\App\ResourceConnection::class)->getConnection();
-
-        $tableName = $resource->getTableName('design_config_grid_flat');
-
-        return $connection->isTableExists($tableName);
-    }
-
     /**
      * Execute full indexation
      *
diff --git a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
index f1acf01b4fc81..92296c5dc9902 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
@@ -44,16 +44,29 @@ public function __construct(
     }
 
     /**
-     * Clean index table by truncation
+     * @return bool
+     */
+    private function isFlatTableExists()
+    {
+        $adapter = $this->resource->getConnection('write');
+        $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), []);
+
+        return $adapter->isTableExists($tableName);
+    }
+
+    /**
+     * Clean index table by deleting all records
      *
      * @inheritdoc
      */
     public function cleanIndex($dimensions)
     {
-        $adapter = $this->resource->getConnection('write');
-        $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), $dimensions);
-        if ($adapter->isTableExists($tableName)) {
-            $adapter->truncateTable($tableName);
+        if ($this->isFlatTableExists()) {
+            $adapter = $this->resource->getConnection('write');
+            $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), $dimensions);
+            $adapter->delete($tableName);
+        } else {
+            $this->indexStructure->create($this->getIndexName(), $this->fields, $dimensions);
         }
     }
 }
diff --git a/app/code/Magento/Theme/etc/indexer.xml b/app/code/Magento/Theme/etc/indexer.xml
index 7ed25878e383c..8cc8971024e48 100644
--- a/app/code/Magento/Theme/etc/indexer.xml
+++ b/app/code/Magento/Theme/etc/indexer.xml
@@ -17,7 +17,7 @@
             <field name="store_group_id" xsi:type="filterable" dataType="int"/>
             <field name="store_id" xsi:type="filterable" dataType="int"/>
         </fieldset>
-        <saveHandler class="Magento\Framework\Indexer\SaveHandler\Grid"/>
+        <saveHandler class="Magento\Theme\Model\Indexer\Design\IndexerHandler"/>
         <structure class="Magento\Framework\Indexer\GridStructure"/>
     </indexer>
 </config>
diff --git a/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php b/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
index c5307b8823bce..71d937d016e9c 100644
--- a/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
+++ b/lib/internal/Magento/Framework/Indexer/SaveHandler/Grid.php
@@ -69,16 +69,10 @@ protected function prepareFilterableFields(array $documents)
      */
     public function deleteIndex($dimensions, \Traversable $ids)
     {
-        if (!empty(iterator_to_array($ids))) {
-            foreach ($this->batch->getItems($ids, $this->batchSize) as $batchIds) {
-                $this->connection->delete(
-                    $this->getTableName('filterable', $dimensions),
-                    ['entity_id IN(?)' => $batchIds]
-                );
-            }
-        } else {
-            $this->connection->truncateTable(
-                $this->getTableName('filterable', $dimensions)
+        foreach ($this->batch->getItems($ids, $this->batchSize) as $batchIds) {
+            $this->connection->delete(
+                $this->getTableName('filterable', $dimensions),
+                ['entity_id IN(?)' => $batchIds]
             );
         }
     }

From 7b93b53a703415f706bf16cfeb4a3abf36756698 Mon Sep 17 00:00:00 2001
From: Oleh Usik <o.usik@atwix.com>
Date: Wed, 23 Sep 2020 21:37:13 +0300
Subject: [PATCH 399/671] depricaded action group

---
 .../Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml     | 2 +-
 .../Mftf/Test/AdminChangeSingleCustomerGroupViaGridTest.xml   | 4 ++--
 .../Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml       | 3 ++-
 .../Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml  | 2 +-
 .../Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml
index 73748b9a6bad6..ca6a1498c4215 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/NavigateCustomerActionGroup.xml
@@ -8,7 +8,7 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="NavigateToAllCustomerPage">
+    <actionGroup name="NavigateToAllCustomerPage" deprecated="Use AdminOpenCustomersGridActionGroup instead.">
         <annotations>
             <description>Goes to the Admin Customers grid page.</description>
         </annotations>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeSingleCustomerGroupViaGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeSingleCustomerGroupViaGridTest.xml
index a7383af2d7eea..5833bf07aeae2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeSingleCustomerGroupViaGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeSingleCustomerGroupViaGridTest.xml
@@ -29,12 +29,12 @@
             <!--Delete created data-->
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="createCustomerGroup" stepKey="deleteCustomerGroup"/>
-            <actionGroup ref="NavigateToAllCustomerPage" stepKey="navigateToCustomersPage"/>
+            <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomersPage"/>
             <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearCustomersGridFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 
-        <actionGroup ref="NavigateToAllCustomerPage" stepKey="navigateToCustomersPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomersPage"/>
         <actionGroup ref="AdminFilterCustomerGridByEmail" stepKey="filterCustomer">
             <argument name="email" value="$$createCustomer.email$$"/>
         </actionGroup>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index d12a89f01cb96..cb003ed837294 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -29,7 +29,8 @@
         </after>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
-        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="navigateToCustomers"/>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomers"/>
+        <waitForPageLoad stepKey="waitForLoad1"/>
         <click selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}" stepKey="clickCreateCustomer"/>
         <fillField userInput="{{CustomerEntityOne.firstname}}" selector="{{AdminCustomerAccountInformationSection.firstName}}" stepKey="fillFirstName"/>
         <fillField userInput="{{CustomerEntityOne.lastname}}" selector="{{AdminCustomerAccountInformationSection.lastName}}" stepKey="fillLastName"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml
index 64e9f6d10bdb3..7f1b1dfee7ce0 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSearchSelectAllTest.xml
@@ -29,7 +29,7 @@
             <deleteData createDataKey="secondCustomer" stepKey="deleteSecondCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomerPage"/>
         <!-- search Admin Data Grid By Keyword -->
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="$$secondCustomer.email$$" stepKey="fillKeywordSearchFieldWithSecondCustomerEmail"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
index bfc49fd476dd0..aa7cdbb9207b9 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
@@ -30,7 +30,7 @@
             <deleteData createDataKey="thirdCustomer" stepKey="deleteThirdCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
-        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="openCustomerPage"/>
+        <actionGroup ref="AdminOpenCustomersGridActionGroup" stepKey="openCustomerPage"/>
         <!-- Select all from dropdown -->
         <actionGroup ref="AdminGridSelectAllActionGroup" stepKey="selectAllCustomers"/>
         <!-- Deselect third customer -->

From 4d4ed878c50ce8152966069af898445d60384f20 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Wed, 23 Sep 2020 19:43:48 -0500
Subject: [PATCH 400/671] MC-36785: Unable to set YouTube API key by CLI

---
 app/code/Magento/Analytics/etc/config.xml     |  1 +
 .../Config/Source/ConfigStructureSource.php   | 44 ++++++------
 .../Source/ConfigStructureSourceTest.php      | 72 +++++++++++++++++++
 app/code/Magento/Config/etc/di.xml            | 15 ++++
 .../Magento/ReleaseNotification/etc/di.xml    |  4 +-
 app/etc/di.xml                                |  5 ++
 .../Model/Config/Export/CommentTest.php       | 65 +++++++++++++++++
 7 files changed, 182 insertions(+), 24 deletions(-)
 create mode 100644 app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Config/Model/Config/Export/CommentTest.php

diff --git a/app/code/Magento/Analytics/etc/config.xml b/app/code/Magento/Analytics/etc/config.xml
index b6194ba12993f..1c85fb3cbbd60 100644
--- a/app/code/Magento/Analytics/etc/config.xml
+++ b/app/code/Magento/Analytics/etc/config.xml
@@ -20,6 +20,7 @@
             <general>
                 <collection_time>02,00,00</collection_time>
             </general>
+            <token/>
         </analytics>
     </default>
 </config>
diff --git a/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php b/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
index b2831aee0144c..f176e0d518230 100644
--- a/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
+++ b/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
@@ -7,8 +7,7 @@
 
 namespace Magento\Config\App\Config\Source;
 
-use Magento\Config\Model\Config\Structure\Reader;
-use Magento\Framework\App\Area;
+use Magento\Config\Model\Config\Structure;
 use Magento\Framework\App\Config\ConfigSourceInterface;
 use Magento\Framework\DataObject;
 
@@ -18,16 +17,16 @@
 class ConfigStructureSource implements ConfigSourceInterface
 {
     /**
-     * @var Reader
+     * @var Structure
      */
-    private $reader;
+    private $structure;
 
     /**
-     * @param Reader $reader
+     * @param Structure $structure
      */
-    public function __construct(Reader $reader)
+    public function __construct(Structure $structure)
     {
-        $this->reader = $reader;
+        $this->structure = $structure;
     }
 
     /**
@@ -35,32 +34,33 @@ public function __construct(Reader $reader)
      */
     public function get($path = '')
     {
-        $configStructure = $this->reader->read(Area::AREA_ADMINHTML);
-        $sections = $configStructure['config']['system']['sections'] ?? [];
-        $defaultConfig = $this->merge([], $sections);
+        $fieldPaths = array_keys($this->structure->getFieldPaths());
+        $defaultConfig = [];
+        foreach ($fieldPaths as $fieldPath) {
+            $defaultConfig = $this->addPathToConfig($defaultConfig, $fieldPath);
+        }
         $data = new DataObject(['default' => $defaultConfig]);
 
         return $data->getData($path);
     }
 
     /**
-     * Merge existed config with config structure
+     * Add config path to config structure
      *
      * @param array $config
-     * @param array $sections
+     * @param string $path
      * @return array
      */
-    private function merge(array $config, array $sections): array
+    private function addPathToConfig(array $config, string $path): array
     {
-        foreach ($sections as $section) {
-            if (isset($section['children'])) {
-                $config[$section['id']] = $this->merge(
-                    $config[$section['id']] ?? [],
-                    $section['children']
-                );
-            } elseif ($section['_elementType'] === 'field') {
-                $config += [$section['id'] => null];
-            }
+        if (strpos($path, '/') !== false) {
+            list ($key, $subPath) = explode('/', $path, 2);
+            $config[$key] = $this->addPathToConfig(
+                $config[$key] ?? [],
+                $subPath
+            );
+        } else {
+            $config[$path] = null;
         }
 
         return $config;
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php
new file mode 100644
index 0000000000000..8fc7b04a13c64
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Test\Unit\App\Config\Source;
+
+use Magento\Config\App\Config\Source\ConfigStructureSource;
+use Magento\Config\Model\Config\Structure;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class ConfigStructureSourceTest extends TestCase
+{
+    /**
+     * @var Structure|MockObject
+     */
+    private $structure;
+
+    /**
+     * @var ConfigStructureSource
+     */
+    private $source;
+
+    protected function setUp(): void
+    {
+        $this->structure = $this->createMock(Structure::class);
+        $this->source = new ConfigStructureSource($this->structure);
+    }
+
+    /**
+     * @dataProvider getDataProvider
+     * @param array $fieldPaths
+     * @param array $expectedConfig
+     */
+    public function testGet(array $fieldPaths, array $expectedConfig)
+    {
+        $this->structure->expects($this->once())
+            ->method('getFieldPaths')
+            ->willReturn($fieldPaths);
+        $this->assertEquals($expectedConfig, $this->source->get('default'));
+    }
+
+    /**
+     * @return array
+     */
+    public function getDataProvider(): array
+    {
+        return [
+            [
+                [
+                    'general/single_store_mode/enabled' => [],
+                    'general/locale/timezone' => [],
+                    'general/locale/code' => [],
+                ],
+                [
+                    'general' => [
+                        'single_store_mode' => [
+                            'enabled' => null,
+                        ],
+                        'locale' => [
+                            'timezone' => null,
+                            'code' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index 1fa1b2d1cfd5b..4277ca0a6de26 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -350,4 +350,19 @@
             <argument name="excludeList" xsi:type="object">Magento\Config\Model\Config\Export\ExcludeList</argument>
         </arguments>
     </type>
+    <virtualType name="adminhtmlConfigStructureData" type="\Magento\Config\Model\Config\Structure\Data">
+        <arguments>
+            <argument name="configScope" xsi:type="object">adminhtmlConfigScope</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="adminhtmlConfigStructure" type="Magento\Config\Model\Config\Structure">
+        <arguments>
+            <argument name="structureData" xsi:type="object">adminhtmlConfigStructureData</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Config\App\Config\Source\ConfigStructureSource">
+        <arguments>
+            <argument name="structure" xsi:type="object">adminhtmlConfigStructure</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/ReleaseNotification/etc/di.xml b/app/code/Magento/ReleaseNotification/etc/di.xml
index a4c434ff7f623..118f9346bb643 100644
--- a/app/code/Magento/ReleaseNotification/etc/di.xml
+++ b/app/code/Magento/ReleaseNotification/etc/di.xml
@@ -10,8 +10,8 @@
     <type name="Magento\Config\Model\Config\TypePool">
         <arguments>
             <argument name="sensitive" xsi:type="array">
-                <item name="releaseNotification/content_url" xsi:type="string">1</item>
-                <item name="releaseNotification/use_https" xsi:type="string">1</item>
+                <item name="system/release_notification/content_url" xsi:type="string">1</item>
+                <item name="system/release_notification/use_https" xsi:type="string">1</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index 585c88f68ff6f..7d28ad76acca9 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -320,6 +320,11 @@
             <argument name="defaultScope" xsi:type="string">global</argument>
         </arguments>
     </virtualType>
+    <virtualType name="adminhtmlConfigScope" type="Magento\Framework\Config\Scope">
+        <arguments>
+            <argument name="defaultScope" xsi:type="string">adminhtml</argument>
+        </arguments>
+    </virtualType>
     <type name="Magento\Framework\App\State">
         <arguments>
             <argument name="mode" xsi:type="init_parameter">Magento\Framework\App\State::PARAM_MODE</argument>
diff --git a/dev/tests/integration/testsuite/Magento/Config/Model/Config/Export/CommentTest.php b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Export/CommentTest.php
new file mode 100644
index 0000000000000..55821a6d64941
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Config/Model/Config/Export/CommentTest.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Config\Model\Config\Export;
+
+use Magento\Config\Model\Config\TypePool;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class CommentTest extends TestCase
+{
+    /**
+     * @var Comment
+     */
+    private $comment;
+
+    protected function setUp(): void
+    {
+        $this->comment = Bootstrap::getObjectManager()->create(Comment::class);
+    }
+
+    public function testGet()
+    {
+        $sensitivePaths = $this->getSensitivePaths();
+        $comments = $this->comment->get();
+
+        $missedPaths = [];
+        foreach ($sensitivePaths as $sensitivePath) {
+            if (stripos($comments, $sensitivePath) === false) {
+                $missedPaths[] = $sensitivePath;
+            }
+        }
+
+        $this->assertEmpty(
+            $missedPaths,
+            'Sensitive paths are missed: ' . implode(', ', $missedPaths)
+        );
+    }
+
+    /**
+     * Retrieve sensitive paths from class that is used to check is path sensitive.
+     *
+     * There is no public method to get this data.
+     * It's why they are read using private method.
+     *
+     * @return array
+     */
+    private function getSensitivePaths(): array
+    {
+        $typePool = Bootstrap::getObjectManager()->get(TypePool::class);
+        $sensitivePathsReader = \Closure::bind(
+            function () {
+                return $this->getPathsByType(TypePool::TYPE_SENSITIVE);
+            },
+            $typePool,
+            $typePool
+        );
+
+        return $sensitivePathsReader();
+    }
+}

From 080044a53a313a07d3b2df69a5538e6e890ca04e Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Wed, 23 Sep 2020 21:45:52 -0500
Subject: [PATCH 401/671] MC-36785: Unable to set YouTube API key by CLI

---
 app/code/Magento/Analytics/etc/config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Analytics/etc/config.xml b/app/code/Magento/Analytics/etc/config.xml
index 1c85fb3cbbd60..fb17aad1eed77 100644
--- a/app/code/Magento/Analytics/etc/config.xml
+++ b/app/code/Magento/Analytics/etc/config.xml
@@ -19,8 +19,8 @@
             <integration_name>Magento Analytics user</integration_name>
             <general>
                 <collection_time>02,00,00</collection_time>
+                <token/>
             </general>
-            <token/>
         </analytics>
     </default>
 </config>

From a22010091673e485be42a2bd8097488d241da254 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 24 Sep 2020 09:31:06 +0300
Subject: [PATCH 402/671] MC-35016: Out of stock products doesn't filter
 properly using "price" filter

---
 ...seSelectProcessor.php => BaseStockStatusSelectProcessor.php} | 2 +-
 app/code/Magento/ConfigurableProduct/etc/di.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/{StockStatusBaseSelectProcessor.php => BaseStockStatusSelectProcessor.php} (96%)

diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/BaseStockStatusSelectProcessor.php
similarity index 96%
rename from app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
rename to app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/BaseStockStatusSelectProcessor.php
index b5cbaa57858c9..cbeaf2cea90e0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/StockStatusBaseSelectProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/BaseStockStatusSelectProcessor.php
@@ -18,7 +18,7 @@
  *
  * Adds stock status limitations to a given Select object.
  */
-class StockStatusBaseSelectProcessor implements BaseSelectProcessorInterface
+class BaseStockStatusSelectProcessor implements BaseSelectProcessorInterface
 {
     /**
      * @var ResourceConnection
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index 9f01af66f9713..c7f67a69d669f 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -198,7 +198,7 @@
         <arguments>
             <argument name="tableStrategy" xsi:type="object">Magento\Catalog\Model\ResourceModel\Product\Indexer\TemporaryTableStrategy</argument>
             <argument name="connectionName" xsi:type="string">indexer</argument>
-            <argument name="baseSelectProcessor" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\StockStatusBaseSelectProcessor</argument>
+            <argument name="baseSelectProcessor" xsi:type="object">Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\BaseStockStatusSelectProcessor</argument>
         </arguments>
     </type>
     <type name="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Product">

From bca6bf6db9f3eeca2f10c753c34a23b568307bdf Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Thu, 24 Sep 2020 11:36:14 +0300
Subject: [PATCH 403/671] fix import image from external url

---
 .../Model/Import/Product.php                  | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index e249e5b3722e7..3e72824674773 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1750,11 +1750,7 @@ protected function _saveProducts()
                 $position = 0;
                 foreach ($rowImages as $column => $columnImages) {
                     foreach ($columnImages as $columnImageKey => $columnImage) {
-                        $filePath = filter_var($columnImage, FILTER_VALIDATE_URL)
-                            ? $columnImage
-                            : $importDir . DS . $columnImage;
-
-                        $uploadedFile = $this->getAlreadyExistedImage($rowExistingImages, $filePath);
+                        $uploadedFile = $this->getAlreadyExistedImage($rowExistingImages, $columnImage, $importDir);
                         if (!$uploadedFile && !isset($uploadedImages[$columnImage])) {
                             $uploadedFile = $this->uploadMediaFiles($columnImage);
                             $uploadedFile = $uploadedFile ?: $this->getSystemFile($columnImage);
@@ -1948,30 +1944,30 @@ protected function _saveProducts()
     /**
      * Returns image hash by path
      *
-     * @param string $filePath
+     * @param string $path
      * @return string
      */
-    private function getFileHash(string $filePath): string
+    private function getFileHash(string $path): string
     {
-        try {
-            $fileExists = $this->fileDriver->isExists($filePath);
-        } catch (\Exception $exception) {
-            $fileExists = false;
-        }
-
-        return $fileExists ? hash_file(self::HASH_ALGORITHM, $filePath) : '';
+        return hash_file(self::HASH_ALGORITHM, $path);
     }
 
     /**
      * Returns existed image
      *
      * @param array $imageRow
-     * @param string $filePath
+     * @param string $columnImage
+     * @param string $importDir
      * @return string
      */
-    private function getAlreadyExistedImage(array $imageRow, string $filePath): string
+    private function getAlreadyExistedImage(array $imageRow, string $columnImage, string $importDir): string
     {
-        $hash = $this->getFileHash($filePath);
+        if (filter_var($columnImage, FILTER_VALIDATE_URL)) {
+            $hash = $this->getFileHash($columnImage);
+        } else {
+            $path = $importDir . DS . $columnImage;
+            $hash = $this->isFileExists($path) ? $this->getFileHash($path) : '';
+        }
 
         return array_reduce(
             $imageRow,
@@ -2013,6 +2009,23 @@ private function addImageHashes(array &$images): void
         }
     }
 
+    /**
+     * Is file exists
+     *
+     * @param string $path
+     * @return bool
+     */
+    private function isFileExists(string $path): bool
+    {
+        try {
+            $fileExists = $this->fileDriver->isExists($path);
+        } catch (\Exception $exception) {
+            $fileExists = false;
+        }
+
+        return $fileExists;
+    }
+
     /**
      * Clears entries from Image Set and Row Data marked as no_selection
      *

From 5750f56498b6468040a71baa185f1d6357bc788c Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Thu, 24 Sep 2020 07:58:05 -0500
Subject: [PATCH 404/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Model/Indexer/Design/IndexerHandler.php   | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
index 92296c5dc9902..00f117666f3ff 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
@@ -9,6 +9,7 @@
 namespace Magento\Theme\Model\Indexer\Design;
 
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
 use Magento\Framework\Indexer\SaveHandler\Grid;
@@ -22,6 +23,15 @@ class IndexerHandler extends Grid
      */
     private $flatScopeResolver;
 
+    /**
+     * @param IndexStructureInterface $indexStructure
+     * @param ResourceConnection $resource
+     * @param Batch $batch
+     * @param IndexScopeResolver $indexScopeResolver
+     * @param FlatScopeResolver $flatScopeResolver
+     * @param array $data
+     * @param int $batchSize
+     */
     public function __construct(
         IndexStructureInterface $indexStructure,
         ResourceConnection $resource,
@@ -29,8 +39,8 @@ public function __construct(
         IndexScopeResolver $indexScopeResolver,
         FlatScopeResolver $flatScopeResolver,
         array $data,
-        $batchSize = 100)
-    {
+        $batchSize = 100
+    ) {
         parent::__construct(
             $indexStructure,
             $resource,
@@ -38,35 +48,28 @@ public function __construct(
             $indexScopeResolver,
             $flatScopeResolver,
             $data,
-            $batchSize);
+            $batchSize
+        );
 
         $this->flatScopeResolver = $flatScopeResolver;
     }
 
     /**
-     * @return bool
-     */
-    private function isFlatTableExists()
-    {
-        $adapter = $this->resource->getConnection('write');
-        $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), []);
-
-        return $adapter->isTableExists($tableName);
-    }
-
-    /**
-     * Clean index table by deleting all records
+     * Clean index table by deleting all records unconditionally or create the index table if not exists
      *
-     * @inheritdoc
+     * @param $dimensions
+     * @return IndexerHandler
      */
     public function cleanIndex($dimensions)
     {
-        if ($this->isFlatTableExists()) {
-            $adapter = $this->resource->getConnection('write');
-            $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), $dimensions);
-            $adapter->delete($tableName);
+        $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), $dimensions);
+
+        if ($this->connection->isTableExists($tableName)) {
+            $this->connection->delete($tableName);
         } else {
             $this->indexStructure->create($this->getIndexName(), $this->fields, $dimensions);
         }
+
+        return $this;
     }
 }

From a5a4ad10d326fccaa48fd23927088a170fb89f5b Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Thu, 24 Sep 2020 08:44:50 -0500
Subject: [PATCH 405/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Magento/Theme/Model/Indexer/Design/IndexerHandler.php  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
index 00f117666f3ff..1acc75a6c949c 100644
--- a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
+++ b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
@@ -9,12 +9,13 @@
 namespace Magento\Theme\Model\Indexer\Design;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
 use Magento\Framework\Indexer\SaveHandler\Grid;
+use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Framework\Search\Request\Dimension;
 
 class IndexerHandler extends Grid
 {
@@ -57,8 +58,8 @@ public function __construct(
     /**
      * Clean index table by deleting all records unconditionally or create the index table if not exists
      *
-     * @param $dimensions
-     * @return IndexerHandler
+     * @param Dimension[] $dimensions
+     * @return IndexerInterface
      */
     public function cleanIndex($dimensions)
     {

From 86db3f403bbee0b574feced1649c5b72d80b0846 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Thu, 24 Sep 2020 12:46:59 -0500
Subject: [PATCH 406/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Unit/Model/Indexer/Design/ConfigTest.php  | 244 ++++++++++++++----
 1 file changed, 196 insertions(+), 48 deletions(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
index ff9a4302f49c0..bd93f8f542a0f 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
@@ -10,82 +10,193 @@
  */
 namespace Magento\Theme\Test\Unit\Model\Indexer\Design;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Data\Collection;
 use Magento\Framework\Indexer\FieldsetInterface;
 use Magento\Framework\Indexer\FieldsetPool;
 use Magento\Framework\Indexer\HandlerInterface;
 use Magento\Framework\Indexer\HandlerPool;
 use Magento\Framework\Indexer\IndexStructureInterface;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
 use Magento\Framework\Indexer\SaveHandlerFactory;
+use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Indexer\StructureFactory;
+use Magento\Theme\Model\Data\Design\Config as DesignConfig;
 use Magento\Theme\Model\Indexer\Design\Config;
+use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Theme\Model\Indexer\Design\IndexerHandler;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 
 class ConfigTest extends TestCase
 {
-    /** @var Config */
-    protected $model;
+    /**
+     * @var AdapterInterface|MockObject
+     */
+    private $adapter;
+    /**
+     * @var ResourceConnection|MockObject
+     */
+    private $resourceConnection;
+    /**
+     * @var Batch|MockObject
+     */
+    private $batch;
+    /**
+     * @var IndexStructureInterface|MockObject
+     */
+    private $indexerStructure;
+    /**
+     * @var IndexScopeResolver|MockObject
+     */
+    private $indexScopeResolver;
+    /**
+     * @var FlatScopeResolver|MockObject
+     */
+    private $flatScopeResolver;
+    /**
+     * @var SaveHandlerFactory|MockObject
+     */
+    private $saveHandlerFactory;
+    /**
+     * @var StructureFactory|MockObject
+     */
+    private $structureFactory;
+    /**
+     * @var FieldsetInterface|MockObject
+     */
+    private $indexerFieldset;
+    /**
+     * @var FieldsetPool|MockObject
+     */
+    private $fieldsetPool;
+    /**
+     * @var HandlerInterface|MockObject
+     */
+    private $indexerHandler;
+    /**
+     * @var HandlerPool|MockObject
+     */
+    private $handlerPool;
+    /**
+     * @var Collection|MockObject
+     */
+    private $collection;
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $collectionFactory;
 
     protected function setUp(): void
     {
-        $indexerStructure = $this->getMockBuilder(IndexStructureInterface::class)
+        $this->indexerStructure = $this->getMockBuilder(IndexStructureInterface::class)
             ->getMockForAbstractClass();
-        $structureFactory = $this->getMockBuilder(StructureFactory::class)
+        $this->structureFactory = $this->getMockBuilder(StructureFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $structureFactory->expects($this->any())
-            ->method('create')
-            ->willReturn($indexerStructure);
-
-        $indexer = $this->getMockBuilder(IndexerInterface::class)
+        $this->resourceConnection = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->adapter = $this->getMockBuilder(AdapterInterface::class)
+            ->getMockForAbstractClass();
+        $this->batch = $this->getMockBuilder(Batch::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->indexScopeResolver = $this->getMockBuilder(IndexScopeResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->flatScopeResolver = $this->getMockBuilder(FlatScopeResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->saveHandlerFactory = $this->getMockBuilder(SaveHandlerFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->fieldsetPool = $this->getMockBuilder(FieldsetPool::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collection = $this->getMockBuilder(Collection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->collectionFactory = $this->getMockBuilder(CollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->indexerHandler = $this->getMockBuilder(HandlerInterface::class)
             ->getMockForAbstractClass();
-        $saveHandlerFactory = $this->getMockBuilder(SaveHandlerFactory::class)
+        $this->handlerPool = $this->getMockBuilder(HandlerPool::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $saveHandlerFactory->expects($this->any())
+        $this->indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
+            ->getMockForAbstractClass();
+    }
+
+    /**
+     * Generate flat index table name from design config grid index ID
+     *
+     * @return string
+     */
+    private function getFlatIndexTableName(): string
+    {
+        return DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID . '_flat';
+    }
+
+    /**
+     * Initialize and return Design Config Indexer Model
+     *
+     * @return Config
+     */
+    private function getDesignConfigIndexerModel(): Config
+    {
+        $this->structureFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->indexerStructure);
+        $this->resourceConnection
+            ->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($this->adapter);
+        $this->flatScopeResolver->expects($this->any())
+            ->method('resolve')
+            ->willReturn($this->getFlatIndexTableName());
+
+        $indexer = new IndexerHandler(
+            $this->indexerStructure,
+            $this->resourceConnection,
+            $this->batch,
+            $this->indexScopeResolver,
+            $this->flatScopeResolver,
+            [
+                'fieldsets' => [],
+                'indexer_id' => DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID
+            ]
+        );
+
+        $this->saveHandlerFactory->expects($this->any())
             ->method('create')
             ->willReturn($indexer);
 
-        $indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
-            ->getMockForAbstractClass();
-        $indexerFieldset->expects($this->any())
+        $this->indexerFieldset->expects($this->any())
             ->method('addDynamicData')
             ->willReturnArgument(0);
-        $fieldsetPool = $this->getMockBuilder(FieldsetPool::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $fieldsetPool->expects($this->any())
+
+        $this->fieldsetPool->expects($this->any())
             ->method('get')
-            ->willReturn($indexerFieldset);
+            ->willReturn($this->indexerFieldset);
 
-        $indexerHandler = $this->getMockBuilder(HandlerInterface::class)
-            ->getMockForAbstractClass();
-        $handlerPool = $this->getMockBuilder(HandlerPool::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $handlerPool->expects($this->any())
+        $this->handlerPool->expects($this->any())
             ->method('get')
-            ->willReturn($indexerHandler);
+            ->willReturn($this->indexerHandler);
 
-        $collection = $this->getMockBuilder(Collection::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $collectionFactory =
-            $this->getMockBuilder(\Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory::class)
-                ->disableOriginalConstructor()
-                ->setMethods(['create'])
-                ->getMock();
-        $collectionFactory->expects($this->any())
+        $this->collectionFactory->expects($this->any())
             ->method('create')
-            ->willReturn($collection);
-
-        $this->model = new Config(
-            $structureFactory,
-            $saveHandlerFactory,
-            $fieldsetPool,
-            $handlerPool,
-            $collectionFactory,
+            ->willReturn($this->collection);
+
+        return new Config(
+            $this->structureFactory,
+            $this->saveHandlerFactory,
+            $this->fieldsetPool,
+            $this->handlerPool,
+            $this->collectionFactory,
             [
                 'fieldsets' => ['test_fieldset' => [
                     'fields' => [
@@ -102,7 +213,7 @@ protected function setUp(): void
                             'handler' => null,
                         ],
                     ],
-                    'provider' => $indexerFieldset,
+                    'provider' => $this->indexerFieldset,
                 ]
                 ],
                 'saveHandler' => 'saveHandlerClass',
@@ -111,9 +222,46 @@ protected function setUp(): void
         );
     }
 
-    public function testExecuteFull()
+    public function testFullReindex()
+    {
+        $this->adapter->expects($this->any())
+            ->method('isTableExists')
+            ->willReturn(true);
+        $this->indexerStructure->expects($this->never())->method('create')
+            ->with(DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID);
+        $this->adapter->expects($this->once())->method('delete')
+            ->with($this->getFlatIndexTableName());
+        $this->batch->expects($this->any())
+            ->method('getItems')->willReturn([]);
+
+        $this->getDesignConfigIndexerModel()->executeFull();
+    }
+
+    public function testFullReindexWithFlatTableCreate()
+    {
+        $this->adapter->expects($this->any())->method('isTableExists')
+            ->willReturn(false);
+        $this->indexerStructure->expects($this->once())->method('create')
+            ->with(DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID);
+        $this->adapter->expects($this->never())->method('delete')
+            ->with($this->getFlatIndexTableName());
+        $this->batch->expects($this->any())->method('getItems')
+            ->willReturn([]);
+
+        $this->getDesignConfigIndexerModel()->executeFull();
+    }
+
+    public function testPartialReindex()
     {
-        $result = $this->model->executeFull();
-        $this->assertNull($result);
+        $this->adapter->expects($this->any())->method('isTableExists')
+            ->willReturn(true);
+        $this->indexerStructure->expects($this->never())->method('create')
+            ->with(DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID);
+        $this->adapter->expects($this->once())->method('delete')
+            ->with($this->getFlatIndexTableName(), ['entity_id IN(?)' => [1, 2, 3]]);
+        $this->batch->expects($this->any())->method('getItems')
+            ->willReturn([[1, 2, 3]]);
+
+        $this->getDesignConfigIndexerModel()->executeList([1, 2, 3]);
     }
 }

From 9327c28eb7b54db7b48fa2759484cfd049559e0d Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Thu, 24 Sep 2020 13:42:03 -0500
Subject: [PATCH 407/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
index bd93f8f542a0f..acfbd818c43d1 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
@@ -7,6 +7,8 @@
 
 /**
  * Test design config indexer model
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 namespace Magento\Theme\Test\Unit\Model\Indexer\Design;
 

From 4c1d95dbdff4b9b1de6ec9942157b68e6d57e002 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Thu, 24 Sep 2020 15:26:18 -0500
Subject: [PATCH 408/671] MC-35934: ArrayBackend does not assign default value
 on save

---
 .../Entity/Attribute/Backend/ArrayBackend.php | 13 ++-
 .../Attribute/Backend/ArrayBackendTest.php    | 91 ++++++++++++++++---
 2 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
index 03c91f53287eb..112483094465e 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/ArrayBackend.php
@@ -42,12 +42,15 @@ public function beforeSave($object)
     public function validate($object)
     {
         $attributeCode = $this->getAttribute()->getAttributeCode();
-        $data = $object->getData($attributeCode);
-        if (is_array($data)) {
-            $object->setData($attributeCode, implode(',', array_filter($data)));
-        } elseif (empty($data)) {
-            $object->setData($attributeCode, null);
+        if ($object->hasData($attributeCode)) {
+            $data = $object->getData($attributeCode);
+            if (is_array($data)) {
+                $object->setData($attributeCode, implode(',', array_filter($data)));
+            } elseif (empty($data)) {
+                $object->setData($attributeCode, null);
+            }
         }
+
         return parent::validate($object);
     }
 }
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
index 7d04d003a0e64..c01dd045e0857 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
@@ -17,40 +17,109 @@ class ArrayBackendTest extends TestCase
     /**
      * @var ArrayBackend
      */
-    protected $_model;
+    private $_model;
 
     /**
      * @var Attribute
      */
-    protected $_attribute;
+    private $_attribute;
 
     protected function setUp(): void
     {
         $this->_attribute = $this->createPartialMock(
             Attribute::class,
-            ['getAttributeCode', '__wakeup']
+            ['getAttributeCode', 'getDefaultValue', '__wakeup']
         );
         $this->_model = new ArrayBackend();
         $this->_model->setAttribute($this->_attribute);
     }
 
     /**
-     * @dataProvider attributeValueDataProvider
+     * @dataProvider validateDataProvider
+     * @param array $productData
+     * @param bool $hasData
+     * @param string|int|float|null $expectedValue
      */
-    public function testValidate($data)
+    public function testValidate(array $productData, bool $hasData, $expectedValue)
     {
-        $this->_attribute->expects($this->atLeastOnce())->method('getAttributeCode')->willReturn('code');
-        $product = new DataObject(['code' => $data, 'empty' => null]);
+        $this->_attribute->expects($this->atLeastOnce())
+            ->method('getAttributeCode')
+            ->willReturn('attr');
+
+        $product = new DataObject($productData);
         $this->_model->validate($product);
-        $this->assertEquals('1,2,3', $product->getCode());
-        $this->assertNull($product->getEmpty());
+        $this->assertEquals($hasData, $product->hasData('attr'));
+        $this->assertEquals($expectedValue, $product->getAttr());
+    }
+
+    /**
+     * @return array
+     */
+    public static function validateDataProvider(): array
+    {
+        return [
+            [
+                ['sku' => 'test1', 'attr' => [1, 2, 3]],
+                true,
+                '1,2,3',
+            ],
+            [
+                ['sku' => 'test1', 'attr' => '1,2,3'],
+                true,
+                '1,2,3',
+            ],
+            [
+                ['sku' => 'test1', 'attr' => null],
+                true,
+                null,
+            ],
+            [
+                ['sku' => 'test1'],
+                false,
+                null,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider beforeSaveDataProvider
+     * @param array $productData
+     * @param string $defaultValue
+     * @param string $expectedValue
+     */
+    public function testBeforeSave(
+        array $productData,
+        string $defaultValue,
+        string $expectedValue
+    ) {
+        $this->_attribute->expects($this->atLeastOnce())
+            ->method('getAttributeCode')
+            ->willReturn('attr');
+        $this->_attribute->expects($this->any())
+            ->method('getDefaultValue')
+            ->willReturn($defaultValue);
+
+        $product = new DataObject($productData);
+        $this->_model->beforeSave($product);
+        $this->assertEquals($expectedValue, $product->getAttr());
     }
 
     /**
      * @return array
      */
-    public static function attributeValueDataProvider()
+    public function beforeSaveDataProvider(): array
     {
-        return [[[1, 2, 3]], ['1,2,3']];
+        return [
+            [
+                ['sku' => 'test1', 'attr' => 'Value 2'],
+                'Default value 1',
+                'Value 2',
+            ],
+            [
+                ['sku' => 'test1'],
+                'Default value 1',
+                'Default value 1',
+            ],
+        ];
     }
 }

From 4b999ca7900bdc6afc67d3e245eabb0c0c3cc1f2 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Thu, 24 Sep 2020 16:08:37 -0500
Subject: [PATCH 409/671] MC-37630: Updating Design Configuration runs full
 reindex which generates DDL statement DROP Table

---
 .../Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
index acfbd818c43d1..753a05eda21bb 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
@@ -7,8 +7,6 @@
 
 /**
  * Test design config indexer model
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 namespace Magento\Theme\Test\Unit\Model\Indexer\Design;
 
@@ -32,6 +30,9 @@
 use Magento\Theme\Model\Indexer\Design\IndexerHandler;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ConfigTest extends TestCase
 {
     /**

From 30d124352154ab131ce0dcf2886bbf4e7dd81b99 Mon Sep 17 00:00:00 2001
From: Viktor Tymchynskyi <vtymchynskyi@magento.com>
Date: Thu, 24 Sep 2020 17:57:44 -0500
Subject: [PATCH 410/671] MC-37880: Shipping address information disappears
 from order screen while placing order

---
 .../Magento/Sales/view/adminhtml/web/order/create/scripts.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index a329524c58d41..10f9ee38720ff 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -1202,7 +1202,7 @@ define([
             for (var i = 0; i < this.loadingAreas.length; i++) {
                 var id = this.loadingAreas[i];
                 if ($(this.getAreaId(id))) {
-                    if ('message' != id || response[id]) {
+                    if (id in response) {
                         $(this.getAreaId(id)).update(response[id]);
                     }
                     if ($(this.getAreaId(id)).callback) {

From 3da6f23f4fb20553580431bdcdbb35afb4551d7f Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Fri, 25 Sep 2020 10:24:25 +0300
Subject: [PATCH 411/671] refactor

---
 .../Magento/CatalogImportExport/Model/Import/Product.php    | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index 3e72824674773..0a030e2d65a05 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1972,11 +1972,7 @@ private function getAlreadyExistedImage(array $imageRow, string $columnImage, st
         return array_reduce(
             $imageRow,
             function ($exists, $file) use ($hash) {
-                if ($exists) {
-                    return $exists;
-                }
-
-                if (isset($file['hash']) && $file['hash'] === $hash) {
+                if (!$exists && isset($file['hash']) && $file['hash'] === $hash) {
                     return $file['value'];
                 }
 

From 047629aeb29354c35c7ebe4f12b7eed160e241e0 Mon Sep 17 00:00:00 2001
From: ogorkun <ogorkun@adobe.com>
Date: Fri, 25 Sep 2020 12:05:32 -0500
Subject: [PATCH 412/671] MC-37799: Improve dynamic CSP whitelisting for cached
 blocks

---
 app/code/Magento/Csp/Model/BlockCache.php     |  2 +-
 .../Csp/Model/Collector/CompositeMerger.php   | 57 +++++++++++++++++++
 .../Csp/Model/Collector/DynamicCollector.php  | 25 +++++++-
 app/code/Magento/Csp/etc/di.xml               | 17 ++++--
 4 files changed, 94 insertions(+), 7 deletions(-)
 create mode 100644 app/code/Magento/Csp/Model/Collector/CompositeMerger.php

diff --git a/app/code/Magento/Csp/Model/BlockCache.php b/app/code/Magento/Csp/Model/BlockCache.php
index f0469c3251379..fac0beec51c07 100644
--- a/app/code/Magento/Csp/Model/BlockCache.php
+++ b/app/code/Magento/Csp/Model/BlockCache.php
@@ -111,7 +111,7 @@ public function save($data, $identifier, $tags = [], $lifeTime = null)
                     ];
                 }
             }
-            $data = $this->serializer->serialize(['policies' => $policiesData, 'html' => $data]);
+            $data = $this->serializer->serialize(['policies' => $policiesData, 'html' => (string)$data]);
         }
 
         return $this->cache->save($data, $identifier, $tags, $lifeTime);
diff --git a/app/code/Magento/Csp/Model/Collector/CompositeMerger.php b/app/code/Magento/Csp/Model/Collector/CompositeMerger.php
new file mode 100644
index 0000000000000..16430f1ff8aa9
--- /dev/null
+++ b/app/code/Magento/Csp/Model/Collector/CompositeMerger.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Csp\Model\Collector;
+
+use Magento\Csp\Api\Data\PolicyInterface;
+
+/**
+ * Merges policies using different mergers.
+ */
+class CompositeMerger implements MergerInterface
+{
+    /**
+     * @var MergerInterface[]
+     */
+    private $mergers;
+
+    /**
+     * @param MergerInterface[] $mergers
+     */
+    public function __construct(array $mergers)
+    {
+        $this->mergers = $mergers;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function merge(PolicyInterface $policy1, PolicyInterface $policy2): PolicyInterface
+    {
+        foreach ($this->mergers as $merger) {
+            if ($merger->canMerge($policy1, $policy2)) {
+                return $merger->merge($policy1, $policy2);
+            }
+        }
+
+        throw new \RuntimeException('Cannot merge 2 policies of ' .get_class($policy1));
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function canMerge(PolicyInterface $policy1, PolicyInterface $policy2): bool
+    {
+        foreach ($this->mergers as $merger) {
+            if ($merger->canMerge($policy1, $policy2)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/Csp/Model/Collector/DynamicCollector.php b/app/code/Magento/Csp/Model/Collector/DynamicCollector.php
index 6478e9622f910..743f77c93f3d8 100644
--- a/app/code/Magento/Csp/Model/Collector/DynamicCollector.php
+++ b/app/code/Magento/Csp/Model/Collector/DynamicCollector.php
@@ -20,6 +20,19 @@ class DynamicCollector implements PolicyCollectorInterface
      */
     private $added = [];
 
+    /**
+     * @var MergerInterface
+     */
+    private $merger;
+
+    /**
+     * @param MergerInterface $merger
+     */
+    public function __construct(MergerInterface $merger)
+    {
+        $this->merger = $merger;
+    }
+
     /**
      * Add a policy for current page.
      *
@@ -28,7 +41,15 @@ class DynamicCollector implements PolicyCollectorInterface
      */
     public function add(PolicyInterface $policy): void
     {
-        $this->added[] = $policy;
+        if (array_key_exists($policy->getId(), $this->added)) {
+            if ($this->merger->canMerge($this->added[$policy->getId()], $policy)) {
+                $this->added[$policy->getId()] = $this->merger->merge($this->added[$policy->getId()], $policy);
+            } else {
+                throw new \RuntimeException('Cannot merge a policy of ' .get_class($policy));
+            }
+        } else {
+            $this->added[$policy->getId()] = $policy;
+        }
     }
 
     /**
@@ -36,6 +57,6 @@ public function add(PolicyInterface $policy): void
      */
     public function collect(array $defaultPolicies = []): array
     {
-        return array_merge($defaultPolicies, $this->added);
+        return array_merge($defaultPolicies, array_values($this->added));
     }
 }
diff --git a/app/code/Magento/Csp/etc/di.xml b/app/code/Magento/Csp/etc/di.xml
index 7b1129a0e1a41..238392fe1c8d1 100644
--- a/app/code/Magento/Csp/etc/di.xml
+++ b/app/code/Magento/Csp/etc/di.xml
@@ -15,6 +15,17 @@
         </arguments>
     </type>
     <preference for="Magento\Csp\Api\PolicyCollectorInterface" type="Magento\Csp\Model\CompositePolicyCollector" />
+    <preference for="Magento\Csp\Model\Collector\MergerInterface" type="Magento\Csp\Model\Collector\CompositeMerger" />
+    <type name="Magento\Csp\Model\Collector\CompositeMerger">
+        <arguments>
+            <argument name="mergers" xsi:type="array">
+                <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\FetchPolicyMerger</item>
+                <item name="flag" xsi:type="object">Magento\Csp\Model\Collector\FlagPolicyMerger</item>
+                <item name="plugins" xsi:type="object">Magento\Csp\Model\Collector\PluginTypesPolicyMerger</item>
+                <item name="sandbox" xsi:type="object">Magento\Csp\Model\Collector\SandboxPolicyMerger</item>
+            </argument>
+        </arguments>
+    </type>
     <type name="Magento\Csp\Model\CompositePolicyCollector">
         <arguments>
             <argument name="collectors" xsi:type="array">
@@ -24,10 +35,7 @@
                 <item name="dynamic" xsi:type="object" sortOrder="3">Magento\Csp\Model\Collector\DynamicCollector\Proxy</item>
             </argument>
             <argument name="mergers" xsi:type="array">
-                <item name="fetch" xsi:type="object">Magento\Csp\Model\Collector\FetchPolicyMerger</item>
-                <item name="flag" xsi:type="object">Magento\Csp\Model\Collector\FlagPolicyMerger</item>
-                <item name="plugins" xsi:type="object">Magento\Csp\Model\Collector\PluginTypesPolicyMerger</item>
-                <item name="sandbox" xsi:type="object">Magento\Csp\Model\Collector\SandboxPolicyMerger</item>
+                <item name="composite" xsi:type="object">Magento\Csp\Model\Collector\MergerInterface</item>
             </argument>
         </arguments>
     </type>
@@ -93,6 +101,7 @@
     <type name="Magento\Csp\Model\BlockCache">
         <arguments>
             <argument name="cache" xsi:type="object">configured_block_cache</argument>
+            <argument name="serializer" xsi:type="object">Magento\Framework\Serialize\Serializer\Serialize</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\Element\Context">

From 159232dd22be74bc408af5ff2b99f01dd5955acf Mon Sep 17 00:00:00 2001
From: Viktor Tymchynskyi <vtymchynskyi@magento.com>
Date: Fri, 25 Sep 2020 13:09:56 -0500
Subject: [PATCH 413/671] MC-37880: Shipping address information disappears
 from order screen while placing order

---
 .../Magento/Sales/view/adminhtml/web/order/create/scripts.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index 10f9ee38720ff..ec94025a0cb82 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -1202,7 +1202,7 @@ define([
             for (var i = 0; i < this.loadingAreas.length; i++) {
                 var id = this.loadingAreas[i];
                 if ($(this.getAreaId(id))) {
-                    if (id in response) {
+                    if ((id in response) && id !== 'message' || response[id]) {
                         $(this.getAreaId(id)).update(response[id]);
                     }
                     if ($(this.getAreaId(id)).callback) {

From eac6ba25636b525d909f5af43648fb101fab3d13 Mon Sep 17 00:00:00 2001
From: Stanislav Ilnytskyi <stailx1@gmail.com>
Date: Sat, 26 Sep 2020 09:42:19 +0200
Subject: [PATCH 414/671] remove spaces caused patching problem in Product/View

It was impossible to apply patch to this file because whitespaces
---
 app/code/Magento/Catalog/Helper/Product/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Helper/Product/View.php b/app/code/Magento/Catalog/Helper/Product/View.php
index cf5b15cadc997..95698d382f09e 100644
--- a/app/code/Magento/Catalog/Helper/Product/View.php
+++ b/app/code/Magento/Catalog/Helper/Product/View.php
@@ -193,7 +193,7 @@ public function initProductLayout(ResultPage $resultPage, $product, $params = nu
                 $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku], $handle);
             }
         }
-    
+
         $resultPage->addPageLayoutHandles(['type' => $product->getTypeId()], null, false);
         $resultPage->addPageLayoutHandles(['id' => $product->getId(), 'sku' => $urlSafeSku]);
 

From 6c11aeba2dfb8f96917ee4a834545dbb582dbd03 Mon Sep 17 00:00:00 2001
From: Bas van Poppel <vanpoppel@redkiwi.nl>
Date: Mon, 28 Sep 2020 14:49:22 +0200
Subject: [PATCH 415/671] no message

---
 .../ResourceModel/Advanced/Collection.php     |  56 +++++++---
 .../CatalogSearch/etc/search_request.xml      |   5 +
 .../ProductCollectionPrepareStrategy.php      |  18 +++-
 .../Console/Command/IndexerReindexCommand.php |   5 +-
 .../Model/CatalogSearch/AdvancedTest.php      | 101 ++++++++++++++++++
 .../Command/IndexerReindexCommandTest.php     |  25 +++--
 .../Indexer/_files/wrong_config_data.php      |  16 +++
 .../_files/wrong_config_data_rollback.php     |  17 +++
 8 files changed, 218 insertions(+), 25 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php

diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 47160bff1d571..6005455a6ef83 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -6,27 +6,30 @@
 
 namespace Magento\CatalogSearch\Model\ResourceModel\Advanced;
 
+use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Advanced;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyChecker;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyCheckerInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\Api\FilterBuilder;
-use Magento\Framework\DB\Select;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Api\Search\SearchResultFactory;
+use Magento\Framework\Api\Search\SearchResultInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Search\EngineResolverInterface;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Api\Search\SearchResultInterface;
 
 /**
  * Advanced search collection
@@ -106,6 +109,11 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $defaultFilterStrategyApplyChecker;
 
+    /**
+     * @var Advanced
+     */
+    private $advancedSearchResource;
+
     /**
      * Collection constructor
      *
@@ -141,6 +149,7 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param TotalRecordsResolverFactory|null $totalRecordsResolverFactory
      * @param EngineResolverInterface|null $engineResolver
      * @param DefaultFilterStrategyApplyCheckerInterface|null $defaultFilterStrategyApplyChecker
+     * @param Advanced|null $advancedSearchResource
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -176,7 +185,8 @@ public function __construct(
         SearchResultApplierFactory $searchResultApplierFactory = null,
         TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
         EngineResolverInterface $engineResolver = null,
-        DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null
+        DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null,
+        Advanced $advancedSearchResource = null
     ) {
         $this->searchRequestName = $searchRequestName;
         if ($searchResultFactory === null) {
@@ -193,6 +203,8 @@ public function __construct(
             ->get(EngineResolverInterface::class);
         $this->defaultFilterStrategyApplyChecker = $defaultFilterStrategyApplyChecker ?: ObjectManager::getInstance()
             ->get(DefaultFilterStrategyApplyChecker::class);
+        $this->advancedSearchResource = $advancedSearchResource ?: ObjectManager::getInstance()
+            ->get(Advanced::class);
         parent::__construct(
             $entityFactory,
             $logger,
@@ -258,6 +270,7 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
      */
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
+        $this->setAttributeFilterData(Category::ENTITY, 'category_ids', $category->getId());
         /**
          * This changes need in backward compatible reasons for support dynamic improved algorithm
          * for price aggregation process.
@@ -265,7 +278,6 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
         if ($this->defaultFilterStrategyApplyChecker->isApplicable()) {
             parent::addCategoryFilter($category);
         } else {
-            $this->addFieldToFilter('category_ids', $category->getId());
             $this->_productLimitationPrice();
         }
 
@@ -278,14 +290,13 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      */
     public function setVisibility($visibility)
     {
+        $this->setAttributeFilterData(Product::ENTITY, 'visibility', $visibility);
         /**
          * This changes need in backward compatible reasons for support dynamic improved algorithm
          * for price aggregation process.
          */
         if ($this->defaultFilterStrategyApplyChecker->isApplicable()) {
             parent::setVisibility($visibility);
-        } else {
-            $this->addFieldToFilter('visibility', $visibility);
         }
 
         return $this;
@@ -306,6 +317,25 @@ private function setSearchOrder($field, $direction)
         $this->searchOrders[$field] = $direction;
     }
 
+    /**
+     * Prepare attribute data to filter.
+     *
+     * @param string $entityType
+     * @param string $attributeCode
+     * @param mixed $condition
+     * @return $this
+     */
+    private function setAttributeFilterData(string $entityType, string $attributeCode, $condition): self
+    {
+        /** @var AbstractAttribute $attribute */
+        $attribute = $this->_eavConfig->getAttribute($entityType, $attributeCode);
+        $table = $attribute->getBackend()->getTable();
+        $condition = $this->advancedSearchResource->prepareCondition($attribute, $condition);
+        $this->addFieldsToFilter([$table => [$attributeCode => $condition]]);
+
+        return $this;
+    }
+
     /**
      * @inheritdoc
      */
@@ -377,7 +407,7 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             $query = $this->getSelect();
             $rows = $this->_fetchAll($query);
         } catch (\Exception $e) {
-            $this->printLogQuery(false, true, $query);
+            $this->printLogQuery(false, true, $query ?? null);
             throw $e;
         }
 
diff --git a/app/code/Magento/CatalogSearch/etc/search_request.xml b/app/code/Magento/CatalogSearch/etc/search_request.xml
index 2111c469986ec..ecda6112ba03e 100644
--- a/app/code/Magento/CatalogSearch/etc/search_request.xml
+++ b/app/code/Magento/CatalogSearch/etc/search_request.xml
@@ -66,6 +66,7 @@
                 <queryReference clause="should" ref="sku_query"/>
                 <queryReference clause="should" ref="price_query"/>
                 <queryReference clause="should" ref="category_query"/>
+                <queryReference clause="must" ref="visibility_query"/>
             </query>
             <query name="sku_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="sku_query_filter"/>
@@ -76,11 +77,15 @@
             <query name="category_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="category_filter"/>
             </query>
+            <query name="visibility_query" xsi:type="filteredQuery">
+                <filterReference clause="must" ref="visibility_filter"/>
+            </query>
         </queries>
         <filters>
             <filter xsi:type="wildcardFilter" name="sku_query_filter" field="sku" value="$sku$"/>
             <filter xsi:type="rangeFilter" name="price_query_filter" field="price" from="$price.from$" to="$price.to$"/>
             <filter xsi:type="termFilter" name="category_filter" field="category_ids" value="$category_ids$"/>
+            <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/>
         </filters>
         <from>0</from>
         <size>10000</size>
diff --git a/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
index b3f8a56110f8d..d7054e2bb4b11 100644
--- a/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
+++ b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
@@ -5,9 +5,11 @@
  */
 namespace Magento\Elasticsearch\Model\Advanced;
 
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\Config;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Strategy interface for preparing product collection.
@@ -19,13 +21,22 @@ class ProductCollectionPrepareStrategy implements ProductCollectionPrepareStrate
      */
     private $catalogConfig;
 
+    /**
+     * @var Visibility
+     */
+    private $catalogProductVisibility;
+
     /**
      * @param Config $catalogConfig
+     * @param Visibility|null $catalogProductVisibility
      */
     public function __construct(
-        Config $catalogConfig
+        Config $catalogConfig,
+        Visibility $catalogProductVisibility = null
     ) {
         $this->catalogConfig = $catalogConfig;
+        $this->catalogProductVisibility = $catalogProductVisibility
+            ?? ObjectManager::getInstance()->get(Visibility::class);
     }
 
     /**
@@ -36,6 +47,7 @@ public function prepare(Collection $collection)
         $collection
             ->addAttributeToSelect($this->catalogConfig->getProductAttributes())
             ->addMinimalPrice()
-            ->addTaxPercents();
+            ->addTaxPercents()
+            ->setVisibility($this->catalogProductVisibility->getVisibleInSearchIds());
     }
 }
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 775f585519947..e7517ba0c8818 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -74,7 +74,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $returnValue = Cli::RETURN_FAILURE;
+        $returnValue = Cli::RETURN_SUCCESS;
         foreach ($this->getIndexers($input) as $indexer) {
             try {
                 $this->validateIndexerStatus($indexer);
@@ -97,14 +97,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(
                     __('has been rebuilt successfully in %time', ['time' => gmdate('H:i:s', $resultTime)])
                 );
-                $returnValue = Cli::RETURN_SUCCESS;
             } catch (LocalizedException $e) {
                 $output->writeln(__('exception: %message', ['message' => $e->getMessage()]));
+                $returnValue = Cli::RETURN_FAILURE;
             } catch (\Exception $e) {
                 $output->writeln('process unknown error:');
                 $output->writeln($e->getMessage());
 
                 $output->writeln($e->getTraceAsString(), OutputInterface::VERBOSITY_DEBUG);
+                $returnValue = Cli::RETURN_FAILURE;
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php
new file mode 100644
index 0000000000000..815f480cf7b53
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Elasticsearch\Model\CatalogSearch;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogSearch\Model\Advanced;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Check catalog Advanced Search process with Elasticsearch enabled.
+ */
+class AdvancedTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @var Visibility
+     */
+    private $productVisibility;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->productVisibility = $this->objectManager->get(Visibility::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+    }
+
+    /**
+     * Check that Advanced Search does NOT return products that do NOT have search visibility.
+     *
+     * @magentoDbIsolation disabled
+     * @magentoConfigFixture default/catalog/search/engine elasticsearch7
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php
+     * @return void
+     */
+    public function testAddFilters(): void
+    {
+        $this->assertResultsAfterRequest(1);
+
+        /** @var ProductInterface $configurableProductOption */
+        $configurableProductOption = $this->productRepository->get('Simple option 1');
+        $configurableProductOption->setVisibility(Visibility::VISIBILITY_IN_SEARCH);
+        $this->productRepository->save($configurableProductOption);
+
+        $this->registry->unregister('advanced_search_conditions');
+        $this->assertResultsAfterRequest(2);
+    }
+
+    /**
+     * Do Elasticsearch query and assert results.
+     *
+     * @param int $count
+     * @return void
+     */
+    private function assertResultsAfterRequest(int $count): void
+    {
+        /** @var Advanced $advancedSearch */
+        $advancedSearch = $this->objectManager->create(Advanced::class);
+        $advancedSearch->addFilters(['name' => 'Configurable']);
+
+        /** @var ProductInterface[] $itemsResult */
+        $itemsResult = $advancedSearch->getProductCollection()
+            ->addAttributeToSelect(ProductInterface::VISIBILITY)
+            ->getItems();
+
+        $this->assertCount($count, $itemsResult);
+        foreach ($itemsResult as $product) {
+            $this->assertStringContainsString('Configurable', $product->getName());
+            $this->assertContains((int)$product->getVisibility(), $this->productVisibility->getVisibleInSearchIds());
+        }
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php b/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
index f4730b0b32c18..67de7913b4603 100644
--- a/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
@@ -7,9 +7,11 @@
 
 namespace Magento\Indexer\Console\Command;
 
+use Magento\Framework\Console\Cli;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -19,7 +21,7 @@
  * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
  */
-class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
+class IndexerReindexCommandTest extends TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -56,14 +58,23 @@ protected function setUp(): void
 
     /**
      * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
+     * @return void
      */
-    public function testReindexAll()
+    public function testReindexAll(): void
     {
         $status = $this->command->run($this->inputMock, $this->outputMock);
-        $this->assertEquals(
-            \Magento\Framework\Console\Cli::RETURN_SUCCESS,
-            $status,
-            'Index wasn\'t success'
-        );
+        $this->assertEquals(Cli::RETURN_SUCCESS, $status, 'Index wasn\'t success');
+    }
+
+    /**
+     * Check that 'indexer:reindex' command return right code.
+     *
+     * @magentoDataFixture Magento/Indexer/_files/wrong_config_data.php
+     * @return void
+     */
+    public function testReindexAllWhenSomethingIsWrong(): void
+    {
+        $status = $this->command->run($this->inputMock, $this->outputMock);
+        $this->assertEquals(Cli::RETURN_FAILURE, $status, 'Index didn\'t return failure code');
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php b/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php
new file mode 100644
index 0000000000000..c6ec6235b61e6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Config\Model\Config\Factory;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Factory $configFactory */
+$configFactory = Bootstrap::getObjectManager()->get(Factory::class);
+$config = $configFactory->create();
+$config->setScope('stores');
+$config->setDataByPath('catalog/search/elasticsearch7_server_port', 2309);
+$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php b/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php
new file mode 100644
index 0000000000000..7ca0b986fc206
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\ResourceConnection;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var ResourceConnection $resource */
+$resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+$connection = $resource->getConnection();
+$tableName = $resource->getTableName('core_config_data');
+
+$connection->query("DELETE FROM $tableName WHERE path = 'catalog/search/elasticsearch7_server_port'"
+    ." AND scope = 'stores';");

From 2602b9fdbc848a699ebdbde1d34157d159c8a851 Mon Sep 17 00:00:00 2001
From: Bas van Poppel <vanpoppel@redkiwi.nl>
Date: Mon, 28 Sep 2020 14:50:01 +0200
Subject: [PATCH 416/671] Revert "no message"

This reverts commit 6c11aeba2dfb8f96917ee4a834545dbb582dbd03.
---
 .../ResourceModel/Advanced/Collection.php     |  56 +++-------
 .../CatalogSearch/etc/search_request.xml      |   5 -
 .../ProductCollectionPrepareStrategy.php      |  18 +---
 .../Console/Command/IndexerReindexCommand.php |   5 +-
 .../Model/CatalogSearch/AdvancedTest.php      | 101 ------------------
 .../Command/IndexerReindexCommandTest.php     |  25 ++---
 .../Indexer/_files/wrong_config_data.php      |  16 ---
 .../_files/wrong_config_data_rollback.php     |  17 ---
 8 files changed, 25 insertions(+), 218 deletions(-)
 delete mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php
 delete mode 100644 dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php

diff --git a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
index 6005455a6ef83..47160bff1d571 100644
--- a/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/ResourceModel/Advanced/Collection.php
@@ -6,30 +6,27 @@
 
 namespace Magento\CatalogSearch\Model\ResourceModel\Advanced;
 
-use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
-use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
-use Magento\CatalogSearch\Model\ResourceModel\Advanced;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyChecker;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\DefaultFilterStrategyApplyCheckerInterface;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverInterface;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierInterface;
-use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
+use Magento\Framework\Search\EngineResolverInterface;
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverInterface;
-use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\TotalRecordsResolverFactory;
 use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\DB\Select;
 use Magento\Framework\Api\Search\SearchCriteriaBuilder;
 use Magento\Framework\Api\Search\SearchResultFactory;
-use Magento\Framework\Api\Search\SearchResultInterface;
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Search\EngineResolverInterface;
 use Magento\Framework\Search\Request\EmptyRequestDataException;
 use Magento\Framework\Search\Request\NonExistingRequestNameException;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchCriteriaResolverFactory;
+use Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection\SearchResultApplierFactory;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Api\Search\SearchResultInterface;
 
 /**
  * Advanced search collection
@@ -109,11 +106,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $defaultFilterStrategyApplyChecker;
 
-    /**
-     * @var Advanced
-     */
-    private $advancedSearchResource;
-
     /**
      * Collection constructor
      *
@@ -149,7 +141,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      * @param TotalRecordsResolverFactory|null $totalRecordsResolverFactory
      * @param EngineResolverInterface|null $engineResolver
      * @param DefaultFilterStrategyApplyCheckerInterface|null $defaultFilterStrategyApplyChecker
-     * @param Advanced|null $advancedSearchResource
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -185,8 +176,7 @@ public function __construct(
         SearchResultApplierFactory $searchResultApplierFactory = null,
         TotalRecordsResolverFactory $totalRecordsResolverFactory = null,
         EngineResolverInterface $engineResolver = null,
-        DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null,
-        Advanced $advancedSearchResource = null
+        DefaultFilterStrategyApplyCheckerInterface $defaultFilterStrategyApplyChecker = null
     ) {
         $this->searchRequestName = $searchRequestName;
         if ($searchResultFactory === null) {
@@ -203,8 +193,6 @@ public function __construct(
             ->get(EngineResolverInterface::class);
         $this->defaultFilterStrategyApplyChecker = $defaultFilterStrategyApplyChecker ?: ObjectManager::getInstance()
             ->get(DefaultFilterStrategyApplyChecker::class);
-        $this->advancedSearchResource = $advancedSearchResource ?: ObjectManager::getInstance()
-            ->get(Advanced::class);
         parent::__construct(
             $entityFactory,
             $logger,
@@ -270,7 +258,6 @@ public function setOrder($attribute, $dir = Select::SQL_DESC)
      */
     public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
     {
-        $this->setAttributeFilterData(Category::ENTITY, 'category_ids', $category->getId());
         /**
          * This changes need in backward compatible reasons for support dynamic improved algorithm
          * for price aggregation process.
@@ -278,6 +265,7 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
         if ($this->defaultFilterStrategyApplyChecker->isApplicable()) {
             parent::addCategoryFilter($category);
         } else {
+            $this->addFieldToFilter('category_ids', $category->getId());
             $this->_productLimitationPrice();
         }
 
@@ -290,13 +278,14 @@ public function addCategoryFilter(\Magento\Catalog\Model\Category $category)
      */
     public function setVisibility($visibility)
     {
-        $this->setAttributeFilterData(Product::ENTITY, 'visibility', $visibility);
         /**
          * This changes need in backward compatible reasons for support dynamic improved algorithm
          * for price aggregation process.
          */
         if ($this->defaultFilterStrategyApplyChecker->isApplicable()) {
             parent::setVisibility($visibility);
+        } else {
+            $this->addFieldToFilter('visibility', $visibility);
         }
 
         return $this;
@@ -317,25 +306,6 @@ private function setSearchOrder($field, $direction)
         $this->searchOrders[$field] = $direction;
     }
 
-    /**
-     * Prepare attribute data to filter.
-     *
-     * @param string $entityType
-     * @param string $attributeCode
-     * @param mixed $condition
-     * @return $this
-     */
-    private function setAttributeFilterData(string $entityType, string $attributeCode, $condition): self
-    {
-        /** @var AbstractAttribute $attribute */
-        $attribute = $this->_eavConfig->getAttribute($entityType, $attributeCode);
-        $table = $attribute->getBackend()->getTable();
-        $condition = $this->advancedSearchResource->prepareCondition($attribute, $condition);
-        $this->addFieldsToFilter([$table => [$attributeCode => $condition]]);
-
-        return $this;
-    }
-
     /**
      * @inheritdoc
      */
@@ -407,7 +377,7 @@ public function _loadEntities($printQuery = false, $logQuery = false)
             $query = $this->getSelect();
             $rows = $this->_fetchAll($query);
         } catch (\Exception $e) {
-            $this->printLogQuery(false, true, $query ?? null);
+            $this->printLogQuery(false, true, $query);
             throw $e;
         }
 
diff --git a/app/code/Magento/CatalogSearch/etc/search_request.xml b/app/code/Magento/CatalogSearch/etc/search_request.xml
index ecda6112ba03e..2111c469986ec 100644
--- a/app/code/Magento/CatalogSearch/etc/search_request.xml
+++ b/app/code/Magento/CatalogSearch/etc/search_request.xml
@@ -66,7 +66,6 @@
                 <queryReference clause="should" ref="sku_query"/>
                 <queryReference clause="should" ref="price_query"/>
                 <queryReference clause="should" ref="category_query"/>
-                <queryReference clause="must" ref="visibility_query"/>
             </query>
             <query name="sku_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="sku_query_filter"/>
@@ -77,15 +76,11 @@
             <query name="category_query" xsi:type="filteredQuery">
                 <filterReference clause="must" ref="category_filter"/>
             </query>
-            <query name="visibility_query" xsi:type="filteredQuery">
-                <filterReference clause="must" ref="visibility_filter"/>
-            </query>
         </queries>
         <filters>
             <filter xsi:type="wildcardFilter" name="sku_query_filter" field="sku" value="$sku$"/>
             <filter xsi:type="rangeFilter" name="price_query_filter" field="price" from="$price.from$" to="$price.to$"/>
             <filter xsi:type="termFilter" name="category_filter" field="category_ids" value="$category_ids$"/>
-            <filter xsi:type="termFilter" name="visibility_filter" field="visibility" value="$visibility$"/>
         </filters>
         <from>0</from>
         <size>10000</size>
diff --git a/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
index d7054e2bb4b11..b3f8a56110f8d 100644
--- a/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
+++ b/app/code/Magento/Elasticsearch/Model/Advanced/ProductCollectionPrepareStrategy.php
@@ -5,11 +5,9 @@
  */
 namespace Magento\Elasticsearch\Model\Advanced;
 
-use Magento\Catalog\Model\Config;
-use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\Config;
 use Magento\CatalogSearch\Model\Advanced\ProductCollectionPrepareStrategyInterface;
-use Magento\Framework\App\ObjectManager;
 
 /**
  * Strategy interface for preparing product collection.
@@ -21,22 +19,13 @@ class ProductCollectionPrepareStrategy implements ProductCollectionPrepareStrate
      */
     private $catalogConfig;
 
-    /**
-     * @var Visibility
-     */
-    private $catalogProductVisibility;
-
     /**
      * @param Config $catalogConfig
-     * @param Visibility|null $catalogProductVisibility
      */
     public function __construct(
-        Config $catalogConfig,
-        Visibility $catalogProductVisibility = null
+        Config $catalogConfig
     ) {
         $this->catalogConfig = $catalogConfig;
-        $this->catalogProductVisibility = $catalogProductVisibility
-            ?? ObjectManager::getInstance()->get(Visibility::class);
     }
 
     /**
@@ -47,7 +36,6 @@ public function prepare(Collection $collection)
         $collection
             ->addAttributeToSelect($this->catalogConfig->getProductAttributes())
             ->addMinimalPrice()
-            ->addTaxPercents()
-            ->setVisibility($this->catalogProductVisibility->getVisibleInSearchIds());
+            ->addTaxPercents();
     }
 }
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index e7517ba0c8818..775f585519947 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -74,7 +74,7 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $returnValue = Cli::RETURN_SUCCESS;
+        $returnValue = Cli::RETURN_FAILURE;
         foreach ($this->getIndexers($input) as $indexer) {
             try {
                 $this->validateIndexerStatus($indexer);
@@ -97,15 +97,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $output->writeln(
                     __('has been rebuilt successfully in %time', ['time' => gmdate('H:i:s', $resultTime)])
                 );
+                $returnValue = Cli::RETURN_SUCCESS;
             } catch (LocalizedException $e) {
                 $output->writeln(__('exception: %message', ['message' => $e->getMessage()]));
-                $returnValue = Cli::RETURN_FAILURE;
             } catch (\Exception $e) {
                 $output->writeln('process unknown error:');
                 $output->writeln($e->getMessage());
 
                 $output->writeln($e->getTraceAsString(), OutputInterface::VERBOSITY_DEBUG);
-                $returnValue = Cli::RETURN_FAILURE;
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php
deleted file mode 100644
index 815f480cf7b53..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/CatalogSearch/AdvancedTest.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Elasticsearch\Model\CatalogSearch;
-
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\CatalogSearch\Model\Advanced;
-use Magento\Catalog\Model\Product\Visibility;
-use Magento\Catalog\Api\Data\ProductInterface;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Registry;
-use Magento\TestFramework\Helper\Bootstrap;
-use PHPUnit\Framework\TestCase;
-
-/**
- * Check catalog Advanced Search process with Elasticsearch enabled.
- */
-class AdvancedTest extends TestCase
-{
-    /**
-     * @var ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var Registry
-     */
-    private $registry;
-
-    /**
-     * @var Visibility
-     */
-    private $productVisibility;
-
-    /**
-     * @var ProductRepositoryInterface
-     */
-    private $productRepository;
-
-    /**
-     * @inheritDoc
-     */
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->registry = $this->objectManager->get(Registry::class);
-        $this->productVisibility = $this->objectManager->get(Visibility::class);
-        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
-    }
-
-    /**
-     * Check that Advanced Search does NOT return products that do NOT have search visibility.
-     *
-     * @magentoDbIsolation disabled
-     * @magentoConfigFixture default/catalog/search/engine elasticsearch7
-     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_with_two_child_products.php
-     * @return void
-     */
-    public function testAddFilters(): void
-    {
-        $this->assertResultsAfterRequest(1);
-
-        /** @var ProductInterface $configurableProductOption */
-        $configurableProductOption = $this->productRepository->get('Simple option 1');
-        $configurableProductOption->setVisibility(Visibility::VISIBILITY_IN_SEARCH);
-        $this->productRepository->save($configurableProductOption);
-
-        $this->registry->unregister('advanced_search_conditions');
-        $this->assertResultsAfterRequest(2);
-    }
-
-    /**
-     * Do Elasticsearch query and assert results.
-     *
-     * @param int $count
-     * @return void
-     */
-    private function assertResultsAfterRequest(int $count): void
-    {
-        /** @var Advanced $advancedSearch */
-        $advancedSearch = $this->objectManager->create(Advanced::class);
-        $advancedSearch->addFilters(['name' => 'Configurable']);
-
-        /** @var ProductInterface[] $itemsResult */
-        $itemsResult = $advancedSearch->getProductCollection()
-            ->addAttributeToSelect(ProductInterface::VISIBILITY)
-            ->getItems();
-
-        $this->assertCount($count, $itemsResult);
-        foreach ($itemsResult as $product) {
-            $this->assertStringContainsString('Configurable', $product->getName());
-            $this->assertContains((int)$product->getVisibility(), $this->productVisibility->getVisibleInSearchIds());
-        }
-    }
-}
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php b/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
index 67de7913b4603..f4730b0b32c18 100644
--- a/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
+++ b/dev/tests/integration/testsuite/Magento/Indexer/Console/Command/IndexerReindexCommandTest.php
@@ -7,11 +7,9 @@
 
 namespace Magento\Indexer\Console\Command;
 
-use Magento\Framework\Console\Cli;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\MockObject\MockObject as Mock;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -21,7 +19,7 @@
  * @magentoDbIsolation disabled
  * @magentoAppIsolation enabled
  */
-class IndexerReindexCommandTest extends TestCase
+class IndexerReindexCommandTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var ObjectManagerInterface
@@ -58,23 +56,14 @@ protected function setUp(): void
 
     /**
      * @magentoDataFixture Magento/Store/_files/second_store_group_with_second_website.php
-     * @return void
      */
-    public function testReindexAll(): void
+    public function testReindexAll()
     {
         $status = $this->command->run($this->inputMock, $this->outputMock);
-        $this->assertEquals(Cli::RETURN_SUCCESS, $status, 'Index wasn\'t success');
-    }
-
-    /**
-     * Check that 'indexer:reindex' command return right code.
-     *
-     * @magentoDataFixture Magento/Indexer/_files/wrong_config_data.php
-     * @return void
-     */
-    public function testReindexAllWhenSomethingIsWrong(): void
-    {
-        $status = $this->command->run($this->inputMock, $this->outputMock);
-        $this->assertEquals(Cli::RETURN_FAILURE, $status, 'Index didn\'t return failure code');
+        $this->assertEquals(
+            \Magento\Framework\Console\Cli::RETURN_SUCCESS,
+            $status,
+            'Index wasn\'t success'
+        );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php b/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php
deleted file mode 100644
index c6ec6235b61e6..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-use Magento\Config\Model\Config\Factory;
-use Magento\TestFramework\Helper\Bootstrap;
-
-/** @var Factory $configFactory */
-$configFactory = Bootstrap::getObjectManager()->get(Factory::class);
-$config = $configFactory->create();
-$config->setScope('stores');
-$config->setDataByPath('catalog/search/elasticsearch7_server_port', 2309);
-$config->save();
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php b/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php
deleted file mode 100644
index 7ca0b986fc206..0000000000000
--- a/dev/tests/integration/testsuite/Magento/Indexer/_files/wrong_config_data_rollback.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-use Magento\Framework\App\ResourceConnection;
-use Magento\TestFramework\Helper\Bootstrap;
-
-/** @var ResourceConnection $resource */
-$resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
-$connection = $resource->getConnection();
-$tableName = $resource->getTableName('core_config_data');
-
-$connection->query("DELETE FROM $tableName WHERE path = 'catalog/search/elasticsearch7_server_port'"
-    ." AND scope = 'stores';");

From 6a58f7ef0cf75b830f7a7c462d8fa7d010de317e Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Mon, 28 Sep 2020 16:44:20 +0300
Subject: [PATCH 417/671] magento/magento2#29478: refactoring, test coverage

---
 .../Console/Command/IndexerReindexCommand.php |  79 ++-----
 app/code/Magento/Indexer/Model/Processor.php  |  79 ++-----
 .../Model/Processor/MakeSharedIndexValid.php  |  95 +++++++++
 .../Command/IndexerReindexCommandTest.php     |  26 ++-
 .../Indexer/Test/Unit/Model/ProcessorTest.php | 199 +++++++++++++++++-
 5 files changed, 333 insertions(+), 145 deletions(-)
 create mode 100644 app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php

diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 775f585519947..67cde2e1d7d58 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Indexer\Console\Command;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ObjectManagerFactory;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
@@ -14,11 +15,13 @@
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Indexer\StateInterface;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command to run indexers
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class IndexerReindexCommand extends AbstractIndexerManageCommand
 {
@@ -42,18 +45,26 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
      */
     private $dependencyInfoProvider;
 
+    /**
+     * @var MakeSharedIndexValid|null
+     */
+    private $makeSharedValid;
+
     /**
      * @param ObjectManagerFactory $objectManagerFactory
      * @param IndexerRegistry|null $indexerRegistry
      * @param DependencyInfoProvider|null $dependencyInfoProvider
+     * @param MakeSharedIndexValid|null $makeSharedValid
      */
     public function __construct(
         ObjectManagerFactory $objectManagerFactory,
         IndexerRegistry $indexerRegistry = null,
-        DependencyInfoProvider $dependencyInfoProvider = null
+        DependencyInfoProvider $dependencyInfoProvider = null,
+        MakeSharedIndexValid $makeSharedValid = null
     ) {
         $this->indexerRegistry = $indexerRegistry;
         $this->dependencyInfoProvider = $dependencyInfoProvider;
+        $this->makeSharedValid = $makeSharedValid ?: ObjectManager::getInstance()->get(MakeSharedIndexValid::class);
         parent::__construct($objectManagerFactory);
     }
 
@@ -88,8 +99,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 // Skip indexers having shared index that was already complete
                 if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
                     $indexer->reindexAll();
-                    if ($sharedIndex) {
-                        $this->validateSharedIndex($sharedIndex);
+                    if (!empty($sharedIndex) && $this->makeSharedValid->execute($sharedIndex)) {
+                        $this->sharedIndexesComplete[] = $sharedIndex;
                     }
                 }
                 $resultTime = microtime(true) - $startTime;
@@ -214,54 +225,6 @@ private function validateIndexerStatus(IndexerInterface $indexer)
         }
     }
 
-    /**
-     * Get indexer ids that have common shared index
-     *
-     * @param string $sharedIndex
-     * @return array
-     */
-    private function getIndexerIdsBySharedIndex($sharedIndex)
-    {
-        $indexers = $this->getConfig()->getIndexers();
-        $result = [];
-        foreach ($indexers as $indexerConfig) {
-            if ($indexerConfig['shared_index'] == $sharedIndex) {
-                $result[] = $indexerConfig['indexer_id'];
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Validate indexers by shared index ID
-     *
-     * @param string $sharedIndex
-     * @return $this
-     */
-    private function validateSharedIndex($sharedIndex)
-    {
-        if (empty($sharedIndex)) {
-            throw new \InvalidArgumentException(
-                'The sharedIndex is an invalid shared index identifier. Verify the identifier and try again.'
-            );
-        }
-        $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
-        if (empty($indexerIds)) {
-            return $this;
-        }
-        foreach ($indexerIds as $indexerId) {
-            $indexer = $this->getIndexerRegistry()->get($indexerId);
-            /** @var \Magento\Indexer\Model\Indexer\State $state */
-            $state = $indexer->getState();
-            $state->setStatus(StateInterface::STATUS_WORKING);
-            $state->save();
-            $state->setStatus(StateInterface::STATUS_VALID);
-            $state->save();
-        }
-        $this->sharedIndexesComplete[] = $sharedIndex;
-        return $this;
-    }
-
     /**
      * Get config
      *
@@ -276,20 +239,6 @@ private function getConfig()
         return $this->config;
     }
 
-    /**
-     * Get indexer registry
-     *
-     * @return IndexerRegistry
-     * @deprecated 100.2.0
-     */
-    private function getIndexerRegistry()
-    {
-        if (!$this->indexerRegistry) {
-            $this->indexerRegistry = $this->getObjectManager()->get(IndexerRegistry::class);
-        }
-        return $this->indexerRegistry;
-    }
-
     /**
      * Get dependency info provider
      *
diff --git a/app/code/Magento/Indexer/Model/Processor.php b/app/code/Magento/Indexer/Model/Processor.php
index 01f530488fbe7..78b8fa070b155 100644
--- a/app/code/Magento/Indexer/Model/Processor.php
+++ b/app/code/Magento/Indexer/Model/Processor.php
@@ -5,10 +5,12 @@
  */
 namespace Magento\Indexer\Model;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
-use Magento\Framework\Indexer\StateInterface;
+use Magento\Framework\Mview\ProcessorInterface;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
 
 /**
  * Indexer processor
@@ -36,26 +38,34 @@ class Processor
     protected $indexersFactory;
 
     /**
-     * @var \Magento\Framework\Mview\ProcessorInterface
+     * @var ProcessorInterface
      */
     protected $mviewProcessor;
 
+    /**
+     * @var MakeSharedIndexValid
+     */
+    protected $makeSharedValid;
+
     /**
      * @param ConfigInterface $config
      * @param IndexerInterfaceFactory $indexerFactory
      * @param Indexer\CollectionFactory $indexersFactory
-     * @param \Magento\Framework\Mview\ProcessorInterface $mviewProcessor
+     * @param ProcessorInterface $mviewProcessor
+     * @param MakeSharedIndexValid|null $makeSharedValid
      */
     public function __construct(
         ConfigInterface $config,
         IndexerInterfaceFactory $indexerFactory,
         Indexer\CollectionFactory $indexersFactory,
-        \Magento\Framework\Mview\ProcessorInterface $mviewProcessor
+        ProcessorInterface $mviewProcessor,
+        MakeSharedIndexValid $makeSharedValid = null
     ) {
         $this->config = $config;
         $this->indexerFactory = $indexerFactory;
         $this->indexersFactory = $indexersFactory;
         $this->mviewProcessor = $mviewProcessor;
+        $this->makeSharedValid = $makeSharedValid ?: ObjectManager::getInstance()->get(MakeSharedIndexValid::class);
     }
 
     /**
@@ -70,7 +80,6 @@ public function reindexAllInvalid()
             $indexer = $this->indexerFactory->create();
             $indexer->load($indexerId);
             $indexerConfig = $this->config->getIndexer($indexerId);
-            $sharedIndex = $indexerConfig['shared_index'];
 
             if ($indexer->isInvalid()) {
                 // Skip indexers having shared index that was already complete
@@ -78,70 +87,14 @@ public function reindexAllInvalid()
                 if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
                     $indexer->reindexAll();
 
-                    if ($sharedIndex) {
-                        $this->validateSharedIndex($sharedIndex);
+                    if (!empty($sharedIndex) && $this->makeSharedValid->execute($sharedIndex)) {
+                        $this->sharedIndexesComplete[] = $sharedIndex;
                     }
                 }
             }
         }
     }
 
-    /**
-     * Get indexer ids that have common shared index
-     *
-     * @param string $sharedIndex
-     * @return array
-     */
-    private function getIndexerIdsBySharedIndex(string $sharedIndex): array
-    {
-        $indexers = $this->config->getIndexers();
-
-        $result = [];
-        foreach ($indexers as $indexerConfig) {
-            if ($indexerConfig['shared_index'] == $sharedIndex) {
-                $result[] = $indexerConfig['indexer_id'];
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Validate indexers by shared index ID
-     *
-     * @param string $sharedIndex
-     * @return $this
-     */
-    private function validateSharedIndex(string $sharedIndex): self
-    {
-        if (empty($sharedIndex)) {
-            throw new \InvalidArgumentException(
-                'The sharedIndex is an invalid shared index identifier. Verify the identifier and try again.'
-            );
-        }
-
-        $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
-        if (empty($indexerIds)) {
-            return $this;
-        }
-
-        foreach ($indexerIds as $indexerId) {
-            /** @var \Magento\Indexer\Model\Indexer $indexer */
-            $indexer = $this->indexerFactory->create();
-            $indexer->load($indexerId);
-            /** @var \Magento\Indexer\Model\Indexer\State $state */
-            $state = $indexer->getState();
-            $state->setStatus(StateInterface::STATUS_WORKING);
-            $state->save();
-            $state->setStatus(StateInterface::STATUS_VALID);
-            $state->save();
-        }
-
-        $this->sharedIndexesComplete[] = $sharedIndex;
-
-        return $this;
-    }
-
     /**
      * Regenerate indexes for all indexers
      *
diff --git a/app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php b/app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php
new file mode 100644
index 0000000000000..338891589bf33
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Indexer\Model\Processor;
+
+use Magento\Framework\Indexer\ConfigInterface;
+use Magento\Framework\Indexer\IndexerRegistry;
+use Magento\Framework\Indexer\StateInterface;
+use Magento\Indexer\Model\Indexer\State;
+
+/**
+ * Class processor makes indexers valid by shared index ID
+ */
+class MakeSharedIndexValid
+{
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var IndexerRegistry
+     */
+    private $indexerRegistry;
+
+    /**
+     * ValidateSharedIndex constructor.
+     *
+     * @param ConfigInterface $config
+     * @param IndexerRegistry $indexerRegistry
+     */
+    public function __construct(ConfigInterface $config, IndexerRegistry $indexerRegistry)
+    {
+        $this->config = $config;
+        $this->indexerRegistry = $indexerRegistry;
+    }
+
+    /**
+     * Validate indexers by shared index ID
+     *
+     * @param string $sharedIndex
+     * @return bool
+     * @throws \Exception
+     */
+    public function execute(string $sharedIndex): bool
+    {
+        if (empty($sharedIndex)) {
+            throw new \InvalidArgumentException(
+                "The '{$sharedIndex}' is an invalid shared index identifier. Verify the identifier and try again.",
+            );
+        }
+
+        $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
+        if (empty($indexerIds)) {
+            return false;
+        }
+
+        foreach ($indexerIds as $indexerId) {
+            $indexer = $this->indexerRegistry->get($indexerId);
+            /** @var State $state */
+            $state = $indexer->getState();
+            $state->setStatus(StateInterface::STATUS_WORKING);
+            $state->save();
+            $state->setStatus(StateInterface::STATUS_VALID);
+            $state->save();
+        }
+
+        return true;
+    }
+
+    /**
+     * Get indexer ids that have common shared index
+     *
+     * @param string $sharedIndex
+     * @return array
+     */
+    private function getIndexerIdsBySharedIndex(string $sharedIndex): array
+    {
+        $indexers = $this->config->getIndexers();
+
+        $result = [];
+        foreach ($indexers as $indexerConfig) {
+            if ($indexerConfig['shared_index'] == $sharedIndex) {
+                $result[] = $indexerConfig['indexer_id'];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
index 6d96841bc3dab..8bdceb92b247b 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
@@ -18,6 +18,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Indexer\Console\Command\IndexerReindexCommand;
 use Magento\Indexer\Model\Config;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -49,6 +50,11 @@ class IndexerReindexCommandTest extends AbstractIndexerCommandCommonSetup
      */
     private $dependencyInfoProviderMock;
 
+    /**
+     * @var MakeSharedIndexValid|MockObject
+     */
+    private $makeSharedValidMock;
+
     /**
      * @var ObjectManagerHelper
      */
@@ -64,12 +70,12 @@ protected function setUp(): void
         $this->indexerRegistryMock = $this->getMockBuilder(IndexerRegistry::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->dependencyInfoProviderMock = $this->objectManagerHelper->getObject(
-            DependencyInfoProvider::class,
-            [
-                'config' => $this->configMock,
-            ]
-        );
+        $this->makeSharedValidMock = $this->getMockBuilder(MakeSharedIndexValid::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dependencyInfoProviderMock = $this->objectManagerHelper->getObject(DependencyInfoProvider::class, [
+            'config' => $this->configMock,
+        ]);
         parent::setUp();
     }
 
@@ -174,11 +180,17 @@ public function testExecuteWithIndex(
         $emptyIndexer->method('getState')
             ->willReturn($this->getStateMock(['setStatus', 'save']));
 
+        $this->makeSharedValidMock = $this->objectManagerHelper->getObject(MakeSharedIndexValid::class, [
+            'config' => $this->configMock,
+            'indexerRegistry' => $this->indexerRegistryMock
+        ]);
         $this->configureAdminArea();
 
         $this->command = new IndexerReindexCommand(
             $this->objectManagerFactory,
-            $this->indexerRegistryMock
+            $this->indexerRegistryMock,
+            $this->dependencyInfoProviderMock,
+            $this->makeSharedValidMock
         );
 
         $commandTester = new CommandTester($this->command);
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php b/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
index 9cc0277997289..9f9b4c2157bb7 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\Indexer\ConfigInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
+use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Indexer\StateInterface;
 use Magento\Framework\Mview\ProcessorInterface;
 use Magento\Indexer\Model\Indexer;
@@ -16,6 +17,7 @@
 use Magento\Indexer\Model\Indexer\CollectionFactory;
 use Magento\Indexer\Model\Indexer\State;
 use Magento\Indexer\Model\Processor;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -79,20 +81,15 @@ protected function setUp(): void
         );
     }
 
-    public function testReindexAllInvalid()
+    /**
+     * @return void
+     */
+    public function testReindexAllInvalid(): void
     {
         $indexers = ['indexer1' => [], 'indexer2' => []];
 
         $this->configMock->expects($this->once())->method('getIndexers')->willReturn($indexers);
 
-        $this->configMock->expects($this->exactly(2))
-            ->method('getIndexer')
-            ->willReturn(
-                [
-                    'shared_index' => null
-                ]
-            );
-
         $state1Mock = $this->createPartialMock(State::class, ['getStatus', '__wakeup']);
         $state1Mock->expects(
             $this->once()
@@ -129,7 +126,68 @@ public function testReindexAllInvalid()
         $this->model->reindexAllInvalid();
     }
 
-    public function testReindexAll()
+    /**
+     * @dataProvider sharedIndexDataProvider
+     * @param array $indexers
+     * @param array $indexerStates
+     * @param array $expectedReindexAllCalls
+     * @param array $executedSharedIndexers
+     */
+    public function testReindexAllInvalidWithSharedIndex(
+        array $indexers,
+        array $indexerStates,
+        array $expectedReindexAllCalls,
+        array $executedSharedIndexers
+    ): void {
+        $this->configMock->expects($this->any())->method('getIndexers')->willReturn($indexers);
+        $this->configMock
+            ->method('getIndexer')
+            ->willReturnMap(
+                array_map(
+                    function ($elem) {
+                        return [$elem['indexer_id'], $elem];
+                    },
+                    $indexers
+                )
+            );
+        $indexerMocks = [];
+        foreach ($indexers as $indexerData) {
+            $stateMock = $this->createPartialMock(State::class, ['getStatus', '__wakeup']);
+            $stateMock->expects($this->any())
+                ->method('getStatus')
+                ->willReturn($indexerStates[$indexerData['indexer_id']]);
+            $indexerMock = $this->createPartialMock(Indexer::class, ['load', 'getState', 'reindexAll']);
+            $indexerMock->expects($this->any())->method('getState')->willReturn($stateMock);
+            $indexerMock->expects($expectedReindexAllCalls[$indexerData['indexer_id']])->method('reindexAll');
+
+            $this->indexerFactoryMock->expects($this->at(count($indexerMocks)))
+                ->method('create')
+                ->willReturn($indexerMock);
+
+            $indexerMocks[] = $indexerMock;
+        }
+        $indexerRegistryMock = $this->getIndexRegistryMock($executedSharedIndexers);
+
+        $makeSharedValidMock = new MakeSharedIndexValid(
+            $this->configMock,
+            $indexerRegistryMock
+        );
+        $model = new Processor(
+            $this->configMock,
+            $this->indexerFactoryMock,
+            $this->indexersFactoryMock,
+            $this->viewProcessorMock,
+            $makeSharedValidMock
+        );
+        $model->reindexAllInvalid();
+    }
+
+    /**
+     * Reindex all test
+     *
+     * return void
+     */
+    public function testReindexAll(): void
     {
         $indexerMock = $this->createMock(Indexer::class);
         $indexerMock->expects($this->exactly(2))->method('reindexAll');
@@ -142,15 +200,136 @@ public function testReindexAll()
         $this->model->reindexAll();
     }
 
+    /**
+     * Update mview test
+     *
+     * @return void
+     */
     public function testUpdateMview()
     {
         $this->viewProcessorMock->expects($this->once())->method('update')->with('indexer')->willReturnSelf();
         $this->model->updateMview();
     }
 
+    /**
+     * Clear change log test
+     *
+     * @return void
+     */
     public function testClearChangelog()
     {
         $this->viewProcessorMock->expects($this->once())->method('clearChangelog')->with('indexer')->willReturnSelf();
         $this->model->clearChangelog();
     }
+
+    /**
+     * @return array
+     */
+    public function sharedIndexDataProvider()
+    {
+        return [
+            'Without dependencies' => [
+                'indexers' => [
+                    'indexer_1' => [
+                        'indexer_id' => 'indexer_1',
+                        'title' => 'Title_indexer_1',
+                        'shared_index' => null,
+                        'dependencies' => [],
+                    ],
+                    'indexer_2' => [
+                        'indexer_id' => 'indexer_2',
+                        'title' => 'Title_indexer_2',
+                        'shared_index' => 'with_indexer_3',
+                        'dependencies' => [],
+                    ],
+                    'indexer_3' => [
+                        'indexer_id' => 'indexer_3',
+                        'title' => 'Title_indexer_3',
+                        'shared_index' => 'with_indexer_3',
+                        'dependencies' => [],
+                    ],
+                ],
+                'indexer_states' => [
+                    'indexer_1' => StateInterface::STATUS_INVALID,
+                    'indexer_2' => StateInterface::STATUS_VALID,
+                    'indexer_3' => StateInterface::STATUS_VALID,
+                ],
+                'expected_reindex_all_calls' => [
+                    'indexer_1' => $this->once(),
+                    'indexer_2' => $this->never(),
+                    'indexer_3' => $this->never(),
+                ],
+                'executed_shared_indexers' => [],
+            ],
+            'With dependencies and some indexers is invalid' => [
+                'indexers' => [
+                    'indexer_1' => [
+                        'indexer_id' => 'indexer_1',
+                        'title' => 'Title_indexer_1',
+                        'shared_index' => null,
+                        'dependencies' => ['indexer_2', 'indexer_3'],
+                    ],
+                    'indexer_2' => [
+                        'indexer_id' => 'indexer_2',
+                        'title' => 'Title_indexer_2',
+                        'shared_index' => 'with_indexer_3',
+                        'dependencies' => [],
+                    ],
+                    'indexer_3' => [
+                        'indexer_id' => 'indexer_3',
+                        'title' => 'Title_indexer_3',
+                        'shared_index' => 'with_indexer_3',
+                        'dependencies' => [],
+                    ],
+                    'indexer_4' => [
+                        'indexer_id' => 'indexer_4',
+                        'title' => 'Title_indexer_4',
+                        'shared_index' => null,
+                        'dependencies' => ['indexer_1'],
+                    ],
+                ],
+                'indexer_states' => [
+                    'indexer_1' => StateInterface::STATUS_INVALID,
+                    'indexer_2' => StateInterface::STATUS_VALID,
+                    'indexer_3' => StateInterface::STATUS_INVALID,
+                    'indexer_4' => StateInterface::STATUS_VALID,
+                ],
+                'expected_reindex_all_calls' => [
+                    'indexer_1' => $this->once(),
+                    'indexer_2' => $this->never(),
+                    'indexer_3' => $this->once(),
+                    'indexer_4' => $this->never(),
+                ],
+                'executed_shared_indexers' => [['indexer_2'], ['indexer_3']],
+            ],
+        ];
+    }
+
+    /**
+     * @param array $executedSharedIndexers
+     * @return IndexerRegistry|MockObject
+     */
+    private function getIndexRegistryMock(array $executedSharedIndexers)
+    {
+        /** @var MockObject|IndexerRegistry $indexerRegistryMock */
+        $indexerRegistryMock = $this->getMockBuilder(IndexerRegistry::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $emptyIndexer = $this->createPartialMock(Indexer::class, ['load', 'getState', 'reindexAll']);
+        /** @var MockObject|StateInterface $state */
+        $state = $this->getMockBuilder(StateInterface::class)
+            ->setMethods(['setStatus', 'save'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $state->method('getStatus')
+            ->willReturn(StateInterface::STATUS_INVALID);
+        $emptyIndexer->method('getState')->willReturn($state);
+        $indexerRegistryMock
+            ->expects($this->exactly(count($executedSharedIndexers)))
+            ->method('get')
+            ->withConsecutive(...$executedSharedIndexers)
+            ->willReturn($emptyIndexer);
+
+        return $indexerRegistryMock;
+    }
 }

From 09d13b8c2b13df0bd376c8b2ebbb3b81effdc252 Mon Sep 17 00:00:00 2001
From: Bas van Poppel <vanpoppel@redkiwi.nl>
Date: Tue, 29 Sep 2020 15:57:59 +0200
Subject: [PATCH 418/671] Test showing that a discount applied by a salesrule
 affects the table rate shipping method

---
 ...sAppliedOnPackageValueForTableRateTest.xml | 94 +++++++++++++++++++
 .../Data/TableRatesShippingMethodData.xml     |  6 ++
 2 files changed, 100 insertions(+)
 create mode 100644 app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml

diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
new file mode 100644
index 0000000000000..ef87696c37718
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest">
+        <annotations>
+            <features value="Shipping"/>
+            <stories value="Offline Shipping Methods"/>
+            <title value="SalesRule Discount Is Applied On PackageValue For TableRate"/>
+            <description value="SalesRule Discount Is Applied On PackageValue For TableRate"/>
+            <severity value="AVERAGE"/>
+            <group value="shipping"/>
+        </annotations>
+        <before>
+            <!-- Add simple product -->
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct">
+                <field key="price">13.00</field>
+            </createData>
+
+            <!-- Create cart price rule -->
+            <createData entity="ActiveSalesRuleForNotLoggedIn" stepKey="createCartPriceRule"/>
+            <createData entity="SimpleSalesRuleCoupon" stepKey="createCouponForCartPriceRule">
+                <requiredEntity createDataKey="createCartPriceRule"/>
+            </createData>
+
+            <!-- Login as admin -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+
+            <!-- Go to Stores > Configuration > Sales > Shipping Methods -->
+            <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
+
+            <!-- Switch to Website scope -->
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreView">
+                <argument name="website" value="_defaultWebsite"/>
+            </actionGroup>
+
+            <!-- Enable Table Rate method and save config -->
+            <actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethod"/>
+
+            <!-- Uncheck Use Default checkbox for Default Condition -->
+            <uncheckOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateConditionName}}" stepKey="disableUseDefaultCondition"/>
+
+            <!-- Make sure you have Condition Price vs. Destination -->
+            <selectOption selector="{{AdminShippingMethodTableRatesSection.condition}}" userInput="{{TableRateShippingMethodConfig.package_value_with_discount}}" stepKey="setCondition"/>
+
+            <!-- Import file and save config -->
+            <attachFile selector="{{AdminShippingMethodTableRatesSection.importFile}}" userInput="usa_tablerates.csv" stepKey="attachFileForImport"/>
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
+        </before>
+        <after>
+            <!-- Go to Stores > Configuration > Sales > Shipping Methods -->
+            <actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
+
+            <!-- Switch to Website scope -->
+            <actionGroup ref="AdminSwitchWebsiteActionGroup" stepKey="AdminSwitchStoreView">
+                <argument name="website" value="_defaultWebsite"/>
+            </actionGroup>
+
+            <!-- Check Use Default checkbox for Default Condition and Active -->
+            <checkOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateConditionName}}" stepKey="enableUseDefaultCondition"/>
+            <checkOption selector="{{AdminShippingMethodTableRatesSection.enabledUseSystemValue}}" stepKey="enableUseDefaultActive"/>
+
+            <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigs"/>
+
+            <!-- Log out -->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+
+            <!-- Remove simple product-->
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+
+            <!-- Delete sales rule -->
+            <deleteData createDataKey="createCartPriceRule" stepKey="deleteCartPriceRule"/>
+
+        </after>
+        <!-- Add simple product to cart -->
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+
+        <!-- Assert that table rate value is correct for US -->
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCheckout"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.estimateShippingAndTaxForm}}" stepKey="waitForEstimateShippingAndTaxForm"/>
+        <waitForElement time="30" selector="{{CheckoutCartSummarySection.shippingMethodForm}}" stepKey="waitForShippingMethodForm"/>
+        <conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.country}}" visible="false" stepKey="expandEstimateShippingandTax" />
+        <selectOption selector="{{CheckoutCartSummarySection.country}}" userInput="United States" stepKey="selectUSCountry"/>
+        <waitForPageLoad stepKey="waitForSelectCountry"/>
+        <see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$5.99" stepKey="seeShippingForUS"/>
+
+        <!-- Apply Coupon -->
+        <actionGroup ref="StorefrontApplyCouponActionGroup" stepKey="applyDiscount">
+            <argument name="coupon" value="$$createCouponForCartPriceRule$$"/>
+        </actionGroup>
+
+        <see selector="{{CheckoutCartSummarySection.shippingPrice}}" userInput="$7.99" stepKey="seeShippingForUSWithDiscount"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml b/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml
index 47ef68cc9d765..ceae9c546bd3b 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Data/TableRatesShippingMethodData.xml
@@ -16,4 +16,10 @@
         <data key="title">Best Way</data>
         <data key="methodName">Table Rate</data>
     </entity>
+    <!-- Set Table Rate Shipping method Condition -->
+    <entity name="TableRateShippingMethodConfig" type="shipping_method">
+        <data key="package_weight">Weight vs. Destination</data>
+        <data key="package_value_with_discount">Price vs. Destination</data>
+        <data key="package_qty"># of Items vs. Destination</data>
+    </entity>
 </entities>

From 460252f762bd9ee5af2fb880f4b3b242f471a193 Mon Sep 17 00:00:00 2001
From: Bas van Poppel <vanpoppel@redkiwi.nl>
Date: Tue, 29 Sep 2020 16:59:43 +0200
Subject: [PATCH 419/671] Added copyright to test

---
 ...uleDiscountIsAppliedOnPackageValueForTableRateTest.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
index ef87696c37718..52d456bc6225d 100644
--- a/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
@@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?><!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest">
         <annotations>

From 9f1bfa614d3b1e919a2a0a068cadd8c758c9b898 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Tue, 29 Sep 2020 14:38:02 -0500
Subject: [PATCH 420/671] MC-35996: "Port number must be configured" error in
 Advanced Reporting cron occurs even when "port" parameter is configured in
 env.php

---
 .../Analytics/ReportXml/ConnectionFactory.php | 55 +++++++-----
 .../Unit/ReportXml/ConnectionFactoryTest.php  | 88 +++++++------------
 app/code/Magento/Analytics/etc/di.xml         |  5 ++
 3 files changed, 70 insertions(+), 78 deletions(-)

diff --git a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
index 432d011e593ec..4c280729ff75f 100644
--- a/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
+++ b/app/code/Magento/Analytics/ReportXml/ConnectionFactory.php
@@ -6,56 +6,65 @@
 
 namespace Magento\Analytics\ReportXml;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 
 /**
  * Creates connection instance for export according to existing one
+ *
  * This connection does not use buffered statement, also this connection is not persistent
  */
 class ConnectionFactory
 {
     /**
-     * @var ResourceConnection
+     * @var ResourceConfigInterface
      */
-    private $resourceConnection;
+    private $resourceConfig;
 
     /**
-     * @var ObjectManagerInterface
+     * @var DeploymentConfig
      */
-    private $objectManager;
+    private $deploymentConfig;
 
     /**
-     * @param ResourceConnection $resourceConnection
-     * @param ObjectManagerInterface $objectManager
+     * @var ConnectionFactoryInterface
+     */
+    private $connectionFactory;
+
+    /**
+     * @param ResourceConfigInterface $resourceConfig
+     * @param DeploymentConfig $deploymentConfig
+     * @param ConnectionFactoryInterface $connectionFactory
      */
     public function __construct(
-        ResourceConnection $resourceConnection,
-        ObjectManagerInterface $objectManager
+        ResourceConfigInterface $resourceConfig,
+        DeploymentConfig $deploymentConfig,
+        ConnectionFactoryInterface $connectionFactory
     ) {
-        $this->resourceConnection = $resourceConnection;
-        $this->objectManager = $objectManager;
+        $this->resourceConfig = $resourceConfig;
+        $this->deploymentConfig = $deploymentConfig;
+        $this->connectionFactory = $connectionFactory;
     }
 
     /**
      * Creates one-time connection for export
      *
-     * @param string $connectionName
+     * @param string $resourceName
      * @return AdapterInterface
      */
-    public function getConnection($connectionName)
+    public function getConnection($resourceName)
     {
-        $connection = $this->resourceConnection->getConnection($connectionName);
-        $connectionClassName = get_class($connection);
-        $configData = $connection->getConfig();
+        $connectionName = $this->resourceConfig->getConnectionName($resourceName);
+        $configData = $this->deploymentConfig->get(
+            ConfigOptionsListConstants::CONFIG_PATH_DB_CONNECTIONS . '/' . $connectionName
+        );
         $configData['use_buffered_query'] = false;
         unset($configData['persistent']);
-        return $this->objectManager->create(
-            $connectionClassName,
-            [
-                'config' => $configData
-            ]
-        );
+        $connection = $this->connectionFactory->create($configData);
+
+        return $connection;
     }
 }
diff --git a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
index 16caaa380067f..9be5bea8d7d05 100644
--- a/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
+++ b/app/code/Magento/Analytics/Test/Unit/ReportXml/ConnectionFactoryTest.php
@@ -8,40 +8,29 @@
 namespace Magento\Analytics\Test\Unit\ReportXml;
 
 use Magento\Analytics\ReportXml\ConnectionFactory;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection\ConfigInterface as ResourceConfigInterface;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\DB\Adapter\Pdo\Mysql as MysqlPdoAdapter;
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactoryInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ConnectionFactoryTest extends TestCase
 {
     /**
-     * @var ResourceConnection|MockObject
+     * @var ResourceConfigInterface|MockObject
      */
-    private $resourceConnectionMock;
+    private $resourceConfigMock;
 
     /**
-     * @var ObjectManagerInterface|MockObject
+     * @var DeploymentConfig|MockObject
      */
-    private $objectManagerMock;
+    private $deploymentConfigMock;
 
     /**
-     * @var ConnectionFactory|MockObject
+     * @var ConnectionFactoryInterface|MockObject
      */
-    private $connectionNewMock;
-
-    /**
-     * @var AdapterInterface|MockObject
-     */
-    private $connectionMock;
-
-    /**
-     * @var ObjectManagerHelper
-     */
-    private $objectManagerHelper;
+    private $connectionFactoryMock;
 
     /**
      * @var ConnectionFactory
@@ -53,47 +42,36 @@ class ConnectionFactoryTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->resourceConnectionMock = $this->createMock(ResourceConnection::class);
-
-        $this->objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
-
-        $this->connectionMock = $this->createMock(MysqlPdoAdapter::class);
-
-        $this->connectionNewMock = $this->createMock(MysqlPdoAdapter::class);
-
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-
-        $this->connectionFactory = $this->objectManagerHelper->getObject(
-            ConnectionFactory::class,
-            [
-                'resourceConnection' => $this->resourceConnectionMock,
-                'objectManager' => $this->objectManagerMock,
-            ]
+        $this->resourceConfigMock = $this->createMock(ResourceConfigInterface::class);
+        $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+        $this->connectionFactoryMock = $this->createMock(ConnectionFactoryInterface::class);
+
+        $this->connectionFactory = new ConnectionFactory(
+            $this->resourceConfigMock,
+            $this->deploymentConfigMock,
+            $this->connectionFactoryMock
         );
     }
 
     public function testGetConnection()
     {
-        $connectionName = 'read';
-
-        $this->resourceConnectionMock
-            ->expects($this->once())
-            ->method('getConnection')
-            ->with($connectionName)
-            ->willReturn($this->connectionMock);
-
-        $this->connectionMock
-            ->expects($this->once())
-            ->method('getConfig')
-            ->with()
-            ->willReturn(['persistent' => 1]);
-
-        $this->objectManagerMock
-            ->expects($this->once())
+        $resourceName = 'default';
+
+        $this->resourceConfigMock->expects($this->once())
+            ->method('getConnectionName')
+            ->with($resourceName)
+            ->willReturn('default');
+        $this->deploymentConfigMock->expects($this->once())
+            ->method('get')
+            ->with('db/connection/default')
+            ->willReturn(['host' => 'localhost', 'port' => 3306, 'persistent' => true]);
+        $connectionMock = $this->createMock(AdapterInterface::class);
+        $this->connectionFactoryMock->expects($this->once())
             ->method('create')
-            ->with(get_class($this->connectionMock), ['config' => ['use_buffered_query' => false]])
-            ->willReturn($this->connectionNewMock);
+            ->with(['host' => 'localhost', 'port' => 3306, 'use_buffered_query' => false])
+            ->willReturn($connectionMock);
 
-        $this->assertSame($this->connectionNewMock, $this->connectionFactory->getConnection($connectionName));
+        $connection = $this->connectionFactory->getConnection($resourceName);
+        $this->assertSame($connectionMock, $connection);
     }
 }
diff --git a/app/code/Magento/Analytics/etc/di.xml b/app/code/Magento/Analytics/etc/di.xml
index 8d8ce4f83a605..0a57676b5fb8f 100644
--- a/app/code/Magento/Analytics/etc/di.xml
+++ b/app/code/Magento/Analytics/etc/di.xml
@@ -266,4 +266,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Analytics\ReportXml\ConnectionFactory">
+        <arguments>
+            <argument name="connectionFactory" xsi:type="object">Magento\Framework\Model\ResourceModel\Type\Db\ConnectionFactory</argument>
+        </arguments>
+    </type>
 </config>

From 9ef7eef2d7d6ec6ac5cca8722dd5b3f7cbf4ee40 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Tue, 29 Sep 2020 19:11:50 -0500
Subject: [PATCH 421/671] MC-37347: [OnPrem] Catalog Products Filter in 2.3.3
 not working correctly

---
 .../Catalog/Ui/DataProvider/Product/ProductCollection.php       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
index ea8fc6f2d83b2..99391f92337b3 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -89,6 +89,8 @@ private function addAttributeToFilterAllStores(Attribute $attributeModel, array
             . $this->_getConditionSql("{$tableName}.value", $condition)
             . ') AND ('
             . $this->_getConditionSql("{$tableName}.attribute_id", $attributeId)
+            . ') AND ('
+            . $this->_getConditionSql("{$tableName}.store_id", $this->getDefaultStoreId())
             . ')';
         $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
         $this->getSelect()->exists($selectExistsInAllStores, $condition);

From 359f79c74573082d55d9e25cce64e4bf9cc794b7 Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Mon, 28 Sep 2020 15:08:21 -0500
Subject: [PATCH 422/671] MC-38003: [Magento Cloud] Indexer Performance -
 Possible Bug Found with Cache Clearing process

- Flush indexer cache context after cleaning cache
---
 .../Model/Indexer/Category/Product.php        |   2 +-
 .../Indexer/Model/Indexer/CacheCleaner.php    |   1 +
 .../Indexer/Model/Processor/CleanCache.php    |  27 +++-
 .../Test/Unit/Model/CacheContextTest.php      |  63 +++++++--
 .../Unit/Model/Indexer/CacheCleanerTest.php   | 129 ++++++++++++++++++
 .../Unit/Model/Processor/CleanCacheTest.php   |   6 +
 .../GraphQl/Catalog/ProductSearchTest.php     |   6 +
 .../Framework/Indexer/CacheContext.php        |  13 +-
 8 files changed, 228 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
index c18404bda1fc8..f5a8c33cfa6c9 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
@@ -64,8 +64,8 @@ public function __construct(
      */
     public function execute($ids)
     {
-        $this->executeAction($ids);
         $this->registerEntities($ids);
+        $this->executeAction($ids);
     }
 
     /**
diff --git a/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php b/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php
index c75a3541ba9c3..1cf7142e07cac 100644
--- a/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php
+++ b/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php
@@ -95,6 +95,7 @@ private function cleanCache()
         $identities = $this->cacheContext->getIdentities();
         if (!empty($identities)) {
             $this->appCache->clean($identities);
+            $this->cacheContext->flush();
         }
     }
 }
diff --git a/app/code/Magento/Indexer/Model/Processor/CleanCache.php b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
index 344fef6ef04ff..d7663171c8a65 100644
--- a/app/code/Magento/Indexer/Model/Processor/CleanCache.php
+++ b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
@@ -5,8 +5,11 @@
  */
 namespace Magento\Indexer\Model\Processor;
 
-use \Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\CacheInterface;
 
+/**
+ * Clear cache after reindex
+ */
 class CleanCache
 {
     /**
@@ -46,9 +49,7 @@ public function __construct(
     public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
     {
         $this->eventManager->dispatch('clean_cache_after_reindex', ['object' => $this->context]);
-        if (!empty($this->context->getIdentities())) {
-            $this->getCache()->clean($this->context->getIdentities());
-        }
+        $this->cleanCache();
     }
 
     /**
@@ -61,9 +62,7 @@ public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
     public function afterReindexAllInvalid(\Magento\Indexer\Model\Processor $subject)
     {
         $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->context]);
-        if (!empty($this->context->getIdentities())) {
-            $this->getCache()->clean($this->context->getIdentities());
-        }
+        $this->cleanCache();
     }
 
     /**
@@ -79,4 +78,18 @@ private function getCache()
         }
         return $this->cache;
     }
+
+    /**
+     * Clean cache.
+     *
+     * @return void
+     */
+    private function cleanCache(): void
+    {
+        $identities = $this->context->getIdentities();
+        if (!empty($identities)) {
+            $this->getCache()->clean($identities);
+            $this->context->flush();
+        }
+    }
 }
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php b/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php
index d0a2dbfe9e8e4..fda36271e5d44 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php
@@ -10,6 +10,9 @@
 use Magento\Framework\Indexer\CacheContext;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test indexer cache context
+ */
 class CacheContextTest extends TestCase
 {
     /**
@@ -38,20 +41,62 @@ public function testRegisterEntities()
     }
 
     /**
-     * test getIdentities
+     * Test getIdentities
+     *
+     * @param array $entities
+     * @param array $tags
+     * @param array $expected
+     * @dataProvider getIdentitiesDataProvider
      */
-    public function testGetIdentities()
+    public function testGetIdentities(array $entities, array $tags = [], array $expected = []): void
     {
-        $expectedIdentities = [
-            'product_1', 'product_2', 'product_3', 'category_5', 'category_6', 'category_7',
-        ];
-        $productTag = 'product';
-        $categoryTag = 'category';
+        foreach ($entities as $entity => $ids) {
+            $this->context->registerEntities($entity, $ids);
+        }
+        $this->context->registerTags($tags);
+        $this->assertEquals($expected, $this->context->getIdentities());
+    }
+
+    /**
+     * Test that flush() clears all data
+     */
+    public function testFlush(): void
+    {
+        $productTag = 'cat_p';
+        $categoryTag = 'cat_c';
+        $additionalTags = ['cat_c_p'];
         $productIds = [1, 2, 3];
         $categoryIds = [5, 6, 7];
         $this->context->registerEntities($productTag, $productIds);
         $this->context->registerEntities($categoryTag, $categoryIds);
-        $actualIdentities = $this->context->getIdentities();
-        $this->assertEquals($expectedIdentities, $actualIdentities);
+        $this->context->registerTags($additionalTags);
+        $this->assertNotEmpty($this->context->getIdentities());
+        $this->context->flush();
+        $this->assertEmpty($this->context->getIdentities());
+    }
+
+    /**
+     * @return array[]
+     */
+    public function getIdentitiesDataProvider(): array
+    {
+        return [
+            'should return entities and tags' => [
+                [
+                    'cat_p' => [1, 2, 3],
+                    'cat_c' => [5, 6, 7]
+                ],
+                ['cat_c_p1', 'cat_c_p2'],
+                ['cat_p_1', 'cat_p_2', 'cat_p_3', 'cat_c_5', 'cat_c_6', 'cat_c_7', 'cat_c_p1', 'cat_c_p2']
+            ],
+            'should return unique values' => [
+                [
+                    'cat_p' => [1, 2, 3, 1, 3],
+                    'cat_c' => [5, 6, 7, 6]
+                ],
+                ['cat_c_p1', 'cat_c_p2'],
+                ['cat_p_1', 'cat_p_2', 'cat_p_3', 'cat_c_5', 'cat_c_6', 'cat_c_7', 'cat_c_p1', 'cat_c_p2']
+            ]
+        ];
     }
 }
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php
new file mode 100644
index 0000000000000..0839dbfb13373
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Indexer\Test\Unit\Model\Indexer;
+
+use Magento\Framework\App\CacheInterface;
+use Magento\Framework\Event\Manager;
+use Magento\Framework\Indexer\ActionInterface;
+use Magento\Framework\Indexer\CacheContext;
+use Magento\Indexer\Model\Indexer\CacheCleaner;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test cache cleaner plugin
+ */
+class CacheCleanerTest extends TestCase
+{
+    /**
+     * @var Manager|MockObject
+     */
+    private $eventManager;
+    /**
+     * @var CacheContext|MockObject
+     */
+    private $cacheContext;
+    /**
+     * @var CacheInterface|MockObject
+     */
+    private $cache;
+    /**
+     * @var CacheCleaner
+     */
+    private $model;
+    /**
+     * @var ActionInterface|MockObject
+     */
+    private $action;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->action = $this->getMockForAbstractClass(ActionInterface::class);
+        $this->cacheContext = $this->createMock(CacheContext::class);
+        $this->eventManager = $this->createMock(Manager::class);
+        $this->cache = $this->getMockForAbstractClass(CacheInterface::class);
+        $this->model = new CacheCleaner(
+            $this->eventManager,
+            $this->cacheContext,
+            $this->cache
+        );
+    }
+
+    /**
+     * @param array $tags
+     * @param bool $isCacheClean
+     * @dataProvider cacheTagsDataProvider
+     */
+    public function testAfterExecuteFull(array $tags, bool $isCacheClean = true): void
+    {
+        $this->expectCacheClean($tags, $isCacheClean);
+        $this->model->afterExecuteFull($this->action);
+    }
+
+    /**
+     * @param array $tags
+     * @param bool $isCacheClean
+     * @dataProvider cacheTagsDataProvider
+     */
+    public function testAfterExecuteList(array $tags, bool $isCacheClean = true): void
+    {
+        $this->expectCacheClean($tags, $isCacheClean);
+        $this->model->afterExecuteList($this->action);
+    }
+
+    /**
+     * @param array $tags
+     * @param bool $isCacheClean
+     * @dataProvider cacheTagsDataProvider
+     */
+    public function testAfterExecuteRow(array $tags, bool $isCacheClean = true): void
+    {
+        $this->expectCacheClean($tags, $isCacheClean);
+        $this->model->afterExecuteRow($this->action);
+    }
+
+    /**
+     * @return array[]
+     */
+    public function cacheTagsDataProvider(): array
+    {
+        return [
+            [[], false],
+            [['cat_c_1', 'cat_c_2'], true]
+        ];
+    }
+
+    /**
+     * @param array $tags
+     * @param bool $isCacheClean
+     */
+    private function expectCacheClean(array $tags, bool $isCacheClean = true): void
+    {
+        $this->eventManager->expects($this->once())
+            ->method('dispatch')
+            ->with(
+                'clean_cache_by_tags',
+                ['object' => $this->cacheContext]
+            );
+
+        $this->cacheContext->expects($this->atLeastOnce())
+            ->method('getIdentities')
+            ->willReturn($tags);
+
+        $this->cache->expects($this->exactly($isCacheClean ? 1 : 0))
+            ->method('clean')
+            ->with($tags);
+
+        $this->cacheContext->expects($this->exactly($isCacheClean ? 1 : 0))
+            ->method('flush');
+    }
+}
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php b/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php
index a4b734f8ebc83..4c37f4c767fb9 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php
@@ -17,6 +17,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test cache clean plugin
+ */
 class CleanCacheTest extends TestCase
 {
     /**
@@ -103,6 +106,9 @@ public function testAfterUpdateMview()
             ->method('clean')
             ->with($tags);
 
+        $this->contextMock->expects($this->once())
+            ->method('flush');
+
         $this->plugin->afterUpdateMview($this->subjectMock);
     }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index f755a1a1e0282..62620330f6e7b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -13,6 +13,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryLinkManagement;
+use Magento\Catalog\Model\Indexer\Product\Category\Processor;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 use Magento\Eav\Api\Data\AttributeOptionInterface;
@@ -1170,6 +1171,11 @@ public function testSortByPosition()
         $category->setPostedProducts($productPositions);
         $category->save();
 
+        // Reindex products from the result to invalidate query cache.
+        /** @var $indexer Processor */
+        $indexer = Bootstrap::getObjectManager()->get(Processor::class);
+        $indexer->reindexList(array_keys($productPositions));
+
         $queryDesc = <<<QUERY
 {
   products(filter: {category_id: {eq: "$categoryId"}}, sort: {position: ASC}) {
diff --git a/lib/internal/Magento/Framework/Indexer/CacheContext.php b/lib/internal/Magento/Framework/Indexer/CacheContext.php
index 4a6964477ebd5..c0daeda23de9b 100644
--- a/lib/internal/Magento/Framework/Indexer/CacheContext.php
+++ b/lib/internal/Magento/Framework/Indexer/CacheContext.php
@@ -70,9 +70,18 @@ public function getIdentities()
         $identities = [];
         foreach ($this->entities as $cacheTag => $ids) {
             foreach ($ids as $id) {
-                $identities[] = $cacheTag . '_' . $id;
+                $identities[$cacheTag . '_' . $id] = true;
             }
         }
-        return array_merge($identities, array_unique($this->tags));
+        return array_merge(array_keys($identities), array_unique($this->tags));
+    }
+
+    /**
+     * Clear context data
+     */
+    public function flush(): void
+    {
+        $this->tags = [];
+        $this->entities = [];
     }
 }

From b12a471ed41e6f03ca2c1bb1316a17b5601c4859 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Wed, 30 Sep 2020 14:41:27 -0500
Subject: [PATCH 423/671] MC-37934: Unexpected behavior of "Manage Shopping
 Cart" regarding "Products in the Comparison List"

---
 .../Magento/Reports/Model/ResourceModel/Event.php | 15 +++++++--------
 .../Test/Unit/Model/ResourceModel/EventTest.php   |  4 ++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event.php b/app/code/Magento/Reports/Model/ResourceModel/Event.php
index 1f621a3fde39d..a140c7732837e 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event.php
@@ -93,6 +93,7 @@ public function applyLogToCollection(
         $skipIds = []
     ) {
         $idFieldName = $collection->getResource()->getIdFieldName();
+        $predefinedStoreIds = ($collection->getStoreId() === null) ?: [$collection->getStoreId()];
 
         $derivedSelect = $this->getConnection()
             ->select()
@@ -103,7 +104,7 @@ public function applyLogToCollection(
             ->where('event_type_id = ?', (int) $eventTypeId)
             ->where('subject_id = ?', (int) $eventSubjectId)
             ->where('subtype = ?', (int) $subtype)
-            ->where('store_id IN(?)', $this->getCurrentStoreIds())
+            ->where('store_id IN(?)', $this->getCurrentStoreIds($predefinedStoreIds))
             ->group('object_id');
 
         if ($skipIds) {
@@ -132,13 +133,11 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
     {
         $stores = [];
         // get all or specified stores
-        if ($this->_storeManager->getStore()->getId() == 0) {
-            if (null !== $predefinedStoreIds) {
-                $stores = $predefinedStoreIds;
-            } else {
-                foreach ($this->_storeManager->getStores() as $store) {
-                    $stores[] = $store->getId();
-                }
+        if ($predefinedStoreIds !== null) {
+            $stores = $predefinedStoreIds;
+        } else if ($this->_storeManager->getStore()->getId() == 0) {
+            foreach ($this->_storeManager->getStores() as $store) {
+                $stores[] = $store->getId();
             }
         } else {
             // get all stores, required by configuration in current store scope
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
index adb31b52161f8..825ae9d709b9f 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
@@ -174,6 +174,10 @@ public function testApplyLogToCollection()
             ->expects($this->any())
             ->method('getSelect')
             ->willReturn($collectionSelectMock);
+        $collectionMock
+            ->expects($this->any())
+            ->method('getStoreId')
+            ->willReturn(1);
 
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()

From a7180c216d9999bb0931d285765cb1389f9a09ce Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Wed, 30 Sep 2020 17:50:03 -0500
Subject: [PATCH 424/671] MC-37934: Unexpected behavior of "Manage Shopping
 Cart" regarding "Products in the Comparison List"

---
 .../Reports/Model/ResourceModel/Event.php     |  2 +-
 .../customer_for_second_website_rollback.php  |  4 +-
 ...cently_compared_product_second_website.php | 59 +++++++++++++++++++
 ...mpared_product_second_website_rollback.php | 11 ++++
 ...wed_product_by_customer_second_website.php | 53 +++++++++++++++++
 ...ct_by_customer_second_website_rollback.php | 11 ++++
 6 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website_rollback.php

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event.php b/app/code/Magento/Reports/Model/ResourceModel/Event.php
index a140c7732837e..4affe31b4b2fa 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event.php
@@ -135,7 +135,7 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
         // get all or specified stores
         if ($predefinedStoreIds !== null) {
             $stores = $predefinedStoreIds;
-        } else if ($this->_storeManager->getStore()->getId() == 0) {
+        } elseif ($this->_storeManager->getStore()->getId() == 0) {
             foreach ($this->_storeManager->getStores() as $store) {
                 $stores[] = $store->getId();
             }
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_rollback.php
index 4d8c524cf8f5f..b93e9e68dfc2c 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_rollback.php
@@ -21,16 +21,16 @@
 $customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
 /** @var WebsiteRepositoryInterface $websiteRepository */
 $websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
-$websiteId = $websiteRepository->get('test')->getId();
 
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
 try {
+    $websiteId = $websiteRepository->get('test')->getId();
     $customer = $customerRepository->get('customer@example.com', $websiteId);
     $customerRepository->delete($customer);
 } catch (NoSuchEntityException $e) {
-    //customer already deleted
+    //customer or website already deleted
 }
 
 $registry->unregister('isSecureArea');
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website.php
new file mode 100644
index 0000000000000..3e05a9b05137a
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\Observer;
+use Magento\Reports\Observer\CatalogProductCompareAddProductObserver;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Catalog\Model\Indexer\Category\Product as CategoryProductIndexer;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_two_websites.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_for_second_website.php');
+
+$objectManager = Bootstrap::getObjectManager();
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$websiteId = $storeManager->getStore('fixture_second_store')->getWebsiteId();
+$customer = $customerRepository->get('customer@example.com', $websiteId);
+/** @var MutableScopeConfigInterface $config */
+$config = $objectManager->get(MutableScopeConfigInterface::class);
+$originValues = [
+    'reports/options/enabled' => $config->getValue('reports/options/enabled'),
+    'reports/options/product_compare_enabled' => $config->getValue('reports/options/product_compare_enabled'),
+];
+$storeManager->setCurrentStore($storeManager->getStore('fixture_second_store')->getId());
+
+try {
+    /** @var CategoryProductIndexer $indexer */
+    $indexer = $objectManager->create(CategoryProductIndexer::class);
+    $indexer->executeFull();
+    $config->setValue('reports/options/enabled', 1);
+    $config->setValue('reports/options/product_compare_enabled', 1);
+    /** @var Session $session */
+    $session = $objectManager->get(Session::class);
+    $session->loginById($customer->getId());
+    $session->setCustomerId($customer->getId());
+    /** @var ProductRepositoryInterface $productRepository */
+    $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    $product = $productRepository->get('simple-on-two-websites');
+    $event = new DataObject(['product' => $product]);
+    /** @var CatalogProductCompareAddProductObserver $reportObserver */
+    $reportObserver = $objectManager->get(CatalogProductCompareAddProductObserver::class);
+    $reportObserver->execute(new Observer(['event' => $event]));
+} finally {
+    $session->logout();
+    foreach ($originValues as $key => $value) {
+        $config->setValue($key, $value);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website_rollback.php
new file mode 100644
index 0000000000000..db53a60ed6787
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_compared_product_second_website_rollback.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_two_websites_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_for_second_website_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website.php
new file mode 100644
index 0000000000000..af0970666c6fa
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\App\Config\MutableScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\Observer;
+use Magento\Reports\Observer\CatalogProductViewObserver;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+use Magento\Catalog\Model\Indexer\Category\Product as CategoryProductIndexer;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_two_websites.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_for_second_website.php');
+
+$objectManager = Bootstrap::getObjectManager();
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$websiteId = $storeManager->getStore('fixture_second_store')->getWebsiteId();
+$customer = $customerRepository->get('customer@example.com', $websiteId);
+/** @var MutableScopeConfigInterface $config */
+$config = $objectManager->get(MutableScopeConfigInterface::class);
+$originalValue = $config->getValue('reports/options/enabled');
+$storeManager->setCurrentStore($storeManager->getStore('fixture_second_store')->getId());
+
+try {
+    /** @var CategoryProductIndexer $indexer */
+    $indexer = $objectManager->create(CategoryProductIndexer::class);
+    $indexer->executeFull();
+    $config->setValue('reports/options/enabled', 1);
+    /** @var Session $session */
+    $session = $objectManager->get(Session::class);
+    $session->loginById($customer->getId());
+    $session->setCustomerId($customer->getId());
+    /** @var ProductRepositoryInterface $productRepository */
+    $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+    $product = $productRepository->get('simple-on-two-websites');
+    $event = new DataObject(['product' => $product]);
+    /** @var CatalogProductViewObserver $reportObserver */
+    $reportObserver = $objectManager->get(CatalogProductViewObserver::class);
+    $reportObserver->execute(new Observer(['event' => $event]));
+} finally {
+    $session->logout();
+    $config->setValue('reports/options/enabled', $originalValue);
+}
diff --git a/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website_rollback.php
new file mode 100644
index 0000000000000..db53a60ed6787
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/_files/recently_viewed_product_by_customer_second_website_rollback.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_two_websites_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_for_second_website_rollback.php');

From 8833cd2a5d1b4f0044177f7c6f3da6d2b993c266 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Thu, 1 Oct 2020 18:08:46 -0500
Subject: [PATCH 425/671] MC-37934: Unexpected behavior of "Manage Shopping
 Cart" regarding "Products in the Comparison List"

---
 .../Reports/Model/ResourceModel/Event.php     |  4 ++-
 .../Unit/Model/ResourceModel/EventTest.php    | 29 +++++++++++++++++--
 2 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event.php b/app/code/Magento/Reports/Model/ResourceModel/Event.php
index 4affe31b4b2fa..d27b8a03fecec 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event.php
@@ -93,7 +93,9 @@ public function applyLogToCollection(
         $skipIds = []
     ) {
         $idFieldName = $collection->getResource()->getIdFieldName();
-        $predefinedStoreIds = ($collection->getStoreId() === null) ?: [$collection->getStoreId()];
+        $predefinedStoreIds = ($collection->getStoreId() === null)
+            ? null
+            : [$collection->getStoreId()];
 
         $derivedSelect = $this->getConnection()
             ->select()
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
index 825ae9d709b9f..cca96deecfc55 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
@@ -134,9 +134,13 @@ public function testUpdateCustomerTypeWithType()
     }
 
     /**
+     * @dataProvider getApplyLogToCollectionDataProvider
+     * @param null|array $storeId
+     * @param null|array $storeIdSelect
+     *
      * @return void
      */
-    public function testApplyLogToCollection()
+    public function testApplyLogToCollection($storeId, $storeIdSelect)
     {
         $derivedSelect = 'SELECT * FROM table';
         $idFieldName = 'IdFieldName';
@@ -160,6 +164,7 @@ public function testApplyLogToCollection()
             ->willReturnSelf();
 
         $collectionMock = $this->getMockBuilder(AbstractDb::class)
+            ->setMethods(['getResource', 'getIdFieldName', 'getSelect', 'getStoreId'])
             ->disableOriginalConstructor()
             ->getMock();
         $collectionMock
@@ -177,7 +182,7 @@ public function testApplyLogToCollection()
         $collectionMock
             ->expects($this->any())
             ->method('getStoreId')
-            ->willReturn(1);
+            ->willReturn($storeId);
 
         $selectMock = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
@@ -199,6 +204,16 @@ public function testApplyLogToCollection()
             ->expects($this->any())
             ->method('__toString')
             ->willReturn($derivedSelect);
+        $selectMock
+            ->expects($this->any())
+            ->method('where')
+            ->withConsecutive([
+                ['event_type_id = ?', 1],
+                ['subject_id = ?', 1],
+                ['subtype = ?', 1],
+                ['store_id IN(?)', $storeIdSelect]
+            ])
+            ->willReturn($selectMock);
 
         $this->connectionMock
             ->expects($this->once())
@@ -213,6 +228,16 @@ public function testApplyLogToCollection()
         $this->event->applyLogToCollection($collectionMock, 1, 1, 1);
     }
 
+    /**
+     * @return array
+     */
+    public function getApplyLogToCollectionDataProvider()
+    {
+        return [
+            ['storeId' => 1, 'storeIdSelect' => [1]],
+            ['storeId' => null, 'storeIdSelect' => [1]],
+        ];
+    }
     /**
      * @return void
      */

From 33b3e40684049a01b9b5ae4e75a1300b9833b2b1 Mon Sep 17 00:00:00 2001
From: Victor Rad <vrad@magento.com>
Date: Thu, 1 Oct 2020 18:39:33 -0500
Subject: [PATCH 426/671] MC-37934: Unexpected behavior of "Manage Shopping
 Cart" regarding "Products in the Comparison List"

---
 .../Reports/Test/Unit/Model/ResourceModel/EventTest.php      | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
index cca96deecfc55..bc064a434fa32 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/EventTest.php
@@ -207,13 +207,12 @@ public function testApplyLogToCollection($storeId, $storeIdSelect)
         $selectMock
             ->expects($this->any())
             ->method('where')
-            ->withConsecutive([
+            ->willReturnMap([
                 ['event_type_id = ?', 1],
                 ['subject_id = ?', 1],
                 ['subtype = ?', 1],
                 ['store_id IN(?)', $storeIdSelect]
-            ])
-            ->willReturn($selectMock);
+            ]);
 
         $this->connectionMock
             ->expects($this->once())

From 2ee63de2e0ea9fd01d53b5a6dbf566d93fbbc399 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Thu, 1 Oct 2020 20:38:57 -0500
Subject: [PATCH 427/671] MC-37371: Wrong currency sign in Credit Memo grid

- fixed
- modified unit test
---
 .../Ui/Component/Listing/Column/PriceTest.php | 74 +++++++++++++++----
 .../Ui/Component/Listing/Column/Price.php     | 18 ++++-
 2 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php
index e3c1c0cc32a3f..4a9061c3f3c5c 100644
--- a/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Ui/Component/Listing/Column/PriceTest.php
@@ -12,6 +12,8 @@
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponent\Processor;
 use Magento\Sales\Ui\Component\Listing\Column\Price;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -27,6 +29,11 @@ class PriceTest extends TestCase
      */
     protected $currencyMock;
 
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -40,31 +47,45 @@ protected function setUp(): void
             ->setMethods(['load', 'format'])
             ->disableOriginalConstructor()
             ->getMock();
+        $this->storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->model = $objectManager->getObject(
             Price::class,
-            ['currency' => $this->currencyMock, 'context' => $contextMock]
+            ['currency' => $this->currencyMock, 'context' => $contextMock, 'storeManager' => $this->storeManagerMock]
         );
     }
 
-    public function testPrepareDataSource()
+    /**
+     * @param $hasCurrency
+     * @param $dataSource
+     * @param $currencyCode
+     * @dataProvider testPrepareDataSourceDataProvider
+     */
+    public function testPrepareDataSource($hasCurrency, $dataSource, $currencyCode)
     {
         $itemName = 'itemName';
         $oldItemValue = 'oldItemValue';
         $newItemValue = 'newItemValue';
-        $dataSource = [
-            'data' => [
-                'items' => [
-                    [
-                        $itemName => $oldItemValue,
-                        'base_currency_code' => 'US'
-                    ]
-                ]
-            ]
-        ];
+
+        $store = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $currencyMock->expects($hasCurrency ? $this->never() : $this->once())
+            ->method('getCurrencyCode')
+            ->willReturn($currencyCode);
+        $this->storeManagerMock->expects($hasCurrency ? $this->never() : $this->once())
+            ->method('getStore')
+            ->willReturn($store);
+        $store->expects($hasCurrency ? $this->never() : $this->once())
+            ->method('getBaseCurrency')
+            ->willReturn($currencyMock);
 
         $this->currencyMock->expects($this->once())
             ->method('load')
-            ->with($dataSource['data']['items'][0]['base_currency_code'])
             ->willReturnSelf();
 
         $this->currencyMock->expects($this->once())
@@ -76,4 +97,31 @@ public function testPrepareDataSource()
         $dataSource = $this->model->prepareDataSource($dataSource);
         $this->assertEquals($newItemValue, $dataSource['data']['items'][0][$itemName]);
     }
+
+    public function testPrepareDataSourceDataProvider()
+    {
+        $dataSource1 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue',
+                        'base_currency_code' => 'US'
+                    ]
+                ]
+            ]
+        ];
+        $dataSource2 = [
+            'data' => [
+                'items' => [
+                    [
+                        'itemName' => 'oldItemValue'
+                    ]
+                ]
+            ]
+        ];
+        return [
+            [true, $dataSource1, 'US'],
+            [false, $dataSource2, 'SAR'],
+        ];
+    }
 }
diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
index 8780ce10375ec..238d79766b59a 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
@@ -9,6 +9,7 @@
 
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Ui\Component\Listing\Columns\Column;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Directory\Model\Currency;
@@ -28,6 +29,11 @@ class Price extends Column
      */
     private $currency;
 
+    /**
+     * @var StoreManagerInterface|null
+     */
+    private $storeManager;
+
     /**
      * Constructor
      *
@@ -37,6 +43,7 @@ class Price extends Column
      * @param array $components
      * @param array $data
      * @param Currency $currency
+     * @param StoreManagerInterface|null $storeManager
      */
     public function __construct(
         ContextInterface $context,
@@ -44,11 +51,14 @@ public function __construct(
         PriceCurrencyInterface $priceFormatter,
         array $components = [],
         array $data = [],
-        Currency $currency = null
+        Currency $currency = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->priceFormatter = $priceFormatter;
         $this->currency = $currency ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->create(Currency::class);
+        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->create(StoreManagerInterface::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 
@@ -63,6 +73,12 @@ public function prepareDataSource(array $dataSource)
         if (isset($dataSource['data']['items'])) {
             foreach ($dataSource['data']['items'] as & $item) {
                 $currencyCode = isset($item['base_currency_code']) ? $item['base_currency_code'] : null;
+                if (!$currencyCode) {
+                    $store = $this->storeManager->getStore(
+                        $this->context->getFilterParam('store_id', \Magento\Store\Model\Store::DEFAULT_STORE_ID)
+                    );
+                    $currencyCode = $store->getBaseCurrency()->getCurrencyCode();
+                }
                 $basePurchaseCurrency = $this->currency->load($currencyCode);
                 $item[$this->getData('name')] = $basePurchaseCurrency
                     ->format($item[$this->getData('name')], [], false);

From f9f3725e1326a375cecbd8fd1c70125d35adeaba Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 2 Oct 2020 13:56:37 +0300
Subject: [PATCH 428/671] magento/magento2#29196: Avoids endless loop of
 indexers being marked as invalid.

---
 .../Console/Command/IndexerReindexCommand.php  | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 6abc2b242a9d1..ad286bcd1f81e 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -64,7 +64,7 @@ public function __construct(
     ) {
         $this->indexerRegistry = $indexerRegistry;
         $this->dependencyInfoProvider = $dependencyInfoProvider;
-        $this->makeSharedValid = $makeSharedValid ?: ObjectManager::getInstance()->get(MakeSharedIndexValid::class);
+        $this->makeSharedValid = $makeSharedValid;
         parent::__construct($objectManagerFactory);
     }
 
@@ -99,7 +99,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 // Skip indexers having shared index that was already complete
                 if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
                     $indexer->reindexAll();
-                    if (!empty($sharedIndex) && $this->makeSharedValid->execute($sharedIndex)) {
+                    if (!empty($sharedIndex) && $this->getMakeSharedValid()->execute($sharedIndex)) {
                         $this->sharedIndexesComplete[] = $sharedIndex;
                     }
                 }
@@ -253,4 +253,18 @@ private function getDependencyInfoProvider()
         }
         return $this->dependencyInfoProvider;
     }
+
+    /**
+     * Get MakeSharedIndexValid processor.
+     *
+     * @return MakeSharedIndexValid
+     */
+    private function getMakeSharedValid(): MakeSharedIndexValid
+    {
+        if (!$this->makeSharedValid) {
+            $this->makeSharedValid = $this->getObjectManager()->get(MakeSharedIndexValid::class);
+        }
+
+        return $this->makeSharedValid;
+    }
 }

From ce1263da089d5b8ca28bc8689480092db0924d33 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@mediotype.com>
Date: Fri, 2 Oct 2020 13:12:36 +0200
Subject: [PATCH 429/671] Fix exception which is thrown on search results page

---
 app/code/Magento/Search/Model/SynonymAnalyzer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
index eea6a950d7ce5..5b6e04b8321fe 100644
--- a/app/code/Magento/Search/Model/SynonymAnalyzer.php
+++ b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -137,6 +137,7 @@ private function getSearchPattern(array $words): string
         $patterns = [];
         for ($lastItem = count($words); $lastItem > 0; $lastItem--) {
             $phrase = implode("\s+", \array_slice($words, 0, $lastItem));
+            $phrase = preg_quote($phrase, '/');
             $patterns[] = '^' . $phrase . ',';
             $patterns[] = ',' . $phrase . ',';
             $patterns[] = ',' . $phrase . '$';

From b1de332f0e5823379e2f049a38c10f4f38b412a8 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Fri, 2 Oct 2020 14:13:54 +0300
Subject: [PATCH 430/671] Refactoring the test

---
 .../AdminOpenCmsBlocksGridActionGroup.xml     | 19 +++++
 ...inPressAddNewCmsBlockButtonActionGroup.xml | 19 +++++
 ...dminPressSaveCmsBlockButtonActionGroup.xml | 19 +++++
 ...dminSelectCMSBlockStoreViewActionGroup.xml | 17 ++++
 ...AssertAdminProperUrlIsShownActionGroup.xml | 21 +++++
 .../Test/Mftf/Test/CheckStaticBlocksTest.xml  | 78 +++++++++++--------
 6 files changed, 139 insertions(+), 34 deletions(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
new file mode 100644
index 0000000000000..fca85651f7fda
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="AdminOpenCmsBlocksGridActionGroup">
+    <annotations>
+        <description>Goes to the Cms Blocks grid page.</description>
+    </annotations>
+
+    <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
+    <waitForPageLoad stepKey="waitForPageLoad"/>
+</actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml
new file mode 100644
index 0000000000000..17fc1cd7bdc50
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="AdminPressAddNewCmsBlockButtonActionGroup">
+        <annotations>
+            <description>Press Add new block button on Cms Blocks gid page</description>
+        </annotations>
+
+        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="clickOnAddNewBlockButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml
new file mode 100644
index 0000000000000..a45e5ed6b9fbf
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml
@@ -0,0 +1,19 @@
+<?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="AdminPressSaveCmsBlockButtonActionGroup">
+        <annotations>
+            <description>Press save button on Cms Block page</description>
+        </annotations>
+
+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="clickOnSaveBlock"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..8c543e29c1ed7
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AdminSelectCMSBlockStoreViewActionGroup">
+        <arguments>
+            <argument name="storeViewName" type="string"/>
+        </arguments>
+
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView" />
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml
new file mode 100644
index 0000000000000..fb97c9656aca2
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml
@@ -0,0 +1,21 @@
+<?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="AssertAdminProperUrlIsShownActionGroup">
+        <annotations>
+            <description>Assert current page has proper URL</description>
+        </annotations>
+        <arguments>
+            <argument name="target_path" type="string"/>
+        </arguments>
+
+        <seeInCurrentUrl url="{{target_path}}" stepKey="seePropertUrl"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
index eba7812e29a0c..490e11d3cc751 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml
@@ -21,8 +21,7 @@
         </annotations>
 
         <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
-
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createAdditionalWebsite">
                 <argument name="newWebsiteName" value="{{customWebsite.name}}"/>
                 <argument name="websiteCode" value="{{customWebsite.code}}"/>
@@ -39,49 +38,60 @@
         </before>
 
         <after>
-            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="DeleteWebsite">
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="{{customWebsite.name}}"/>
             </actionGroup>
-            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
+            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="deleteCMSBlock"/>
+            <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="deleteSecondCMSBlock"/>
             <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <!--Go to Cms blocks page-->
-        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSPagesGrid"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <seeInCurrentUrl url="cms/block/" stepKey="VerifyPageIsOpened"/>
+        <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="navigateToCMSBlocksGrid"/>
+        <actionGroup ref="AssertAdminProperUrlIsShownActionGroup" stepKey="verifyPageIsOpened">
+                <argument name="target_path" value="cms/block/"/>
+        </actionGroup>
+
         <!--Click to create new block-->
-        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened"/>
+        <actionGroup ref="AdminPressAddNewCmsBlockButtonActionGroup" stepKey="clickOnAddNewBlockButton"/>
+        <actionGroup ref="AssertAdminProperUrlIsShownActionGroup" stepKey="verifyNewCmsBlockPageIsOpened">
+            <argument name="target_path" value="cms/block/new"/>
+        </actionGroup>
         <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent"/>
-        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <see userInput="You saved the block." stepKey="VerifyBlockIsSaved"/>
-        <!--Click to go back and add new block-->
-        <click selector="{{BlockNewPagePageActionsSection.back}}" stepKey="ClickToGoBack"/>
-        <waitForPageLoad stepKey="waitForPageLoad4"/>
-        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock1"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
-        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened1"/>
+        <actionGroup ref="AdminPressSaveCmsBlockButtonActionGroup" stepKey="saveCmsBlock"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertSuccessMessage">
+            <argument name="message" value="You saved the block."/>
+        </actionGroup>
+
         <!--Add new BLock with the same data-->
+        <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="openCmsBlocksGrid"/>
+        <actionGroup ref="AdminPressAddNewCmsBlockButtonActionGroup" stepKey="pressAddNewBlockButton"/>
+        <actionGroup ref="AssertAdminProperUrlIsShownActionGroup" stepKey="assertNewCmsBlockPageIsOpened">
+            <argument name="target_path" value="cms/block/new"/>
+        </actionGroup>
         <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent1"/>
-        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock1"/>
-        <waitForPageLoad stepKey="waitForPageLoad6"/>
-        <!--Verify that corresponding message is displayed-->
-        <see userInput="A block identifier with the same properties already exists in the selected store." stepKey="VerifyBlockIsSaved1"/>
-        <!--Click to go back and add new block-->
-        <click selector="{{BlockNewPagePageActionsSection.back}}" stepKey="ClickToGoBack1"/>
-        <waitForPageLoad stepKey="waitForPageLoad7"/>
-        <click selector="{{BlockPageActionsSection.addNewBlock}}" stepKey="ClickToAddNewBlock2"/>
-        <waitForPageLoad stepKey="waitForPageLoad8"/>
-        <seeInCurrentUrl url="cms/block/new" stepKey="VerifyNewBlockPageIsOpened2"/>
+        <actionGroup ref="AdminPressSaveCmsBlockButtonActionGroup" stepKey="clickOnSaveButton"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="assertErrorMessage">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="A block identifier with the same properties already exists in the selected store."/>
+        </actionGroup>
+
         <!--Add new BLock with the same data for another store view-->
+        <actionGroup ref="AdminOpenCmsBlocksGridActionGroup" stepKey="goToCmsBlocksGrid"/>
+        <actionGroup ref="AdminPressAddNewCmsBlockButtonActionGroup" stepKey="clickToAddNewButton"/>
+        <actionGroup ref="AssertAdminProperUrlIsShownActionGroup" stepKey="confirmNewCmsBlockPageIsOpened">
+            <argument name="target_path" value="cms/block/new"/>
+        </actionGroup>
         <actionGroup ref="FillOutBlockContent" stepKey="FillOutBlockContent2"/>
-        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="Default Store View" stepKey="selectDefaultStoreView" />
-        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{customStore.name}}" stepKey="selectSecondStoreView1" />
-        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="ClickToSaveBlock2"/>
-        <waitForPageLoad stepKey="waitForPageLoad9"/>
-        <see userInput="You saved the block." stepKey="VerifyBlockIsSaved2"/>
+
+        <actionGroup ref="AdminSelectCMSBlockStoreViewActionGroup" stepKey="selectCustomStoreView">
+             <argument name="storeViewName" value="{{customStore.name}}"/>
+        </actionGroup>
+
+        <actionGroup ref="AdminPressSaveCmsBlockButtonActionGroup" stepKey="saveNewCmsBlock"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="verifyBlockIsSaved">
+            <argument name="message" value="You saved the block."/>
+        </actionGroup>
     </test>
 </tests>

From ccec05add626879219b858485d8c06aeecc1a145 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@mediotype.com>
Date: Fri, 2 Oct 2020 13:27:15 +0200
Subject: [PATCH 431/671] Modify unit test to cover for buggy use case

---
 .../Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php b/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
index 8751c8a4f3ec0..9e6d087f72f99 100644
--- a/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
+++ b/app/code/Magento/Search/Test/Unit/Model/SynonymAnalyzerTest.php
@@ -49,9 +49,9 @@ protected function setUp(): void
      */
     public function testGetSynonymsForPhrase()
     {
-        $phrase = 'Elizabeth is the british queen';
+        $phrase = 'Elizabeth/Angela is the british queen';
         $expected = [
-            0 => [ 0 => "Elizabeth" ],
+            0 => [ 0 => "Elizabeth/Angela" ],
             1 => [ 0 => "is" ],
             2 => [ 0 => "the" ],
             3 => [ 0 => "british", 1 => "english" ],

From d59ad58d924f50350908ae504bbff46ebdef59d6 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 2 Oct 2020 15:50:04 +0300
Subject: [PATCH 432/671] MC-38048: Incorrect default country displayed on
 shipping page when store view is changed in cart. Part 2

---
 .../Checkout/view/frontend/web/js/view/shipping.js        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 646e6156ec646..4e82c05f0385a 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -121,7 +121,13 @@ define([
                     );
                 }
                 checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
-                    checkoutData.setShippingAddressFromData(shippingAddrsData);
+                    //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
+                    if (quote.shippingAddress().countryId !== shippingAddrsData.country_id &&
+                        (shippingAddrsData.postcode || shippingAddrsData.region_id)
+                    ) {
+                        checkoutData.setShippingAddressFromData(shippingAddrsData);
+                    }
+                    //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
                 });
                 shippingRatesValidator.initFields(fieldsetName);
             });

From 48216f3e13d04b8755b70f8b9b1399d87a33ab91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Mon, 28 Sep 2020 23:52:32 +0200
Subject: [PATCH 433/671] Fix #11175 - i18n:collect-phrases -m can't find many
 important magento phrases

---
 .../Setup/Module/I18n/Parser/Adapter/Html.php | 30 ++++++++--
 .../Module/I18n/Parser/Adapter/HtmlTest.php   | 56 ++++++++++---------
 .../I18n/Parser/Adapter/_files/email.html     |  2 +
 3 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
index cf38fd70884f3..ec62ab8b84482 100644
--- a/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
+++ b/setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php
@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Setup\Module\I18n\Parser\Adapter;
 
+use Exception;
 use Magento\Email\Model\Template\Filter;
 
 /**
@@ -16,17 +19,30 @@ class Html extends AbstractAdapter
      * Covers
      * <span><!-- ko i18n: 'Next'--><!-- /ko --></span>
      * <th class="col col-method" data-bind="i18n: 'Select Method'"></th>
+     * @deprecated Not used anymore because of newly introduced constant
+     * @see self::HTML_REGEX_LIST
      */
     const HTML_FILTER = "/i18n:\s?'(?<value>[^'\\\\]*(?:\\\\.[^'\\\\]*)*)'/i";
 
+    private const HTML_REGEX_LIST = [
+        // <span><!-- ko i18n: 'Next'--><!-- /ko --></span>
+        // <th class="col col-method" data-bind="i18n: 'Select Method'"></th>
+        "/i18n:\s?'(?<value>[^'\\\\]*(?:\\\\.[^'\\\\]*)*)'/i",
+        // <translate args="'System Messages'"/>
+        // <span translate="'Examples'"></span>
+        "/translate( args|)=\"'(?<value>[^\"\\\\]*(?:\\\\.[^\"\\\\]*)*)'\"/i"
+    ];
+
     /**
      * @inheritdoc
      */
     protected function _parse()
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $data = file_get_contents($this->_file);
         if ($data === false) {
-            throw new \Exception('Failed to load file from disk.');
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
+            throw new Exception('Failed to load file from disk.');
         }
 
         $results = [];
@@ -37,15 +53,19 @@ protected function _parse()
                 if (preg_match(Filter::TRANS_DIRECTIVE_REGEX, $results[$i][2], $directive) !== 1) {
                     continue;
                 }
+
                 $quote = $directive[1];
                 $this->_addPhrase($quote . $directive[2] . $quote);
             }
         }
 
-        preg_match_all(self::HTML_FILTER, $data, $results, PREG_SET_ORDER);
-        for ($i = 0, $count = count($results); $i < $count; $i++) {
-            if (!empty($results[$i]['value'])) {
-                $this->_addPhrase($results[$i]['value']);
+        foreach (self::HTML_REGEX_LIST as $regex) {
+            preg_match_all($regex, $data, $results, PREG_SET_ORDER);
+
+            for ($i = 0, $count = count($results); $i < $count; $i++) {
+                if (!empty($results[$i]['value'])) {
+                    $this->_addPhrase($results[$i]['value']);
+                }
             }
         }
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/HtmlTest.php b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/HtmlTest.php
index 15c442e9bac98..d7a2f0b4a9397 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/HtmlTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/HtmlTest.php
@@ -7,33 +7,25 @@
 
 namespace Magento\Setup\Test\Unit\Module\I18n\Parser\Adapter;
 
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Setup\Module\I18n\Parser\Adapter\Html;
 use PHPUnit\Framework\TestCase;
 
 class HtmlTest extends TestCase
 {
     /**
-     * @var string
-     */
-    protected $_testFile;
-
-    /**
-     * @var int
+     * @var Html
      */
-    protected $_stringsCount;
+    private $model;
 
     /**
-     * @var Html
+     * @var string
      */
-    protected $_adapter;
+    private $testFile;
 
     protected function setUp(): void
     {
-        $this->_testFile = str_replace('\\', '/', realpath(dirname(__FILE__))) . '/_files/email.html';
-        $this->_stringsCount = count(file($this->_testFile));
-
-        $this->_adapter = (new ObjectManager($this))->getObject(Html::class);
+        $this->testFile = str_replace('\\', '/', realpath(__DIR__)) . '/_files/email.html';
+        $this->model = new Html();
     }
 
     public function testParse()
@@ -41,68 +33,80 @@ public function testParse()
         $expectedResult = [
             [
                 'phrase' => 'Phrase 1',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '\'',
             ],
             [
                 'phrase' => 'Phrase 2 with %a_lot of extra info for the brilliant %customer_name.',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '"',
             ],
             [
                 'phrase' => 'This is test data',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => 'This is test data at right side of attr',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => 'This is \\\' test \\\' data',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => 'This is \\" test \\" data',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => 'This is test data with a quote after',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => 'This is test data with space after ',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => '\\\'',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
             [
                 'phrase' => '\\\\\\\\ ',
-                'file' => $this->_testFile,
+                'file' => $this->testFile,
+                'line' => '',
+                'quote' => '',
+            ],
+            [
+                'phrase' => 'This is test content in translate tag',
+                'file' => $this->testFile,
+                'line' => '',
+                'quote' => '',
+            ],
+            [
+                'phrase' => 'This is test content in translate attribute',
+                'file' => $this->testFile,
                 'line' => '',
                 'quote' => '',
             ],
         ];
 
-        $this->_adapter->parse($this->_testFile);
+        $this->model->parse($this->testFile);
 
-        $this->assertEquals($expectedResult, $this->_adapter->getPhrases());
+        $this->assertEquals($expectedResult, $this->model->getPhrases());
     }
 }
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/email.html b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/email.html
index 90579b48a07b5..f5603768ef306 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/email.html
+++ b/setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/email.html
@@ -29,5 +29,7 @@
     <label data-bind="i18n: ''"></label>
     <label data-bind="i18n: '\''"></label>
     <label data-bind="i18n: '\\\\ '"></label>
+    <span><translate args="'This is test content in translate tag'" /></span>
+    <span translate="'This is test content in translate attribute'"></span>
 </body>
 </html>

From c0a9c422053ab85c4f3f77bb337196764c4ed149 Mon Sep 17 00:00:00 2001
From: naitsirch <naitsirch@e.mail.de>
Date: Fri, 2 Oct 2020 16:15:49 +0200
Subject: [PATCH 434/671] Fix array to string conversion error when saving row
 system config with defaults

This PR solves issue #30314. The backend model that is designed to handle complex values serializes non-scalar values before they are persisted to database. But when the old value is loaded from config defaults (defined in config.xml) for comparison, the default value is fetched as array. When the array is casted to string it results in an array to string conversion error.

This issue is fixed by serializing the default value coming from the config.
---
 .../Model/Config/Backend/Serialized.php       | 23 ++++++++++++++
 .../Model/Config/Backend/SerializedTest.php   | 30 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
index 6e0b6275db836..88fdae8908797 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Serialized.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Config\Model\Config\Backend;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
 
@@ -84,4 +85,26 @@ public function beforeSave()
         parent::beforeSave();
         return $this;
     }
+
+    /**
+     * Get old value from existing config
+     *
+     * @return string
+     */
+    public function getOldValue()
+    {
+        // If the value is retrieved from defaults defined in config.xml
+        // it may be returned as an array.
+        $value = $this->_config->getValue(
+            $this->getPath(),
+            $this->getScope() ?: ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+            $this->getScopeCode()
+        );
+
+        if (is_array($value)) {
+            return $this->serializer->serialize($value);
+        }
+
+        return (string)$value;
+    }
 }
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
index c509b515b3112..90a381cff714b 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
@@ -8,6 +8,7 @@
 namespace Magento\Config\Test\Unit\Model\Config\Backend;
 
 use Magento\Config\Model\Config\Backend\Serialized;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -27,11 +28,14 @@ class SerializedTest extends TestCase
     /** @var LoggerInterface|MockObject */
     private $loggerMock;
 
+    private $scopeConfigMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
         $this->serializerMock = $this->createMock(Json::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+        $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
         $contextMock = $this->createMock(Context::class);
         $eventManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
         $contextMock->method('getEventDispatcher')
@@ -43,6 +47,7 @@ protected function setUp(): void
             [
                 'serializer' => $this->serializerMock,
                 'context' => $contextMock,
+                'config' => $this->scopeConfigMock,
             ]
         );
     }
@@ -135,4 +140,29 @@ public function beforeSaveDataProvider()
             ]
         ];
     }
+
+    /**
+     * If a config value is not available in core_confid_data the defaults are
+     * loaded from the config.xml file. Those defaults may be arrays.
+     * The Serialized backend model has to override its parent
+     * getOldValue function, to prevent an array to string conversion error
+     * and serialize those values.
+     */
+    public function testGetOldValueWithNonScalarDefaultValue(): void
+    {
+        $value = [
+            ['foo' => '1', 'bar' => '2'],
+        ];
+        $serializedValue = \json_encode($value);
+
+        $this->scopeConfigMock->method('getValue')->willReturn($value);
+        $this->serializerMock->method('serialize')->willReturn($serializedValue);
+
+        $this->serializedConfig->setData('value', $serializedValue);
+
+        $oldValue = $this->serializedConfig->getOldValue();
+
+        $this->assertIsString($oldValue, 'Default value from the config is not serialized.');
+        $this->assertSame($serializedValue, $oldValue);
+    }
 }

From 1ee63d4bfd031d2fbba27ef104f85cfe1f136e9a Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Thu, 1 Oct 2020 18:10:20 -0500
Subject: [PATCH 435/671] MC-38114: Custom address attribute Multiselect are
 not correctly displayed on checkout and order page

- Fix multiple select option IDs are displayed instead of option labels on checkout page
---
 .../view/frontend/web/js/checkout-data.js     |  7 ++--
 .../frontend/web/js/view/billing-address.js   | 37 ++++++++++++++++---
 .../address-renderer/default.js               | 37 ++++++++++++++++---
 .../address-renderer/default.js               | 37 ++++++++++++++++---
 4 files changed, 100 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
index 1858ce946fb07..5c51fbb01f873 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js
@@ -11,8 +11,9 @@
 define([
     'jquery',
     'Magento_Customer/js/customer-data',
+    'mageUtils',
     'jquery/jquery-storageapi'
-], function ($, storage) {
+], function ($, storage, utils) {
     'use strict';
 
     var cacheKey = 'checkout-data',
@@ -88,7 +89,7 @@ define([
         setShippingAddressFromData: function (data) {
             var obj = getData();
 
-            obj.shippingAddressFromData = data;
+            obj.shippingAddressFromData = utils.filterFormData(data);
             saveData(obj);
         },
 
@@ -193,7 +194,7 @@ define([
         setBillingAddressFromData: function (data) {
             var obj = getData();
 
-            obj.billingAddressFromData = data;
+            obj.billingAddressFromData = utils.filterFormData(data);
             saveData(obj);
         },
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
index f850386890470..127aa6ef01f55 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/billing-address.js
@@ -245,7 +245,7 @@ function (
          * @returns {*}
          */
         getCustomAttributeLabel: function (attribute) {
-            var resultAttribute;
+            var label;
 
             if (typeof attribute === 'string') {
                 return attribute;
@@ -255,13 +255,40 @@ function (
                 return attribute.label;
             }
 
-            if (typeof this.source.get('customAttributes') !== 'undefined') {
-                resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
-                    value: attribute.value
+            if (_.isArray(attribute.value)) {
+                label = _.map(attribute.value, function (value) {
+                    return this.getCustomAttributeOptionLabel(attribute['attribute_code'], value) || value;
+                }, this).join(', ');
+            } else {
+                label = this.getCustomAttributeOptionLabel(attribute['attribute_code'], attribute.value);
+            }
+
+            return label || attribute.value;
+        },
+
+        /**
+         * Get option label for given attribute code and option ID
+         *
+         * @param {String} attributeCode
+         * @param {String} value
+         * @returns {String|null}
+         */
+        getCustomAttributeOptionLabel: function (attributeCode, value) {
+            var option,
+                label,
+                options = this.source.get('customAttributes') || {};
+
+            if (options[attributeCode]) {
+                option = _.findWhere(options[attributeCode], {
+                    value: value
                 });
+
+                if (option) {
+                    label = option.label;
+                }
             }
 
-            return resultAttribute && resultAttribute.label || attribute.value;
+            return label;
         }
     });
 });
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
index 1f8cc90fe1622..3a4f34c26e5d7 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-address/address-renderer/default.js
@@ -55,7 +55,7 @@ define([
          * @returns {*}
          */
         getCustomAttributeLabel: function (attribute) {
-            var resultAttribute;
+            var label;
 
             if (typeof attribute === 'string') {
                 return attribute;
@@ -65,13 +65,40 @@ define([
                 return attribute.label;
             }
 
-            if (typeof this.source.get('customAttributes') !== 'undefined') {
-                resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
-                    value: attribute.value
+            if (_.isArray(attribute.value)) {
+                label = _.map(attribute.value, function (value) {
+                    return this.getCustomAttributeOptionLabel(attribute['attribute_code'], value) || value;
+                }, this).join(', ');
+            } else {
+                label = this.getCustomAttributeOptionLabel(attribute['attribute_code'], attribute.value);
+            }
+
+            return label || attribute.value;
+        },
+
+        /**
+         * Get option label for given attribute code and option ID
+         *
+         * @param {String} attributeCode
+         * @param {String} value
+         * @returns {String|null}
+         */
+        getCustomAttributeOptionLabel: function (attributeCode, value) {
+            var option,
+                label,
+                options = this.source.get('customAttributes') || {};
+
+            if (options[attributeCode]) {
+                option = _.findWhere(options[attributeCode], {
+                    value: value
                 });
+
+                if (option) {
+                    label = option.label;
+                }
             }
 
-            return resultAttribute && resultAttribute.label || attribute.value;
+            return label;
         },
 
         /** Set selected customer shipping address  */
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
index 6ec9fde554dc2..03591c95e46cb 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping-information/address-renderer/default.js
@@ -32,7 +32,7 @@ define([
          * @returns {*}
          */
         getCustomAttributeLabel: function (attribute) {
-            var resultAttribute;
+            var label;
 
             if (typeof attribute === 'string') {
                 return attribute;
@@ -42,13 +42,40 @@ define([
                 return attribute.label;
             }
 
-            if (typeof this.source.get('customAttributes') !== 'undefined') {
-                resultAttribute = _.findWhere(this.source.get('customAttributes')[attribute['attribute_code']], {
-                    value: attribute.value
+            if (_.isArray(attribute.value)) {
+                label = _.map(attribute.value, function (value) {
+                    return this.getCustomAttributeOptionLabel(attribute['attribute_code'], value) || value;
+                }, this).join(', ');
+            } else {
+                label = this.getCustomAttributeOptionLabel(attribute['attribute_code'], attribute.value);
+            }
+
+            return label || attribute.value;
+        },
+
+        /**
+         * Get option label for given attribute code and option ID
+         *
+         * @param {String} attributeCode
+         * @param {String} value
+         * @returns {String|null}
+         */
+        getCustomAttributeOptionLabel: function (attributeCode, value) {
+            var option,
+                label,
+                options = this.source.get('customAttributes') || {};
+
+            if (options[attributeCode]) {
+                option = _.findWhere(options[attributeCode], {
+                    value: value
                 });
+
+                if (option) {
+                    label = option.label;
+                }
             }
 
-            return resultAttribute && resultAttribute.label || attribute.value;
+            return label;
         }
     });
 });

From d45646954ac770058d081d408bddfa778f8b1c0f Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Fri, 2 Oct 2020 17:57:03 +0300
Subject: [PATCH 436/671] MC-38048: Incorrect default country displayed on
 shipping page when store view is changed in cart. Part 2

---
 .../Magento/Checkout/view/frontend/web/js/view/shipping.js    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 4e82c05f0385a..084c8ad59a8da 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -122,9 +122,7 @@ define([
                 }
                 checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
                     //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-                    if (quote.shippingAddress().countryId !== shippingAddrsData.country_id &&
-                        (shippingAddrsData.postcode || shippingAddrsData.region_id)
-                    ) {
+                    if (shippingAddrsData.street && shippingAddrsData.street[0].length > 0) {
                         checkoutData.setShippingAddressFromData(shippingAddrsData);
                     }
                     //jscs:enable requireCamelCaseOrUpperCaseIdentifiers

From 2588d77c4076b34a816e86bc6bf8f61ecd8c4672 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 2 Oct 2020 18:05:58 +0300
Subject: [PATCH 437/671] MC-35771: Datepicker/calendar control does not use
 the store locale

---
 .../Magento/Customer/Block/Widget/Dob.php     | 51 ++++++++++++++++++-
 .../view/frontend/templates/widget/dob.phtml  | 19 +++++--
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 90ce9ba210ed2..1ca15981b8370 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -7,11 +7,16 @@
 
 use Magento\Customer\Api\CustomerMetadataInterface;
 use Magento\Framework\Api\ArrayObjectSearch;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Locale\Bundle\DataBundle;
+use Magento\Framework\Locale\ResolverInterface;
 
 /**
  * Customer date of birth attribute block
  *
  * @SuppressWarnings(PHPMD.DepthOfInheritance)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Dob extends AbstractWidget
 {
@@ -39,6 +44,18 @@ class Dob extends AbstractWidget
      */
     protected $filterFactory;
 
+    /**
+     * JSON Encoder
+     *
+     * @var EncoderInterface
+     */
+    private $encoder;
+
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Helper\Address $addressHelper
@@ -46,6 +63,8 @@ class Dob extends AbstractWidget
      * @param \Magento\Framework\View\Element\Html\Date $dateElement
      * @param \Magento\Framework\Data\Form\FilterFactory $filterFactory
      * @param array $data
+     * @param EncoderInterface|null $encoder
+     * @param ResolverInterface|null $localeResolver
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -53,10 +72,14 @@ public function __construct(
         CustomerMetadataInterface $customerMetadata,
         \Magento\Framework\View\Element\Html\Date $dateElement,
         \Magento\Framework\Data\Form\FilterFactory $filterFactory,
-        array $data = []
+        array $data = [],
+        ?EncoderInterface $encoder = null,
+        ?ResolverInterface $localeResolver = null
     ) {
         $this->dateElement = $dateElement;
         $this->filterFactory = $filterFactory;
+        $this->encoder = $encoder ?? ObjectManager::getInstance()->get(EncoderInterface::class);
+        $this->localeResolver = $localeResolver ?? ObjectManager::getInstance()->get(ResolverInterface::class);
         parent::__construct($context, $addressHelper, $customerMetadata, $data);
     }
 
@@ -377,4 +400,30 @@ public function getFirstDay()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
+
+    /**
+     * Get translated calendar config json formatted
+     *
+     * @return string
+     */
+    public function getTranslatedCalendarConfigJson(): string
+    {
+        $localeData = (new DataBundle())->get($this->localeResolver->getLocale());
+        $monthsData = $localeData['calendar']['gregorian']['monthNames'];
+        $daysData = $localeData['calendar']['gregorian']['dayNames'];
+
+        return $this->encoder->encode(
+            [
+                'closeText' => __('Done'),
+                'prevText' => __('Prev'),
+                'nextText' => __('Next'),
+                'currentText' => __('Today'),
+                'monthNames' => array_values(iterator_to_array($monthsData['format']['wide'])),
+                'monthNamesShort' => array_values(iterator_to_array($monthsData['format']['abbreviated'])),
+                'dayNames' => array_values(iterator_to_array($daysData['format']['wide'])),
+                'dayNamesShort' => array_values(iterator_to_array($daysData['format']['abbreviated'])),
+                'dayNamesMin' => array_values(iterator_to_array($daysData['format']['short'])),
+            ]
+        );
+    }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index 3c2f970faadee..fee577abadbf9 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -27,10 +27,12 @@ $fieldCssClass = 'field date field-' . $block->getHtmlId();
 $fieldCssClass .= $block->isRequired() ? ' required' : '';
 ?>
 <div class="<?= $block->escapeHtmlAttr($fieldCssClass) ?>">
-    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"><span><?= $block->escapeHtml($block->getStoreLabel('dob')) ?></span></label>
+    <label class="label" for="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>">
+        <span><?= $block->escapeHtml($block->getStoreLabel('dob')) ?></span>
+    </label>
     <div class="control customer-dob">
         <?= $block->getFieldHtml() ?>
-        <?php if ($_message = $block->getAdditionalDescription()) : ?>
+        <?php if ($_message = $block->getAdditionalDescription()): ?>
             <div class="note"><?= $block->escapeHtml($_message) ?></div>
         <?php endif; ?>
     </div>
@@ -42,4 +44,15 @@ $fieldCssClass .= $block->isRequired() ? ' required' : '';
            "Magento_Customer/js/validation": {}
        }
     }
- </script>
+</script>
+
+<script>
+    require([
+        'jquery',
+        'jquery-ui-modules/datepicker'
+    ], function ( $ ) {
+        $.extend(true, $, {
+            calendarConfig: <?= $block->escapeJs($block->getTranslatedCalendarConfigJson()); ?>
+        });
+    });
+</script>

From 0767ff7e811257a6707ccfee5cef31e03973f800 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Fri, 2 Oct 2020 13:08:39 -0500
Subject: [PATCH 438/671] MC-37371: Wrong currency sign in Credit Memo grid

 - failed static class description
---
 app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
index 238d79766b59a..6720b1646cc9a 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
@@ -16,6 +16,8 @@
 
 /**
  * Class Price
+ *
+ * UiComponent class for Price format column
  */
 class Price extends Column
 {

From 47c21ab6bf8eed1f6dac3dbdb53019a698ba01ab Mon Sep 17 00:00:00 2001
From: Alin Alexandru <alin.alexandru@innobyte.com>
Date: Mon, 5 Oct 2020 10:40:03 +0300
Subject: [PATCH 439/671] Allow to cache search results

---
 app/code/Magento/PageCache/etc/varnish4.vcl | 4 ++--
 app/code/Magento/PageCache/etc/varnish5.vcl | 4 ++--
 app/code/Magento/PageCache/etc/varnish6.vcl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index f5e25ce36e973..12c69b82ebada 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -57,8 +57,8 @@ sub vcl_recv {
         return (pass);
     }
 
-    # Bypass shopping cart, checkout and search requests
-    if (req.url ~ "/checkout" || req.url ~ "/catalogsearch") {
+    # Bypass shopping cart and checkout
+    if (req.url ~ "/checkout") {
         return (pass);
     }
 
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index 92bb3394486fc..355f358f58ed6 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -58,8 +58,8 @@ sub vcl_recv {
         return (pass);
     }
 
-    # Bypass shopping cart, checkout and search requests
-    if (req.url ~ "/checkout" || req.url ~ "/catalogsearch") {
+    # Bypass shopping cart and checkout
+    if (req.url ~ "/checkout") {
         return (pass);
     }
 
diff --git a/app/code/Magento/PageCache/etc/varnish6.vcl b/app/code/Magento/PageCache/etc/varnish6.vcl
index b23bec4c45fb8..427faafc84d2c 100644
--- a/app/code/Magento/PageCache/etc/varnish6.vcl
+++ b/app/code/Magento/PageCache/etc/varnish6.vcl
@@ -62,8 +62,8 @@ sub vcl_recv {
         return (pass);
     }
 
-    # Bypass shopping cart, checkout and search requests
-    if (req.url ~ "/checkout" || req.url ~ "/catalogsearch") {
+    # Bypass shopping cart and checkout
+    if (req.url ~ "/checkout") {
         return (pass);
     }
 

From 0c508ef7d05fc63c7345bf30a1e0b51fabb2be04 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 5 Oct 2020 11:04:42 +0300
Subject: [PATCH 440/671] MC-35771: Datepicker/calendar control does not use
 the store locale

---
 .../Test/Unit/Block/Widget/DobTest.php        | 59 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 70232e955a86d..1f5a6145e0eea 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -17,6 +17,7 @@
 use Magento\Framework\Data\Form\FilterFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Json\EncoderInterface;
 use Magento\Framework\Locale\Resolver;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
@@ -91,6 +92,11 @@ class DobTest extends TestCase
      */
     private $_locale;
 
+    /**
+     * @var EncoderInterface
+     */
+    private $encoder;
+
     /**
      * @inheritDoc
      */
@@ -157,12 +163,16 @@ function () use ($timezone, $localeResolver) {
                 }
             );
 
+        $this->encoder = $this->getMockForAbstractClass(EncoderInterface::class);
+
         $this->_block = new Dob(
             $this->context,
             $this->createMock(Address::class),
             $this->customerMetadata,
             $this->createMock(Date::class),
-            $this->filterFactory
+            $this->filterFactory,
+            [],
+            $this->encoder
         );
     }
 
@@ -598,4 +608,51 @@ public function testGetHtmlExtraParamsWithRequiredOption()
             $this->_block->getHtmlExtraParams()
         );
     }
+
+    /**
+     * Tests getTranslatedCalendarConfigJson()
+     *
+     * @param array $expectedArray
+     * @param string $expectedJson
+     * @dataProvider getTranslatedCalendarConfigJsonDataProvider
+     * @return void
+     */
+    public function testGetTranslatedCalendarConfigJson(array $expectedArray, string $expectedJson): void
+    {
+        $this->encoder->expects($this->once())
+            ->method('encode')
+            ->with($expectedArray)
+            ->willReturn($expectedJson);
+
+        $this->assertEquals(
+            $expectedJson,
+            $this->_block->getTranslatedCalendarConfigJson()
+        );
+    }
+
+    /**
+     * Provider for testGetTranslatedCalendarConfigJson
+     *
+     * @return array
+     */
+    public function getTranslatedCalendarConfigJsonDataProvider()
+    {
+        return [
+            [
+                'expectedArray' => [
+                    'closeText' => 'Done',
+                    'prevText' => 'Prev',
+                    'nextText' => 'Next',
+                    'currentText' => 'Today',
+                    'monthNames' => ['January', 'February', 'March', 'April', 'May', 'June',
+                        'July', 'August', 'September', 'October', 'November', 'December'],
+                    'monthNamesShort' => ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+                    'dayNames' => ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+                    'dayNamesShort' => ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+                    'dayNamesMin' => ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
+                ],
+                'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthNamesShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"dayNames":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"dayNamesShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dayNamesMin":["Su","Mo","Tu","We","Th","Fr","Sa"]}'
+            ],
+        ];
+    }
 }

From e36b4d0f906081ba776cc15546504fef85a90b9a Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 5 Oct 2020 11:41:30 +0300
Subject: [PATCH 441/671] MC-35771: Datepicker/calendar control does not use
 the store locale

---
 .../Test/Unit/Block/Widget/DobTest.php        | 35 ++++++++++++++++---
 .../view/frontend/templates/widget/dob.phtml  | 27 +++++++++-----
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 1f5a6145e0eea..020dbbbe4ff13 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -97,6 +97,11 @@ class DobTest extends TestCase
      */
     private $encoder;
 
+    /**
+     * @var ResolverInterface
+     */
+    private $localeResolver;
+
     /**
      * @inheritDoc
      */
@@ -116,14 +121,15 @@ protected function setUp(): void
         $cache->expects($this->any())->method('getFrontend')->willReturn($frontendCache);
 
         $objectManager = new ObjectManager($this);
-        $localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
-        $localeResolver->expects($this->any())
+        $this->localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+        $this->localeResolver->expects($this->any())
             ->method('getLocale')
             ->willReturnCallback(
                 function () {
                     return $this->_locale;
                 }
             );
+        $localeResolver = $this->localeResolver;
         $timezone = $objectManager->getObject(
             Timezone::class,
             ['localeResolver' => $localeResolver, 'dateFormatterFactory' => new DateFormatterFactory()]
@@ -172,7 +178,8 @@ function () use ($timezone, $localeResolver) {
             $this->createMock(Date::class),
             $this->filterFactory,
             [],
-            $this->encoder
+            $this->encoder,
+            $this->localeResolver
         );
     }
 
@@ -612,13 +619,16 @@ public function testGetHtmlExtraParamsWithRequiredOption()
     /**
      * Tests getTranslatedCalendarConfigJson()
      *
+     * @param string $locale
      * @param array $expectedArray
      * @param string $expectedJson
      * @dataProvider getTranslatedCalendarConfigJsonDataProvider
      * @return void
      */
-    public function testGetTranslatedCalendarConfigJson(array $expectedArray, string $expectedJson): void
+    public function testGetTranslatedCalendarConfigJson(string $locale, array $expectedArray, string $expectedJson): void
     {
+        $this->_locale = $locale;
+
         $this->encoder->expects($this->once())
             ->method('encode')
             ->with($expectedArray)
@@ -639,6 +649,7 @@ public function getTranslatedCalendarConfigJsonDataProvider()
     {
         return [
             [
+                'locale' => 'en_US',
                 'expectedArray' => [
                     'closeText' => 'Done',
                     'prevText' => 'Prev',
@@ -653,6 +664,22 @@ public function getTranslatedCalendarConfigJsonDataProvider()
                 ],
                 'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthNamesShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"dayNames":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"dayNamesShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dayNamesMin":["Su","Mo","Tu","We","Th","Fr","Sa"]}'
             ],
+            [
+                'locale' => 'de_DE',
+                'expectedArray' => [
+                    'closeText' => 'Done',
+                    'prevText' => 'Prev',
+                    'nextText' => 'Next',
+                    'currentText' => 'Today',
+                    'monthNames' => ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
+                        'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+                    'monthNamesShort' => ['Jan.', 'Feb.', 'März', 'Apr.', 'Mai', 'Juni', 'Juli', 'Aug.', 'Sept.', 'Okt.', 'Nov.', 'Dez.'],
+                    'dayNames' => ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+                    'dayNamesShort' => ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
+                    'dayNamesMin' => ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
+                ],
+                'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["Januar","Februar","M\u00e4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],"monthNamesShort":["Jan.","Feb.","M\u00e4rz","Apr.","Mai","Juni","Juli","Aug.","Sept.","Okt.","Nov.","Dez."],"dayNames":["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],"dayNamesShort":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."],"dayNamesMin":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."]}'
+            ],
         ];
     }
 }
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index fee577abadbf9..8a584938b1548 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 
+/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
 /** @var \Magento\Customer\Block\Widget\Dob $block */
 
 /*
@@ -23,6 +24,7 @@ NOTE: Regarding styles - if we leave it this way, we'll move it to boxes.css. Al
 automatically using block input parameters.
 */
 
+$translatedCalendarConfigJson = $block->getTranslatedCalendarConfigJson();
 $fieldCssClass = 'field date field-' . $block->getHtmlId();
 $fieldCssClass .= $block->isRequired() ? ' required' : '';
 ?>
@@ -46,13 +48,20 @@ $fieldCssClass .= $block->isRequired() ? ' required' : '';
     }
 </script>
 
-<script>
-    require([
-        'jquery',
-        'jquery-ui-modules/datepicker'
-    ], function ( $ ) {
-        $.extend(true, $, {
-            calendarConfig: <?= $block->escapeJs($block->getTranslatedCalendarConfigJson()); ?>
-        });
+<?php $scriptString = <<<script
+
+require([
+    'jquery',
+    'jquery-ui-modules/datepicker'
+], function($){
+
+//<![CDATA[
+    $.extend(true, $, {
+        calendarConfig: {$translatedCalendarConfigJson}
     });
-</script>
+//]]>
+
+});
+script;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From 8edca5fb3f6d49914dd7f11a9d418b2c2864bbe9 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 5 Oct 2020 13:20:14 +0300
Subject: [PATCH 442/671] MC-35771: Datepicker/calendar control does not use
 the store locale

---
 .../Customer/Test/Unit/Block/Widget/DobTest.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 020dbbbe4ff13..bb2f350ae60a1 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -625,8 +625,11 @@ public function testGetHtmlExtraParamsWithRequiredOption()
      * @dataProvider getTranslatedCalendarConfigJsonDataProvider
      * @return void
      */
-    public function testGetTranslatedCalendarConfigJson(string $locale, array $expectedArray, string $expectedJson): void
-    {
+    public function testGetTranslatedCalendarConfigJson(
+        string $locale,
+        array $expectedArray,
+        string $expectedJson
+    ): void {
         $this->_locale = $locale;
 
         $this->encoder->expects($this->once())
@@ -657,12 +660,15 @@ public function getTranslatedCalendarConfigJsonDataProvider()
                     'currentText' => 'Today',
                     'monthNames' => ['January', 'February', 'March', 'April', 'May', 'June',
                         'July', 'August', 'September', 'October', 'November', 'December'],
-                    'monthNamesShort' => ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+                    'monthNamesShort' => ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+                        'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
                     'dayNames' => ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
                     'dayNamesShort' => ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
                     'dayNamesMin' => ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
                 ],
+                // phpcs:disable Generic.Files.LineLength.TooLong
                 'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthNamesShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"dayNames":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"dayNamesShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dayNamesMin":["Su","Mo","Tu","We","Th","Fr","Sa"]}'
+                // phpcs:enable Generic.Files.LineLength.TooLong
             ],
             [
                 'locale' => 'de_DE',
@@ -673,12 +679,15 @@ public function getTranslatedCalendarConfigJsonDataProvider()
                     'currentText' => 'Today',
                     'monthNames' => ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
                         'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
-                    'monthNamesShort' => ['Jan.', 'Feb.', 'März', 'Apr.', 'Mai', 'Juni', 'Juli', 'Aug.', 'Sept.', 'Okt.', 'Nov.', 'Dez.'],
+                    'monthNamesShort' => ['Jan.', 'Feb.', 'März', 'Apr.', 'Mai', 'Juni',
+                        'Juli', 'Aug.', 'Sept.', 'Okt.', 'Nov.', 'Dez.'],
                     'dayNames' => ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
                     'dayNamesShort' => ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
                     'dayNamesMin' => ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
                 ],
+                // phpcs:disable Generic.Files.LineLength.TooLong
                 'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["Januar","Februar","M\u00e4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],"monthNamesShort":["Jan.","Feb.","M\u00e4rz","Apr.","Mai","Juni","Juli","Aug.","Sept.","Okt.","Nov.","Dez."],"dayNames":["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],"dayNamesShort":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."],"dayNamesMin":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."]}'
+                // phpcs:enable Generic.Files.LineLength.TooLong
             ],
         ];
     }

From c722790487631c0ce78d753d2dfe9d97c7606a18 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Mon, 5 Oct 2020 13:54:39 +0300
Subject: [PATCH 443/671] magento/magento2#30062: Feature/formatting json yaml.

---
 .editorconfig | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 0452085768830..1a9acd92fc0fc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,8 +14,5 @@ trim_trailing_whitespace = false
 [*.{yml,yaml,json}]
 indent_size = 2
 
-[composer.{json,lock}]
-indent_size = 4
-
-[auth.json]
+[{composer, auth}.json]
 indent_size = 4

From 3dd1fbd51cfb424d71d53f414c49bb5c587974de Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 5 Oct 2020 15:35:12 +0300
Subject: [PATCH 444/671] MC-38048: Incorrect default country displayed on
 shipping page when store view is changed in cart. Part 2

---
 ...eckoutDifferentDefaultCountryPerStoreTest.xml | 16 ++++++++++++++--
 .../view/frontend/web/js/view/shipping.js        |  4 +---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutDifferentDefaultCountryPerStoreTest.xml b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutDifferentDefaultCountryPerStoreTest.xml
index c4c70cef81b0b..e6a5f37c764fe 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutDifferentDefaultCountryPerStoreTest.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Test/CheckoutDifferentDefaultCountryPerStoreTest.xml
@@ -39,10 +39,10 @@
         </after>
         <!-- Open product and add product to cart-->
         <actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
-            <argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
+            <argument name="productUrlKey" value="$createProduct.custom_attributes[url_key]$"/>
         </actionGroup>
         <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
-            <argument name="product" value="$$createProduct$$"/>
+            <argument name="product" value="$createProduct$"/>
             <argument name="productCount" value="1"/>
         </actionGroup>
         <!-- Go to cart -->
@@ -59,5 +59,17 @@
             <actualResult type="const">$grabCountry</actualResult>
             <expectedResult type="string">{{DE_Address_Berlin_Not_Default_Address.country_id}}</expectedResult>
         </assertEquals>
+        <!-- Go to cart -->
+        <actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="returnToCartPage"/>
+        <!-- Switch to default store view -->
+        <actionGroup ref="StorefrontSwitchDefaultStoreViewActionGroup" stepKey="switchToDefaultStoreView"/>
+        <!-- Go to checkout page -->
+        <actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="proceedToCheckoutWithDefaultStore"/>
+        <!-- Grab country code from checkout page and assert value with default country for default store view -->
+        <grabValueFrom selector="{{CheckoutShippingSection.country}}" stepKey="grabDefaultStoreCountry"/>
+        <assertEquals stepKey="assertDefaultCountryValue">
+            <actualResult type="const">$grabDefaultStoreCountry</actualResult>
+            <expectedResult type="string">{{US_Address_TX.country_id}}</expectedResult>
+        </assertEquals>
     </test>
 </tests>
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index 084c8ad59a8da..f6590e60a9589 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -121,11 +121,9 @@ define([
                     );
                 }
                 checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
-                    //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-                    if (shippingAddrsData.street && shippingAddrsData.street[0].length > 0) {
+                    if (!_.isEmpty(shippingAddrsData.street[0])) {
                         checkoutData.setShippingAddressFromData(shippingAddrsData);
                     }
-                    //jscs:enable requireCamelCaseOrUpperCaseIdentifiers
                 });
                 shippingRatesValidator.initFields(fieldsetName);
             });

From 970d1793bc408ad99cf959197c77dec424f4cefc Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@mediotype.com>
Date: Mon, 5 Oct 2020 14:36:14 +0200
Subject: [PATCH 445/671] Add missing line break before docblock tags

---
 app/code/Magento/Search/Model/SynonymAnalyzer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
index 5b6e04b8321fe..06d5c1eda0631 100644
--- a/app/code/Magento/Search/Model/SynonymAnalyzer.php
+++ b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -42,6 +42,7 @@ public function __construct(SynonymReader $synReader)
      *   3 => [ 0 => "british", 1 => "english" ],
      *   4 => [ 0 => "queen", 1 => "monarch" ]
      * ]
+     *
      * @param string $phrase
      * @return array
      * @throws \Magento\Framework\Exception\LocalizedException

From b4ee601db5141316c0d268f83e95f32d4e341162 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Mon, 5 Oct 2020 17:39:47 +0300
Subject: [PATCH 446/671] MC-38048: Incorrect default country displayed on
 shipping page when store view is changed in cart. Part 2

---
 app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
index f6590e60a9589..2a52b64647749 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -121,7 +121,7 @@ define([
                     );
                 }
                 checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
-                    if (!_.isEmpty(shippingAddrsData.street[0])) {
+                    if (shippingAddrsData.street && !_.isEmpty(shippingAddrsData.street[0])) {
                         checkoutData.setShippingAddressFromData(shippingAddrsData);
                     }
                 });

From 38c4a3e01ebc3dd0d18286efba20d03373deb830 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@mediotype.com>
Date: Mon, 5 Oct 2020 19:29:15 +0200
Subject: [PATCH 447/671] Change implementation to ensure one of current use
 cases is not broken. Add case with slash in regression integration test.

---
 app/code/Magento/Search/Model/SynonymAnalyzer.php             | 4 +++-
 .../testsuite/Magento/Search/Model/SynonymAnalyzerTest.php    | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
index 06d5c1eda0631..b022f47efebd5 100644
--- a/app/code/Magento/Search/Model/SynonymAnalyzer.php
+++ b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -137,8 +137,10 @@ private function getSearchPattern(array $words): string
     {
         $patterns = [];
         for ($lastItem = count($words); $lastItem > 0; $lastItem--) {
+            $words = array_map(function ($word) {
+               return preg_quote($word, '/');
+            }, $words);
             $phrase = implode("\s+", \array_slice($words, 0, $lastItem));
-            $phrase = preg_quote($phrase, '/');
             $patterns[] = '^' . $phrase . ',';
             $patterns[] = ',' . $phrase . ',';
             $patterns[] = ',' . $phrase . '$';
diff --git a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
index 173cdf8a64703..2531f9c60f070 100644
--- a/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Search/Model/SynonymAnalyzerTest.php
@@ -78,6 +78,10 @@ public static function loadGetSynonymsForPhraseDataProvider()
                 'phrase' => 'schlicht',
                 'expectedResult' => [['schlicht', 'natürlich']]
             ],
+            'withSlashInSearchPhrase' => [
+                'phrase' => 'orange hill/peak',
+                'expectedResult' => [['orange', 'magento'], ['hill/peak']]
+            ],
         ];
     }
 

From 8e7db568c98a3a9191d6a2af59cc2167d5dfc584 Mon Sep 17 00:00:00 2001
From: Oleksandr Dubovyk <odubovyk@magento.com>
Date: Mon, 5 Oct 2020 14:06:27 -0500
Subject: [PATCH 448/671] MC-37371: Wrong currency sign in Credit Memo grid

- changed from Create to Get in constructor
---
 .../Sales/Ui/Component/Listing/Column/Price.php       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
index 6720b1646cc9a..4ffb6f98447c7 100644
--- a/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
+++ b/app/code/Magento/Sales/Ui/Component/Listing/Column/Price.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Sales\Ui\Component\Listing\Column;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\UiComponent\ContextInterface;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Store\Model\StoreManagerInterface;
@@ -45,7 +46,7 @@ class Price extends Column
      * @param array $components
      * @param array $data
      * @param Currency $currency
-     * @param StoreManagerInterface|null $storeManager
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ContextInterface $context,
@@ -57,10 +58,10 @@ public function __construct(
         StoreManagerInterface $storeManager = null
     ) {
         $this->priceFormatter = $priceFormatter;
-        $this->currency = $currency ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->create(Currency::class);
-        $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->create(StoreManagerInterface::class);
+        $this->currency = $currency ?: ObjectManager::getInstance()
+            ->get(Currency::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()
+            ->get(StoreManagerInterface::class);
         parent::__construct($context, $uiComponentFactory, $components, $data);
     }
 

From 7a662f5ee991e5768c1dccb30bcaace3891c6f35 Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Mon, 5 Oct 2020 17:21:01 -0500
Subject: [PATCH 449/671] MC-37347: [OnPrem] Catalog Products Filter in 2.3.3
 not working correctly

---
 .../Product/ProductCollection.php             | 70 -------------------
 1 file changed, 70 deletions(-)

diff --git a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
index 99391f92337b3..f4334bc25efd8 100644
--- a/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/Catalog/Ui/DataProvider/Product/ProductCollection.php
@@ -5,16 +5,10 @@
  */
 namespace Magento\Catalog\Ui\DataProvider\Product;
 
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Eav\Model\Entity\Attribute\AttributeInterface;
-
 /**
  * Collection which is used for rendering product list in the backend.
  *
  * Used for product grid and customizes behavior of the default Product collection for grid needs.
- *
- * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ProductCollection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
 {
@@ -31,68 +25,4 @@ protected function _productLimitationJoinPrice()
         $this->_productLimitationFilters->setUsePriceIndex(false);
         return $this->_productLimitationPrice(true);
     }
-
-    /**
-     * Add attribute filter to collection
-     *
-     * @param AttributeInterface|integer|string|array $attribute
-     * @param null|string|array $condition
-     * @param string $joinType
-     * @return $this
-     * @throws LocalizedException
-     */
-    public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
-    {
-        $storeId = (int)$this->getStoreId();
-        if ($attribute === 'is_saleable'
-            || is_array($attribute)
-            || $storeId !== $this->getDefaultStoreId()
-        ) {
-            return parent::addAttributeToFilter($attribute, $condition, $joinType);
-        }
-
-        if ($attribute instanceof AttributeInterface) {
-            $attributeModel = $attribute;
-        } else {
-            $attributeModel = $this->getEntity()->getAttribute($attribute);
-            if ($attributeModel === false) {
-                throw new LocalizedException(
-                    __('Invalid attribute identifier for filter (%1)', get_class($attribute))
-                );
-            }
-        }
-
-        if ($attributeModel->isScopeGlobal() || $attributeModel->getBackend()->isStatic()) {
-            return parent::addAttributeToFilter($attribute, $condition, $joinType);
-        }
-
-        $this->addAttributeToFilterAllStores($attributeModel, $condition);
-
-        return $this;
-    }
-
-    /**
-     * Add attribute to filter by all stores
-     *
-     * @param Attribute $attributeModel
-     * @param array $condition
-     * @return void
-     */
-    private function addAttributeToFilterAllStores(Attribute $attributeModel, array $condition): void
-    {
-        $tableName = $this->getTable($attributeModel->getBackendTable());
-        $entity = $this->getEntity();
-        $fKey = 'e.' . $this->getEntityPkName($entity);
-        $pKey = $tableName . '.' . $this->getEntityPkName($entity);
-        $attributeId = $attributeModel->getAttributeId();
-        $condition = "({$pKey} = {$fKey}) AND ("
-            . $this->_getConditionSql("{$tableName}.value", $condition)
-            . ') AND ('
-            . $this->_getConditionSql("{$tableName}.attribute_id", $attributeId)
-            . ') AND ('
-            . $this->_getConditionSql("{$tableName}.store_id", $this->getDefaultStoreId())
-            . ')';
-        $selectExistsInAllStores = $this->getConnection()->select()->from($tableName);
-        $this->getSelect()->exists($selectExistsInAllStores, $condition);
-    }
 }

From c6c7df6be07ff11a18aea6fc89fd9cf8727c8fea Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Mon, 5 Oct 2020 17:41:32 -0500
Subject: [PATCH 450/671] MC-37347: [OnPrem] Catalog Products Filter in 2.3.3
 not working correctly

---
 .../Test/AdminFilterByNameByStoreViewOnProductGridTest.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
index eb9fe693f8b3b..c6f3c69a2aa48 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
@@ -15,8 +15,8 @@
             <title value="Product grid filtering by store view level attribute"/>
             <description value="Verify that products grid can be filtered on all store view level by attribute"/>
             <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-98755"/>
-            <useCaseId value="MAGETWO-98335"/>
+            <testCaseId value="MC-28534"/>
+            <useCaseId value="MC-37347"/>
             <group value="catalog"/>
         </annotations>
         <before>

From 88f6101fe15eda61471822169670b744914fdf40 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@mediotype.com>
Date: Tue, 6 Oct 2020 07:37:29 +0200
Subject: [PATCH 451/671] Fix incorrect line indent

---
 app/code/Magento/Search/Model/SynonymAnalyzer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Search/Model/SynonymAnalyzer.php b/app/code/Magento/Search/Model/SynonymAnalyzer.php
index b022f47efebd5..16d0b0b4ddcd9 100644
--- a/app/code/Magento/Search/Model/SynonymAnalyzer.php
+++ b/app/code/Magento/Search/Model/SynonymAnalyzer.php
@@ -138,7 +138,7 @@ private function getSearchPattern(array $words): string
         $patterns = [];
         for ($lastItem = count($words); $lastItem > 0; $lastItem--) {
             $words = array_map(function ($word) {
-               return preg_quote($word, '/');
+                return preg_quote($word, '/');
             }, $words);
             $phrase = implode("\s+", \array_slice($words, 0, $lastItem));
             $patterns[] = '^' . $phrase . ',';

From e7cc0e39e8dea0981c5f219cbdc7df25755b7d03 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 6 Oct 2020 10:43:01 +0300
Subject: [PATCH 452/671] MC-35771: Datepicker/calendar control does not use
 the store locale

---
 .../Magento/Customer/view/frontend/templates/widget/dob.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
index 8a584938b1548..da1c85cce9856 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/dob.phtml
@@ -48,7 +48,7 @@ $fieldCssClass .= $block->isRequired() ? ' required' : '';
     }
 </script>
 
-<?php $scriptString = <<<script
+<?php $scriptString = <<<code
 
 require([
     'jquery',
@@ -62,6 +62,6 @@ require([
 //]]>
 
 });
-script;
+code;
 ?>
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>

From 0e3b1dc678b071767857eecb7d18695c0d7cc11b Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 6 Oct 2020 11:48:35 +0300
Subject: [PATCH 453/671] MC-38197: [Magento Cloud] Error when updating carts -
 fatal error Call to a member function getValue() on null in
 module-configurable-product CartItemProcessor.php

---
 .../Model/Quote/Item/CartItemProcessor.php    | 45 ++++++++++---------
 .../Quote/Item/CartItemProcessorTest.php      | 23 +++++++++-
 2 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 56993ecec1fbf..814c1e971ea33 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -82,31 +82,34 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
      */
     public function processOptions(CartItemInterface $cartItem)
     {
-        $attributesOption = $cartItem->getProduct()->getCustomOption('attributes');
-        $selectedConfigurableOptions = $this->serializer->unserialize($attributesOption->getValue());
+        $attributesOption = $cartItem->getProduct()
+            ->getCustomOption('attributes');
+        if ($attributesOption) {
+            $selectedConfigurableOptions = $this->serializer->unserialize($attributesOption->getValue());
 
-        if (is_array($selectedConfigurableOptions)) {
-            $configurableOptions = [];
-            foreach ($selectedConfigurableOptions as $optionId => $optionValue) {
-                /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $option */
-                $option = $this->itemOptionValueFactory->create();
-                $option->setOptionId($optionId);
-                $option->setOptionValue($optionValue);
-                $configurableOptions[] = $option;
-            }
+            if (is_array($selectedConfigurableOptions)) {
+                $configurableOptions = [];
+                foreach ($selectedConfigurableOptions as $optionId => $optionValue) {
+                    /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $option */
+                    $option = $this->itemOptionValueFactory->create();
+                    $option->setOptionId($optionId);
+                    $option->setOptionValue($optionValue);
+                    $configurableOptions[] = $option;
+                }
 
-            $productOption = $cartItem->getProductOption()
-                ? $cartItem->getProductOption()
-                : $this->productOptionFactory->create();
+                $productOption = $cartItem->getProductOption()
+                    ? $cartItem->getProductOption()
+                    : $this->productOptionFactory->create();
 
-            /** @var  \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensibleAttribute */
-            $extensibleAttribute =  $productOption->getExtensionAttributes()
-                ? $productOption->getExtensionAttributes()
-                : $this->extensionFactory->create();
+                /** @var  \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensibleAttribute */
+                $extensibleAttribute = $productOption->getExtensionAttributes()
+                    ? $productOption->getExtensionAttributes()
+                    : $this->extensionFactory->create();
 
-            $extensibleAttribute->setConfigurableItemOptions($configurableOptions);
-            $productOption->setExtensionAttributes($extensibleAttribute);
-            $cartItem->setProductOption($productOption);
+                $extensibleAttribute->setConfigurableItemOptions($configurableOptions);
+                $productOption->setExtensionAttributes($extensibleAttribute);
+                $cartItem->setProductOption($productOption);
+            }
         }
         return $cartItem;
     }
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php
index 10f5b1cbb344a..cd68e1dcfce24 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Quote/Item/CartItemProcessorTest.php
@@ -59,7 +59,7 @@ class CartItemProcessorTest extends TestCase
      */
     private $productOptionExtensionAttributes;
 
-    /** @var \PHPUnit\Framework\MockObject\MockObject */
+    /** @var MockObject */
     private $serializer;
 
     protected function setUp(): void
@@ -263,4 +263,25 @@ public function testProcessProductOptionsIfOptionsExist()
 
         $this->assertEquals($cartItemMock, $this->model->processOptions($cartItemMock));
     }
+
+    /**
+     * Checks processOptions method with the empty custom option
+     *
+     * @return void
+     */
+    public function testProcessProductWithEmptyOption(): void
+    {
+        $customOption = $this->createMock(Option::class);
+        $productMock = $this->createMock(Product::class);
+        $productMock->method('getCustomOption')
+            ->with('attributes')
+            ->willReturn(null);
+        $customOption->expects($this->never())
+            ->method('getValue');
+        $cartItemMock = $this->createPartialMock(Item::class, ['getProduct']);
+        $cartItemMock->expects($this->once())
+            ->method('getProduct')
+            ->willReturn($productMock);
+        $this->assertEquals($cartItemMock, $this->model->processOptions($cartItemMock));
+    }
 }

From fc8590177de2a810f9864995e7292c7c5e367481 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 6 Oct 2020 16:27:37 +0300
Subject: [PATCH 454/671] MC-38197: [Magento Cloud] Error when updating carts -
 fatal error Call to a member function getValue() on null in
 module-configurable-product CartItemProcessor.php

---
 .../Model/Quote/Item/CartItemProcessor.php    | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 814c1e971ea33..75592efc52dca 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\ConfigurableProduct\Model\Quote\Item;
 
+use Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface;
+use Magento\Quote\Api\Data\ProductOptionExtensionInterface;
 use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
 use Magento\Quote\Api\Data\CartItemInterface;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -64,7 +66,7 @@ public function __construct(
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
         if ($cartItem->getProductOption() && $cartItem->getProductOption()->getExtensionAttributes()) {
-            /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $options */
+            /** @var ConfigurableItemOptionValueInterface $options */
             $options = $cartItem->getProductOption()->getExtensionAttributes()->getConfigurableItemOptions();
             if (is_array($options)) {
                 $requestData = [];
@@ -84,33 +86,35 @@ public function processOptions(CartItemInterface $cartItem)
     {
         $attributesOption = $cartItem->getProduct()
             ->getCustomOption('attributes');
-        if ($attributesOption) {
-            $selectedConfigurableOptions = $this->serializer->unserialize($attributesOption->getValue());
+        if (!$attributesOption) {
+            return $cartItem;
+        }
+        $selectedConfigurableOptions = $this->serializer->unserialize($attributesOption->getValue());
 
-            if (is_array($selectedConfigurableOptions)) {
-                $configurableOptions = [];
-                foreach ($selectedConfigurableOptions as $optionId => $optionValue) {
-                    /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $option */
-                    $option = $this->itemOptionValueFactory->create();
-                    $option->setOptionId($optionId);
-                    $option->setOptionValue($optionValue);
-                    $configurableOptions[] = $option;
-                }
+        if (is_array($selectedConfigurableOptions)) {
+            $configurableOptions = [];
+            foreach ($selectedConfigurableOptions as $optionId => $optionValue) {
+                /** @var ConfigurableItemOptionValueInterface $option */
+                $option = $this->itemOptionValueFactory->create();
+                $option->setOptionId($optionId);
+                $option->setOptionValue($optionValue);
+                $configurableOptions[] = $option;
+            }
 
-                $productOption = $cartItem->getProductOption()
-                    ? $cartItem->getProductOption()
-                    : $this->productOptionFactory->create();
+            $productOption = $cartItem->getProductOption()
+                ? $cartItem->getProductOption()
+                : $this->productOptionFactory->create();
 
-                /** @var  \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensibleAttribute */
-                $extensibleAttribute = $productOption->getExtensionAttributes()
-                    ? $productOption->getExtensionAttributes()
-                    : $this->extensionFactory->create();
+            /** @var  ProductOptionExtensionInterface $extensibleAttribute */
+            $extensibleAttribute = $productOption->getExtensionAttributes()
+                ? $productOption->getExtensionAttributes()
+                : $this->extensionFactory->create();
 
-                $extensibleAttribute->setConfigurableItemOptions($configurableOptions);
-                $productOption->setExtensionAttributes($extensibleAttribute);
-                $cartItem->setProductOption($productOption);
-            }
+            $extensibleAttribute->setConfigurableItemOptions($configurableOptions);
+            $productOption->setExtensionAttributes($extensibleAttribute);
+            $cartItem->setProductOption($productOption);
         }
+
         return $cartItem;
     }
 }

From f892998e79884862daba328a5c29878d099ac06f Mon Sep 17 00:00:00 2001
From: Arnob Saha <arnobsh@gmail.com>
Date: Fri, 2 Oct 2020 12:34:11 -0500
Subject: [PATCH 455/671] MC-37217: Incorrect currency symbol in orders report

- Adding test file
---
 .../Grid/Column/Renderer/Currency.php         | 138 +++++++-
 .../Grid/Column/Renderer/CurrencyTest.php     | 300 ++++++++++++++++++
 app/code/Magento/Reports/composer.json        |   3 +-
 3 files changed, 435 insertions(+), 6 deletions(-)
 create mode 100644 app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/CurrencyTest.php

diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index f22b3e7bb963b..1ebfd64b2f37c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -3,36 +3,164 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
 
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency as BackendCurrency;
+use Magento\Backend\Block\Context;
+use Magento\Directory\Model\Currency\DefaultLocator;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Locale\CurrencyInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Zend_Currency_Exception;
+
 /**
  * Adminhtml grid item renderer currency
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  * @api
  * @since 100.0.2
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency
+class Currency extends BackendCurrency
 {
+    /**
+     * @var CurrencyFactory
+     */
+    private $currencyFactory;
+
+    /**
+     * @param Context $context
+     * @param StoreManagerInterface $storeManager
+     * @param DefaultLocator $currencyLocator
+     * @param CurrencyFactory $currencyFactory
+     * @param CurrencyInterface $localeCurrency
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        StoreManagerInterface $storeManager,
+        DefaultLocator $currencyLocator,
+        CurrencyFactory $currencyFactory,
+        CurrencyInterface $localeCurrency,
+        array $data = []
+    ) {
+        parent::__construct(
+            $context,
+            $storeManager,
+            $currencyLocator,
+            $currencyFactory,
+            $localeCurrency,
+            $data
+        );
+        $this->currencyFactory = $currencyFactory;
+    }
+
     /**
      * Renders grid column
      *
-     * @param \Magento\Framework\DataObject $row
+     * @param DataObject $row
      * @return string
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws Zend_Currency_Exception
      */
-    public function render(\Magento\Framework\DataObject $row)
+    public function render(DataObject $row)
     {
         $data = $row->getData($this->getColumn()->getIndex());
-        $currencyCode = $this->_getCurrencyCode($row);
+        $currencyCode = $this->getStoreCurrencyCode($row);
 
         if (!$currencyCode) {
             return $data;
         }
 
-        $data = (float)$data * $this->_getRate($row);
+        $rate = $this->getStoreCurrencyRate($currencyCode, $row);
+
+        $data = (float)$data * $rate;
         $data = sprintf("%f", $data);
         $data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
         return $data;
     }
+
+    /**
+     * Get admin currency code
+     *
+     * @return string
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function getAdminCurrencyCode(): string
+    {
+        $adminWebsiteId = (int) $this->_storeManager
+            ->getStore(Store::ADMIN_CODE)
+            ->getWebsiteId();
+        return (string) $this->_storeManager
+            ->getWebsite($adminWebsiteId)
+            ->getBaseCurrencyCode();
+    }
+
+    /**
+     * Get store currency code
+     *
+     * @param DataObject $row
+     * @return string
+     * @throws NoSuchEntityException
+     */
+    private function getStoreCurrencyCode(DataObject $row): string
+    {
+        $catalogPriceScope = $this->getCatalogPriceScope();
+        $storeId = $this->_request->getParam('store_ids');
+        if ($catalogPriceScope != 0 && !empty($storeId)) {
+            $currencyCode = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
+        } elseif ($catalogPriceScope != 0) {
+            $currencyCode = $this->_currencyLocator->getDefaultCurrency($this->_request);
+        } else {
+            $currencyCode = $this->_getCurrencyCode($row);
+        }
+        return $currencyCode;
+    }
+
+    /**
+     * Get store currency rate
+     *
+     * @param string $currencyCode
+     * @param DataObject $row
+     * @return float
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    private function getStoreCurrencyRate(string $currencyCode, DataObject $row): float
+    {
+        $catalogPriceScope = $this->getCatalogPriceScope();
+        $adminCurrencyCode = $this->getAdminCurrencyCode();
+
+        if (($catalogPriceScope != 0
+            && $adminCurrencyCode !== $currencyCode)) {
+            $storeCurrency = $this->currencyFactory->create()->load($adminCurrencyCode);
+            $currencyRate = $storeCurrency->getRate($currencyCode);
+        } else {
+            $currencyRate = $this->_getRate($row);
+        }
+        return (float) $currencyRate;
+    }
+
+    /**
+     * Get catalog price scope from the admin config
+     *
+     * @return int
+     */
+    private function getCatalogPriceScope(): int
+    {
+        return (int) $this->_scopeConfig->getValue(
+            Store::XML_PATH_PRICE_SCOPE,
+            ScopeInterface::SCOPE_WEBSITE
+        );
+    }
 }
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/CurrencyTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/CurrencyTest.php
new file mode 100644
index 0000000000000..f071bffe57c1e
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/Column/Renderer/CurrencyTest.php
@@ -0,0 +1,300 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Unit\Block\Adminhtml\Grid\Column\Renderer;
+
+use Magento\Backend\Block\Widget\Grid\Column;
+use Magento\Directory\Model\Currency as CurrencyModel;
+use Magento\Directory\Model\Currency\DefaultLocator;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Locale\CurrencyInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Reports\Block\Adminhtml\Grid\Column\Renderer\Currency;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Api\Data\WebsiteInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Zend_Currency;
+use Zend_Currency_Exception;
+
+/**
+ * Test for class Currency.
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class CurrencyTest extends TestCase
+{
+    /**
+     * @var Currency|MockObject
+     */
+    private $model;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
+
+    /**
+     * @var DefaultLocator|MockObject
+     */
+    private $currencyLocatorMock;
+
+    /**
+     * @var CurrencyInterface|MockObject
+     */
+    private $localeCurrencyMock;
+
+    /**
+     * @var Column|MockObject
+     */
+    private $gridColumnMock;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $scopeConfigMock;
+
+    /**
+     * @var StoreInterface|MockObject
+     */
+    private $storeMock;
+
+    /**
+     * @var WebsiteInterface|MockObject
+     */
+    private $websiteMock;
+
+    /**
+     * @var DataObject
+     */
+    private $row;
+
+    /**
+     * @var CurrencyModel|MockObject
+     */
+    private $currencyMock;
+
+    /**
+     * @var MockObject
+     */
+    private $backendCurrencyMock;
+
+    protected function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(
+            ScopeConfigInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getValue']
+        );
+
+        $this->storeManagerMock = $this->getMockForAbstractClass(
+            StoreManagerInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getStore', 'getWebsite']
+        );
+
+        $this->storeMock = $this->getMockForAbstractClass(
+            StoreInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getWebsiteId', 'getCurrentCurrencyCode']
+        );
+
+        $this->websiteMock = $this->getMockForAbstractClass(
+            WebsiteInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getBaseCurrencyCode']
+        );
+
+        $this->currencyLocatorMock = $this->getMockBuilder(DefaultLocator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->currencyMock = $this->createMock(CurrencyModel::class);
+        $this->currencyMock->expects($this->any())->method('load')->willReturnSelf();
+
+        $currencyFactoryMock = $this->createPartialMock(CurrencyFactory::class, ['create']);
+        $currencyFactoryMock->expects($this->any())->method('create')->willReturn($this->currencyMock);
+
+        $this->backendCurrencyMock = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->localeCurrencyMock = $this->getMockForAbstractClass(
+            CurrencyInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getCurrency']
+        );
+
+        $this->gridColumnMock = $this->getMockBuilder(Column::class)
+            ->addMethods(['getIndex'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->model = $objectManager->getObject(
+            Currency::class,
+            [
+                '_scopeConfig' => $this->scopeConfigMock,
+                'storeManager' => $this->storeManagerMock,
+                'currencyLocator' => $this->currencyLocatorMock,
+                'currencyFactory' => $currencyFactoryMock,
+                'localeCurrency' => $this->localeCurrencyMock
+            ]
+        );
+        $this->model->setColumn($this->gridColumnMock);
+    }
+
+    /**
+     * Test render function which converts store currency based on price scope settings
+     *
+     * @param float $rate
+     * @param string $columnIndex
+     * @param int $catalogPriceScope
+     * @param int $adminWebsiteId
+     * @param string $adminCurrencyCode
+     * @param string $storeCurrencyCode
+     * @param float $adminOrderAmount
+     * @param float $convertedAmount
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     * @throws Zend_Currency_Exception
+     * @dataProvider getCurrencyDataProvider
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
+    public function testRender(
+        float $rate,
+        string $columnIndex,
+        int $catalogPriceScope,
+        int $adminWebsiteId,
+        string $adminCurrencyCode,
+        string $storeCurrencyCode,
+        float $adminOrderAmount,
+        float $convertedAmount
+    ): void {
+        $this->row = new DataObject(
+            [
+                $columnIndex => $adminOrderAmount,
+                'rate' => $rate
+            ]
+        );
+        $this->backendCurrencyMock
+            ->expects($this->any())
+            ->method('getColumn')
+            ->willReturn($this->gridColumnMock);
+        $this->gridColumnMock
+            ->expects($this->any())
+            ->method('getIndex')
+            ->willReturn($columnIndex);
+        $this->currencyMock
+            ->expects($this->any())
+            ->method('getRate')
+            ->willReturn($rate);
+        $this->scopeConfigMock
+            ->expects($this->any())
+            ->method('getValue')
+            ->willReturn($catalogPriceScope);
+        $this->storeManagerMock
+            ->expects($this->any())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+        $this->storeMock
+            ->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($adminWebsiteId);
+        $this->storeManagerMock
+            ->expects($this->any())
+            ->method('getWebsite')
+            ->with($adminWebsiteId)
+            ->willReturn($this->websiteMock);
+        $this->websiteMock
+            ->expects($this->any())
+            ->method('getBaseCurrencyCode')
+            ->willReturn($adminCurrencyCode);
+        $this->currencyLocatorMock
+            ->expects($this->any())
+            ->method('getDefaultCurrency')
+            ->willReturn($storeCurrencyCode);
+        $currLocaleMock = $this->createMock(Zend_Currency::class);
+        $currLocaleMock
+            ->expects($this->any())
+            ->method('toCurrency')
+            ->willReturn($convertedAmount);
+        $this->localeCurrencyMock
+            ->expects($this->any())
+            ->method('getCurrency')
+            ->with($storeCurrencyCode)
+            ->willReturn($currLocaleMock);
+        $actualAmount = $this->model->render($this->row);
+        $this->assertEquals($convertedAmount, $actualAmount);
+    }
+
+    /**
+     * DataProvider for testRender.
+     *
+     * @return array
+     */
+    public function getCurrencyDataProvider(): array
+    {
+        return [
+            'rate conversion with same admin and storefront rate' => [
+                'rate' => 1.00,
+                'columnIndex' => 'total_income_amount',
+                'catalogPriceScope' => 1,
+                'adminWebsiteId' => 1,
+                'adminCurrencyCode' => 'EUR',
+                'storeCurrencyCode' => 'EUR',
+                'adminOrderAmount' => 105.00,
+                'convertedAmount' => 105.00
+            ],
+            'rate conversion with different admin and storefront rate' => [
+                'rate' => 1.4150,
+                'columnIndex' => 'total_income_amount',
+                'catalogPriceScope' => 1,
+                'adminWebsiteId' => 1,
+                'adminCurrencyCode' => 'USD',
+                'storeCurrencyCode' => 'EUR',
+                'adminOrderAmount' => 105.00,
+                'convertedAmount' => 148.575
+            ]
+        ];
+    }
+
+    protected function tearDown(): void
+    {
+        unset($this->scopeConfigMock);
+        unset($this->storeManagerMock);
+        unset($this->currencyLocatorMock);
+        unset($this->localeCurrencyMock);
+        unset($this->websiteMock);
+        unset($this->storeMock);
+        unset($this->currencyMock);
+        unset($this->backendCurrencyMock);
+        unset($this->gridColumnMock);
+    }
+}
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index f1fe6c1e2c83a..df535ae28b135 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -22,7 +22,8 @@
         "magento/module-store": "*",
         "magento/module-tax": "*",
         "magento/module-widget": "*",
-        "magento/module-wishlist": "*"
+        "magento/module-wishlist": "*",
+        "magento/module-directory": "*"
     },
     "type": "magento2-module",
     "license": [

From efc313151eb866c1e981fb05f9941969a19fadea Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Thu, 10 Sep 2020 15:19:04 +0200
Subject: [PATCH 456/671] 29251 Configurable Options Selection :: New GraphQL
 Query #29251

29978 add code refactoring

29978 add more code refactoring

29251 fix test issues

29251 fix static test

29251 add code refactoring

29251 add backward compatible class

29251 add refactoring, fix media gallery

29251 fix static test

29251 fix empty options

29251 fix media gallery

29251 fix web-api test

29251 add debug in failing web-api test

29251 remove debug

29251 add debug in failing web-api test

29251 add debug in failing web-api test

29251 add variant data provider

29251 clean up code

29251 clean up code
---
 .../Model/Options/Collection.php              |  78 +++-
 .../Model/Options/DataProvider/Variant.php    |  67 +++
 .../Model/Options/Metadata.php                | 173 ++++++++
 .../Model/Options/SelectionUidFormatter.php   |  60 +++
 .../Resolver/OptionsSelectionMetadata.php     |  49 +++
 .../Model/Resolver/SelectionMediaGallery.php  |  45 ++
 .../Model/Resolver/Variant/Variant.php        |  34 ++
 .../ConfigurableProductGraphQl/composer.json  |   2 +
 .../etc/graphql/di.xml                        |   8 +
 .../ConfigurableProductGraphQl/etc/module.xml |   2 +
 .../etc/schema.graphqls                       |  14 +
 ...nfigurableOptionsSelectionMetadataTest.php | 410 ++++++++++++++++++
 ...oducts_with_two_attributes_combination.php | 188 ++++++++
 ...th_two_attributes_combination_rollback.php |  84 ++++
 14 files changed, 1213 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php
 create mode 100644 app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php
 create mode 100644 dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableOptionsSelectionMetadataTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination_rollback.php

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
index 5e3666407a383..c5c66a194503a 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
@@ -10,10 +10,14 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
     as AttributeCollection;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
@@ -31,11 +35,36 @@ class Collection
      */
     private $productFactory;
 
+    /**
+     * @var ProductRepository
+     */
+    private $productRepository;
+
     /**
      * @var MetadataPool
      */
     private $metadataPool;
 
+    /**
+     * @var Data
+     */
+    private $configurableProductHelper;
+
+    /**
+     * @var Metadata
+     */
+    private $optionsMetadata;
+
+    /**
+     * @var SelectionUidFormatter
+     */
+    private $selectionUidFormatter;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
     /**
      * @var int[]
      */
@@ -49,16 +78,32 @@ class Collection
     /**
      * @param CollectionFactory $attributeCollectionFactory
      * @param ProductFactory $productFactory
+     * @param ProductRepository $productRepository
      * @param MetadataPool $metadataPool
+     * @param Data $configurableProductHelper
+     * @param Metadata $optionsMetadata
+     * @param SelectionUidFormatter $selectionUidFormatter
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         CollectionFactory $attributeCollectionFactory,
         ProductFactory $productFactory,
-        MetadataPool $metadataPool
+        ProductRepository $productRepository,
+        MetadataPool $metadataPool,
+        Data $configurableProductHelper,
+        Metadata $optionsMetadata,
+        SelectionUidFormatter $selectionUidFormatter,
+        SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->attributeCollectionFactory = $attributeCollectionFactory;
         $this->productFactory = $productFactory;
+        $this->productRepository = $productRepository;
         $this->metadataPool = $metadataPool;
+        $this->configurableProductHelper = $configurableProductHelper;
+        $this->optionsMetadata = $optionsMetadata;
+        $this->selectionUidFormatter = $selectionUidFormatter;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder ??
+            ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
     }
 
     /**
@@ -111,6 +156,8 @@ private function fetch() : array
             $attributeCollection->setProductFilter($product);
         }
 
+        $products = $this->getProducts($this->productIds);
+
         /** @var Attribute $attribute */
         foreach ($attributeCollection->getItems() as $attribute) {
             $productId = (int)$attribute->getProductId();
@@ -128,8 +175,37 @@ private function fetch() : array
             $this->attributeMap[$productId][$attribute->getId()]['values'] = $attributeData['options'];
             $this->attributeMap[$productId][$attribute->getId()]['label']
                 = $attribute->getProductAttribute()->getStoreLabel();
+
+            if (isset($products[$productId])) {
+                $options = $this->configurableProductHelper->getOptions(
+                    $products[$productId],
+                    $this->optionsMetadata->getAllowProducts($products[$productId])
+                );
+                foreach ($attributeData['options'] as $index => $value) {
+                    $this->attributeMap[$productId][$attribute->getId()]['values'][$index]['uid']
+                        = $this->selectionUidFormatter->encode((int)$attribute->getId(), (int)$value['value_index']);
+                    $this->attributeMap[$productId][$attribute->getId()]['values'][$index]
+                        ['is_available_for_selection'] =
+                        isset($options[$attribute['attribute_id']][$value['value_index']])
+                        && $options[$attribute['attribute_id']][$value['value_index']];
+                }
+            }
         }
 
         return $this->attributeMap;
     }
+
+    /**
+     * Load products by entity ids
+     *
+     * @param int[] $productIds
+     * @return ProductInterface[]
+     */
+    private function getProducts($productIds)
+    {
+        $this->searchCriteriaBuilder->addFilter('entity_id', $productIds, 'in');
+        $searchCriteria = $this->searchCriteriaBuilder->create();
+        $products = $this->productRepository->getList($searchCriteria)->getItems();
+        return $products;
+    }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php
new file mode 100644
index 0000000000000..80fbdc76bacb3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Options\DataProvider;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Model\ResourceModel\Stock\StatusFactory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Retrieve child products
+ */
+class Variant
+{
+    /**
+     * @var Configurable
+     */
+    private $configurableType;
+
+    /**
+     * @var StatusFactory
+     */
+    private $stockStatusFactory;
+
+    /**
+     * @param Configurable $configurableType
+     * @param StatusFactory $stockStatusFactory
+     */
+    public function __construct(
+        Configurable $configurableType,
+        StatusFactory $stockStatusFactory
+    ) {
+        $this->configurableType = $configurableType;
+        $this->stockStatusFactory = $stockStatusFactory;
+    }
+
+    /**
+     * Load available child products by parent
+     *
+     * @param ProductInterface $product
+     * @return ProductInterface[]
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function getSalableVariantsByParent(ProductInterface $product)
+    {
+        $collection = $this->configurableType->getUsedProductCollection($product);
+        $collection
+            ->addAttributeToSelect('*')
+            ->addFilterByRequiredOptions();
+        $collection->addMediaGalleryData();
+        $collection->addTierPriceData();
+
+        $stockFlag = 'has_stock_status_filter';
+        if (!$collection->hasFlag($stockFlag)) {
+            $stockStatusResource = $this->stockStatusFactory->create();
+            $stockStatusResource->addStockDataToCollection($collection, true);
+            $collection->setFlag($stockFlag, true);
+        }
+        $collection->clear();
+
+        return $collection->getItems();
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php
new file mode 100644
index 0000000000000..9fa6e4f23fa56
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProductGraphQl\Model\Options;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\ConfigurableProduct\Helper\Data;
+use Magento\ConfigurableProductGraphQl\Model\Options\DataProvider\Variant;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Retrieve metadata for configurable option selection.
+ */
+class Metadata
+{
+    /**
+     * @var Data
+     */
+    private $configurableProductHelper;
+
+    /**
+     * @var SelectionUidFormatter
+     */
+    private $selectionUidFormatter;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var Variant
+     */
+    private $variant;
+
+    /**
+     * @param Data $configurableProductHelper
+     * @param SelectionUidFormatter $selectionUidFormatter
+     * @param ProductRepositoryInterface $productRepository
+     * @param Variant $variant
+     */
+    public function __construct(
+        Data $configurableProductHelper,
+        SelectionUidFormatter $selectionUidFormatter,
+        ProductRepositoryInterface $productRepository,
+        Variant $variant
+    ) {
+        $this->configurableProductHelper = $configurableProductHelper;
+        $this->selectionUidFormatter = $selectionUidFormatter;
+        $this->productRepository = $productRepository;
+        $this->variant = $variant;
+    }
+
+    /**
+     * Load available selections from configurable options.
+     *
+     * @param ProductInterface $product
+     * @param array $selectedOptionsUid
+     * @return array
+     * @throws NoSuchEntityException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function getAvailableSelections(
+        ProductInterface $product,
+        array $selectedOptionsUid
+    ): array {
+        $options = $this->configurableProductHelper->getOptions($product, $this->getAllowProducts($product));
+        $selectedOptions = $this->selectionUidFormatter->extract($selectedOptionsUid);
+        $attributeCodes = $this->getAttributeCodes($product);
+        $availableSelections = $availableProducts = $variantData = [];
+
+        if (isset($options['index']) && $options['index']) {
+            foreach ($options['index'] as $productId => $productOptions) {
+                if (!empty($selectedOptions) && !$this->hasProductRequiredOptions($selectedOptions, $productOptions)) {
+                    continue;
+                }
+
+                $availableProducts[] = $productId;
+                foreach ($productOptions as $attributeId => $optionIndex) {
+                    $uid = $this->selectionUidFormatter->encode($attributeId, (int)$optionIndex);
+
+                    if (isset($availableSelections[$attributeId]['option_value_uids'])
+                        && in_array($uid, $availableSelections[$attributeId]['option_value_uids'])
+                    ) {
+                        continue;
+                    }
+                    $availableSelections[$attributeId]['option_value_uids'][] = $uid;
+                    $availableSelections[$attributeId]['attribute_code'] = $attributeCodes[$attributeId];
+                }
+
+                if ($this->hasSelectionProduct($selectedOptions, $productOptions)) {
+                    $variantProduct = $this->productRepository->getById($productId);
+                    $variantData = $variantProduct->getData();
+                    $variantData['model'] = $variantProduct;
+                }
+            }
+        }
+
+        return [
+            'options_available_for_selection' => $availableSelections,
+            'variant' => $variantData,
+            'availableSelectionProducts' => array_unique($availableProducts),
+            'product' => $product
+        ];
+    }
+
+    /**
+     * Get allowed products.
+     *
+     * @param ProductInterface $product
+     * @return ProductInterface[]
+     */
+    public function getAllowProducts(ProductInterface $product): array
+    {
+        return $this->variant->getSalableVariantsByParent($product) ?? [];
+    }
+
+    /**
+     * Check if a product has the selected options.
+     *
+     * @param array $requiredOptions
+     * @param array $productOptions
+     * @return bool
+     */
+    private function hasProductRequiredOptions($requiredOptions, $productOptions): bool
+    {
+        $result = true;
+        foreach ($requiredOptions as $attributeId => $optionIndex) {
+            if (!isset($productOptions[$attributeId]) || !$productOptions[$attributeId]
+                || $optionIndex != $productOptions[$attributeId]
+            ) {
+                $result = false;
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check if selected options match a product.
+     *
+     * @param array $requiredOptions
+     * @param array $productOptions
+     * @return bool
+     */
+    private function hasSelectionProduct($requiredOptions, $productOptions): bool
+    {
+        return $this->hasProductRequiredOptions($productOptions, $requiredOptions);
+    }
+
+    /**
+     * Retrieve attribute codes
+     *
+     * @param ProductInterface $product
+     * @return string[]
+     */
+    private function getAttributeCodes(ProductInterface $product): array
+    {
+        $allowedAttributes = $this->configurableProductHelper->getAllowAttributes($product);
+        $attributeCodes = [];
+        foreach ($allowedAttributes as $attribute) {
+            $attributeCodes[$attribute->getAttributeId()] = $attribute->getProductAttribute()->getAttributeCode();
+        }
+
+        return $attributeCodes;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php
new file mode 100644
index 0000000000000..1d13ad75489a1
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProductGraphQl\Model\Options;
+
+/**
+ * Handle option selection uid.
+ */
+class SelectionUidFormatter
+{
+    /**
+     * Prefix of uid for encoding
+     */
+    private const UID_PREFIX = 'configurable';
+
+    /**
+     * Separator of uid for encoding
+     */
+    private const UID_SEPARATOR = '/';
+
+    /**
+     * Create uid and encode.
+     *
+     * @param int $attributeId
+     * @param int $indexId
+     * @return string
+     */
+    public function encode(int $attributeId, int $indexId): string
+    {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        return base64_encode(implode(self::UID_SEPARATOR, [
+            self::UID_PREFIX,
+            $attributeId,
+            $indexId
+        ]));
+    }
+
+    /**
+     * Retrieve attribute and option index from uid. Array key is the id of attribute and value is the index of option
+     *
+     * @param string $selectionUids
+     * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function extract(array $selectionUids): array
+    {
+        $attributeOption = [];
+        foreach ($selectionUids as $uid) {
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
+            $optionData = explode(self::UID_SEPARATOR, base64_decode($uid));
+            if (count($optionData) == 3) {
+                $attributeOption[(int)$optionData[1]]  = (int)$optionData[2];
+            }
+        }
+
+        return $attributeOption;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php
new file mode 100644
index 0000000000000..f7d5a96ad2aba
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\ConfigurableProductGraphQl\Model\Options\Metadata;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolver class for option selection metadata.
+ */
+class OptionsSelectionMetadata implements ResolverInterface
+{
+    /**
+     * @var Metadata
+     */
+    private $configurableSelectionMetadata;
+
+    /**
+     * @param Metadata $configurableSelectionMetadata
+     */
+    public function __construct(
+        Metadata $configurableSelectionMetadata
+    ) {
+        $this->configurableSelectionMetadata = $configurableSelectionMetadata;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['model'])) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
+
+        $selectedOptions = $args['selectedConfigurableOptionValues'] ?? [];
+        /** @var ProductInterface $product */
+        $product = $value['model'];
+
+        return $this->configurableSelectionMetadata->getAvailableSelections($product, $selectedOptions);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php
new file mode 100644
index 0000000000000..7b3ddc4ac1417
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolver class for media gallery of child products.
+ */
+class SelectionMediaGallery implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (!isset($value['product']) || !$value['product']) {
+            return null;
+        }
+
+        $product = $value['product'];
+        $availableSelectionProducts = $value['availableSelectionProducts'];
+        $mediaGalleryEntries = [];
+        $usedProducts = $product->getTypeInstance()->getUsedProducts($product, null);
+        foreach ($usedProducts as $usedProduct) {
+            if (in_array($usedProduct->getId(), $availableSelectionProducts)) {
+                foreach ($usedProduct->getMediaGalleryEntries() ?? [] as $key => $entry) {
+                    $index = $usedProduct->getId() . '_' . $key;
+                    $mediaGalleryEntries[$index] = $entry->getData();
+                    $mediaGalleryEntries[$index]['model'] = $usedProduct;
+                    if ($entry->getExtensionAttributes() && $entry->getExtensionAttributes()->getVideoContent()) {
+                        $mediaGalleryEntries[$index]['video_content']
+                            = $entry->getExtensionAttributes()->getVideoContent()->getData();
+                    }
+                }
+            }
+        }
+        return $mediaGalleryEntries;
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php
new file mode 100644
index 0000000000000..625c31a2680c8
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Variant;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Resolver class for product variant.
+ */
+class Variant implements ResolverInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        if (isset($value['variant']['model']) && $value['variant']['model']) {
+            return
+                array_merge(
+                    $value['variant']['model']->getData(),
+                    [
+                        'model' => $value['variant']['model']
+                    ]
+                );
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index 295efb65b1978..73e134e1522a4 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -6,10 +6,12 @@
         "php": "~7.3.0||~7.4.0",
         "magento/module-catalog": "*",
         "magento/module-configurable-product": "*",
+        "magento/module-eav": "*",
         "magento/module-graph-ql": "*",
         "magento/module-catalog-graph-ql": "*",
         "magento/module-quote": "*",
         "magento/module-quote-graph-ql": "*",
+        "magento/module-catalog-inventory": "*",
         "magento/framework": "*"
     },
     "license": [
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
index 808ca62f7e149..dc672b02e2f96 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -43,4 +43,12 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
+        <plugin name="used_products_cache_graphql" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
+    </type>
+
+    <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
+        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder_GraphQl" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
+    </type>
 </config>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
index f249a417f1046..36b6fd40eea15 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
@@ -10,8 +10,10 @@
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_ConfigurableProduct"/>
+            <module name="Magento_Eav"/>
             <module name="Magento_GraphQl"/>
             <module name="Magento_CatalogGraphQl"/>
+            <module name="Magento_CatalogInventory"/>
             <module name="Magento_QuoteGraphQl"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 257bca11fb5b7..88d0f8e212acf 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -7,6 +7,7 @@ type Mutation {
 type ConfigurableProduct implements ProductInterface, PhysicalProductInterface, CustomizableProductInterface @doc(description: "ConfigurableProduct defines basic features of a configurable product and its simple product variants") {
     variants: [ConfigurableVariant] @doc(description: "An array of variants of products") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\ConfigurableVariant")
     configurable_options: [ConfigurableProductOptions] @doc(description: "An array of linked simple product items") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Options")
+    configurable_options_selection_metadata(selectedConfigurableOptionValues: [ID!]): ConfigurableOptionsSelectionMetadata @doc(description: "Metadata for the specified configurable options selection") @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\OptionsSelectionMetadata")
 }
 
 type ConfigurableVariant @doc(description: "An array containing all the simple product variants of a configurable product") {
@@ -34,6 +35,8 @@ type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions de
 }
 
 type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOptionsValues contains the index number assigned to a configurable product option") {
+    uid: ID!
+    is_available_for_selection: Boolean!
     value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
     label: String @doc(description: "The label of the product")
     default_label: String @doc(description: "The label of the product on the default store")
@@ -73,3 +76,14 @@ type ConfigurableWishlistItem implements WishlistItemInterface @doc(description:
     child_sku: String! @doc(description: "The SKU of the simple product corresponding to a set of selected configurable options") @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ChildSku")
     configurable_options: [SelectedConfigurableOption!] @resolver(class: "\\Magento\\ConfigurableProductGraphQl\\Model\\Wishlist\\ConfigurableOptions") @doc (description: "An array of selected configurable options")
 }
+
+type ConfigurableOptionsSelectionMetadata @doc(description: "Metadata corresponding to the configurable options selection.") {
+    options_available_for_selection: [ConfigurableOptionAvailableForSelection!] @doc(description: "Configurable options available for further selection based on current selection.")
+    media_gallery: [MediaGalleryInterface!] @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\SelectionMediaGallery") @doc(description: "Product images and videos corresponding to the specified configurable options selection.")
+    variant: SimpleProduct @resolver(class: "Magento\\ConfigurableProductGraphQl\\Model\\Resolver\\Variant\\Variant") @doc(description: "Variant represented by the specified configurable options selection. It is expected to be null, until selections are made for each configurable option.")
+}
+
+type ConfigurableOptionAvailableForSelection @doc(description: "Configurable option available for further selection based on current selection.") {
+    option_value_uids: [ID!]! @doc(description: "Configurable option values available for further selection.")
+    attribute_code: String! @doc(description: "Attribute code that uniquely identifies configurable option.")
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableOptionsSelectionMetadataTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableOptionsSelectionMetadataTest.php
new file mode 100644
index 0000000000000..f0e4df50794a3
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableOptionsSelectionMetadataTest.php
@@ -0,0 +1,410 @@
+<?php
+
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\ConfigurableProduct;
+
+use Magento\ConfigurableProductGraphQl\Model\Options\SelectionUidFormatter;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\AttributeRepository;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test configurable product option selection.
+ */
+class ConfigurableOptionsSelectionMetadataTest extends GraphQlAbstract
+{
+    /**
+     * @var AttributeRepository
+     */
+    private $attributeRepository;
+
+    /**
+     * @var SelectionUidFormatter
+     */
+    private $selectionUidFormatter;
+
+    private $firstConfigurableAttribute = null;
+
+    private $secondConfigurableAttribute = null;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepository::class);
+        $this->selectionUidFormatter = Bootstrap::getObjectManager()->create(SelectionUidFormatter::class);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+     */
+    public function testWithoutSelectedOption()
+    {
+        $query = <<<QUERY
+{
+   products(filter:{
+     sku: {eq: "configurable_12345"}
+         })
+   {
+    items
+     {
+      id
+      sku
+      name
+      description {
+        html
+      }
+      ... on ConfigurableProduct {
+        configurable_options_selection_metadata(
+          selectedConfigurableOptionValues: []
+        ) {
+          options_available_for_selection {
+            option_value_uids
+            attribute_code
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertEquals(2, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection']));
+        $this->assertEquals(4, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection'][0]['option_value_uids']));
+        $this->assertEquals(4, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection'][1]['option_value_uids']));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+     */
+    public function testSelectedFirstAttributeFirstOption()
+    {
+        $attribute = $this->getFirstConfigurableAttribute();
+        $options = $attribute->getOptions();
+        $firstOptionUid = $this->selectionUidFormatter->encode(
+            (int)$attribute->getAttributeId(),
+            (int)$options[1]->getValue()
+        );
+        $query = <<<QUERY
+{
+   products(filter:{
+     sku: {eq: "configurable_12345"}
+         })
+   {
+    items
+     {
+      id
+      sku
+      name
+      description {
+        html
+      }
+      ... on ConfigurableProduct {
+        configurable_options_selection_metadata(
+          selectedConfigurableOptionValues: ["{$firstOptionUid}"]
+        ) {
+          options_available_for_selection {
+            option_value_uids
+            attribute_code
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertEquals(2, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection']));
+        $this->assertEquals(1, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection'][0]['option_value_uids']));
+        $this->assertEquals($firstOptionUid, $response['products']['items'][0]
+            ['configurable_options_selection_metadata']['options_available_for_selection'][0]['option_value_uids'][0]);
+        $this->assertEquals(4, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection'][1]['option_value_uids']));
+
+        $secondAttributeOptions = $this->getSecondConfigurableAttribute()->getOptions();
+        $this->assertAvailableOptionUids(
+            $this->getSecondConfigurableAttribute()->getAttributeId(),
+            $secondAttributeOptions,
+            $response['products']['items'][0]['configurable_options_selection_metadata']
+                ['options_available_for_selection'][1]['option_value_uids']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+     */
+    public function testSelectedFirstAttributeLastOption()
+    {
+        $attribute = $this->getFirstConfigurableAttribute();
+        $options = $attribute->getOptions();
+        $lastOptionUid = $this->selectionUidFormatter->encode(
+            (int)$attribute->getAttributeId(),
+            (int)$options[4]->getValue()
+        );
+        $query = <<<QUERY
+{
+   products(filter:{
+     sku: {eq: "configurable_12345"}
+         })
+   {
+    items
+     {
+      id
+      sku
+      name
+      description {
+        html
+      }
+      ... on ConfigurableProduct {
+        configurable_options_selection_metadata(
+          selectedConfigurableOptionValues: ["{$lastOptionUid}"]
+        ) {
+          options_available_for_selection {
+            option_value_uids
+            attribute_code
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertEquals(2, count($response['products']['items'][0]['configurable_options_selection_metadata']
+        ['options_available_for_selection']));
+        $this->assertEquals(1, count($response['products']['items'][0]['configurable_options_selection_metadata']
+        ['options_available_for_selection'][0]['option_value_uids']));
+        $this->assertEquals($lastOptionUid, $response['products']['items'][0]['configurable_options_selection_metadata']
+        ['options_available_for_selection'][0]['option_value_uids'][0]);
+        $this->assertEquals(2, count($response['products']['items'][0]['configurable_options_selection_metadata']
+        ['options_available_for_selection'][1]['option_value_uids']));
+        $secondAttributeOptions = $this->getSecondConfigurableAttribute()->getOptions();
+        unset($secondAttributeOptions[0]);
+        unset($secondAttributeOptions[1]);
+        unset($secondAttributeOptions[2]);
+        $this->assertAvailableOptionUids(
+            $this->getSecondConfigurableAttribute()->getAttributeId(),
+            $secondAttributeOptions,
+            $response['products']['items'][0]['configurable_options_selection_metadata']
+            ['options_available_for_selection'][1]['option_value_uids']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+     */
+    public function testSelectedVariant()
+    {
+        $firstAttribute = $this->getFirstConfigurableAttribute();
+        $firstOptions = $firstAttribute->getOptions();
+        $firstAttributeFirstOptionUid = $this->selectionUidFormatter->encode(
+            (int)$firstAttribute->getAttributeId(),
+            (int)$firstOptions[1]->getValue()
+        );
+        $secodnAttribute = $this->getSecondConfigurableAttribute();
+        $secondOptions = $secodnAttribute->getOptions();
+        $secondAttributeFirstOptionUid = $this->selectionUidFormatter->encode(
+            (int)$secodnAttribute->getAttributeId(),
+            (int)$secondOptions[1]->getValue()
+        );
+        $query = <<<QUERY
+{
+   products(filter:{
+     sku: {eq: "configurable_12345"}
+         })
+   {
+    items
+     {
+      id
+      sku
+      name
+      description {
+        html
+      }
+      ... on ConfigurableProduct {
+        configurable_options_selection_metadata(
+          selectedConfigurableOptionValues: ["{$firstAttributeFirstOptionUid}", "{$secondAttributeFirstOptionUid}"]
+        ) {
+          options_available_for_selection {
+            option_value_uids
+          }
+          variant {
+            id
+            sku
+            name
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertNotNull($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['variant']);
+        $this->assertEquals(
+            'simple_' . $firstOptions[1]->getValue() . '_' . $secondOptions[1]->getValue(),
+            $response['products']['items'][0]['configurable_options_selection_metadata']
+            ['variant']['sku']
+        );
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+     */
+    public function testMediaGalleryForAll()
+    {
+        $query = <<<QUERY
+{
+   products(filter:{
+     sku: {eq: "configurable_12345"}
+         })
+   {
+    items
+     {
+      id
+      sku
+      name
+      description {
+        html
+      }
+      ... on ConfigurableProduct {
+        configurable_options_selection_metadata(
+          selectedConfigurableOptionValues: []
+        ) {
+          options_available_for_selection {
+            option_value_uids
+            attribute_code
+          }
+          media_gallery {
+            url
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertEquals(14, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['media_gallery']));
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
+     */
+    public function testMediaGalleryWithSelection()
+    {
+        $attribute = $this->getFirstConfigurableAttribute();
+        $options = $attribute->getOptions();
+        $lastOptionUid = $this->selectionUidFormatter->encode(
+            (int)$attribute->getAttributeId(),
+            (int)$options[4]->getValue()
+        );
+        $query = <<<QUERY
+{
+   products(filter:{
+     sku: {eq: "configurable_12345"}
+         })
+   {
+    items
+     {
+      id
+      sku
+      name
+      description {
+        html
+      }
+      ... on ConfigurableProduct {
+        configurable_options_selection_metadata(
+          selectedConfigurableOptionValues: ["$lastOptionUid"]
+        ) {
+          options_available_for_selection {
+            option_value_uids
+            attribute_code
+          }
+          media_gallery {
+            url
+          }
+        }
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertEquals(1, count($response['products']['items']));
+        $this->assertEquals(2, count($response['products']['items'][0]['configurable_options_selection_metadata']
+            ['media_gallery']));
+    }
+
+    /**
+     * Assert option uid.
+     *
+     * @param $attributeId
+     * @param $expectedOptions
+     * @param $selectedOptions
+     */
+    private function assertAvailableOptionUids($attributeId, $expectedOptions, $selectedOptions)
+    {
+        unset($expectedOptions[0]);
+        foreach ($expectedOptions as $option) {
+            $this->assertContains(
+                $this->selectionUidFormatter->encode((int)$attributeId, (int)$option->getValue()),
+                $selectedOptions
+            );
+        }
+    }
+
+    /**
+     * Get first configurable attribute.
+     *
+     * @return AttributeInterface
+     * @throws NoSuchEntityException
+     */
+    private function getFirstConfigurableAttribute()
+    {
+        if (!$this->firstConfigurableAttribute) {
+            $attributeCode = 'test_configurable_first';
+            $this->firstConfigurableAttribute = $this->attributeRepository->get('catalog_product', $attributeCode);
+        }
+
+        return $this->firstConfigurableAttribute;
+    }
+
+    /**
+     * Get second configurable attribute.
+     *
+     * @return AttributeInterface
+     * @throws NoSuchEntityException
+     */
+    private function getSecondConfigurableAttribute()
+    {
+        if (!$this->secondConfigurableAttribute) {
+            $attributeCode = 'test_configurable_second';
+            $this->secondConfigurableAttribute = $this->attributeRepository->get('catalog_product', $attributeCode);
+        }
+
+        return $this->secondConfigurableAttribute;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
new file mode 100644
index 0000000000000..24e6010275bac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination.php
@@ -0,0 +1,188 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor as PriceIndexerProcessor;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\CatalogInventory\Model\Stock\Item;
+use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\Framework\Api\Data\ImageContentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_first.php'
+);
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_second.php'
+);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+
+/** @var $installer CategorySetup */
+$installer = Bootstrap::getObjectManager()->create(CategorySetup::class);
+
+/** @var \Magento\Eav\Model\Config $eavConfig */
+$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+$firstAttribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable_first');
+$secondAttribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable_second');
+
+/* Create simple products per each option value*/
+/** @var AttributeOptionInterface[] $firstAttributeOptions */
+$firstAttributeOptions = $firstAttribute->getOptions();
+/** @var AttributeOptionInterface[] $secondAttributeOptions */
+$secondAttributeOptions = $secondAttribute->getOptions();
+
+$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+$associatedProductIds = [];
+$firstAttributeValues =  [];
+$secondAttributeValues = [];
+$testImagePath = __DIR__ . '/magento_image.jpg';
+
+array_shift($firstAttributeOptions);
+array_shift($secondAttributeOptions);
+foreach ($firstAttributeOptions as $i => $firstAttributeOption) {
+    $firstAttributeValues[] = [
+        'label' => 'test first ' . $firstAttributeOption->getValue(),
+        'attribute_id' => $firstAttribute->getId(),
+        'value_index' => $firstAttributeOption->getValue(),
+    ];
+    foreach ($secondAttributeOptions as $j => $secondAttributeOption) {
+        if ($i == 3 && in_array($j, [0, 1])) {
+            $qty = 0;
+            $isInStock = 0;
+        } else {
+            $qty = 100;
+            $isInStock = 1;
+        }
+        $product = Bootstrap::getObjectManager()->create(Product::class);
+        $product->setTypeId(Type::TYPE_SIMPLE)
+            ->setAttributeSetId($attributeSetId)
+            ->setWebsiteIds([1])
+            ->setName(
+                'Configurable Option ' . $firstAttributeOption->getLabel() . '-' . $secondAttributeOption->getLabel()
+            )
+            ->setSku('simple_' . $firstAttributeOption->getValue() . '_' . $secondAttributeOption->getValue())
+            ->setPrice($firstAttributeOption->getValue() + $secondAttributeOption->getValue())
+            ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+            ->setStatus(Status::STATUS_ENABLED)
+            ->setStockData(
+                ['use_config_manage_stock' => 1, 'qty' => $qty, 'is_qty_decimal' => 0, 'is_in_stock' => $isInStock]
+            )
+            ->setImage('/m/a/magento_image.jpg')
+            ->setSmallImage('/m/a/magento_image.jpg')
+            ->setThumbnail('/m/a/magento_image.jpg')
+            ->setData(
+                'media_gallery',
+                [
+                    'images' => [
+                        [
+                            'file' => '/m/a/magento_image.jpg',
+                            'position' => 1,
+                            'label' => 'Image Alt Text',
+                            'disabled' => 0,
+                            'media_type' => 'image',
+                            'content' => [
+                                'data' => [
+                                    ImageContentInterface::BASE64_ENCODED_DATA => base64_encode(
+                                        file_get_contents($testImagePath)
+                                    ),
+                                    ImageContentInterface::NAME => 'simple_' . $firstAttributeOption->getValue() .
+                                        '_' . $secondAttributeOption->getValue() . "_1.jpg",
+                                    ImageContentInterface::TYPE => "image/jpeg"
+                                ]
+                            ]
+                        ],
+                    ]
+                ]
+            );
+        $customAttributes = [
+            $firstAttribute->getAttributeCode() => $firstAttributeOption->getValue(),
+            $secondAttribute->getAttributeCode() => $secondAttributeOption->getValue()
+        ];
+        foreach ($customAttributes as $attributeCode => $attributeValue) {
+            $product->setCustomAttributes($customAttributes);
+        }
+        $product = $productRepository->save($product);
+        $associatedProductIds[] = $product->getId();
+
+        /** @var \Magento\CatalogInventory\Model\Stock\Item $stockItem */
+        $stockItem = Bootstrap::getObjectManager()->create(Item::class);
+        $stockItem->load($product->getId(), 'product_id');
+
+        if (!$stockItem->getProductId()) {
+            $stockItem->setProductId($product->getId());
+        }
+        $stockItem->setUseConfigManageStock(1);
+        $stockItem->setQty($qty);
+        $stockItem->setIsQtyDecimal(0);
+        $stockItem->setIsInStock($isInStock);
+        $stockItem->save();
+
+        $secondAttributeValues[$j] = [
+            'label' => 'test second ' . $firstAttributeOption->getValue() . $secondAttributeOption->getValue(),
+            'attribute_id' => $secondAttribute->getId(),
+            'value_index' => $secondAttributeOption->getValue(),
+        ];
+    }
+
+}
+
+$indexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
+$indexerProcessor->reindexList($associatedProductIds, true);
+
+/** @var $product Product */
+$product = Bootstrap::getObjectManager()->create(Product::class);
+
+/** @var Factory $optionsFactory */
+$optionsFactory = Bootstrap::getObjectManager()->create(Factory::class);
+
+$configurableAttributesData = [
+    [
+        'attribute_id' => $firstAttribute->getId(),
+        'code' => $firstAttribute->getAttributeCode(),
+        'label' => $firstAttribute->getStoreLabel(),
+        'position' => '0',
+        'values' => $firstAttributeValues,
+    ],
+    [
+        'attribute_id' => $secondAttribute->getId(),
+        'code' => $secondAttribute->getAttributeCode(),
+        'label' => $secondAttribute->getStoreLabel(),
+        'position' => '1',
+        'values' => $secondAttributeValues,
+    ],
+];
+
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+$firstAttributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
+
+$extensionConfigurableAttributes = $product->getExtensionAttributes();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(Configurable::TYPE_CODE)
+    ->setAttributeSetId($firstAttributeSetId)
+    ->setWebsiteIds([1])
+    ->setName('Configurable Product 12345')
+    ->setSku('configurable_12345')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+$productRepository->cleanCache();
+$product = $productRepository->save($product);
+
+$indexerProcessor = Bootstrap::getObjectManager()->get(PriceIndexerProcessor::class);
+$indexerProcessor->reindexRow($product->getId(), true);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination_rollback.php
new file mode 100644
index 0000000000000..b5527b8484a19
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products_with_two_attributes_combination_rollback.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Setup\CategorySetup;
+use Magento\CatalogInventory\Model\Stock\Status;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\Eav\Api\Data\AttributeOptionInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+
+/** @var $installer CategorySetup */
+$installer = $objectManager->create(CategorySetup::class);
+
+/** @var Config $eavConfig */
+$eavConfig = $objectManager->get(Config::class);
+$firstAttribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable_first');
+$secondAttribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable_second');
+
+/** @var AttributeOptionInterface[] $firstAttributeOptions */
+$firstAttributeOptions = $firstAttribute->getOptions();
+/** @var AttributeOptionInterface[] $secondAttributeOptions */
+$secondAttributeOptions = $secondAttribute->getOptions();
+
+array_shift($firstAttributeOptions);
+array_shift($secondAttributeOptions);
+foreach ($firstAttributeOptions as $i => $firstAttributeOption) {
+    foreach ($secondAttributeOptions as $j => $secondAttributeOption) {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = $objectManager->get(ProductRepositoryInterface::class);
+        try {
+            //delete child product
+            $sku = 'simple_' . $firstAttributeOption->getValue() . '_' . $secondAttributeOption->getValue();
+            $product = $productRepository->get($sku, true);
+            $stockStatus = $objectManager->create(Status::class);
+            $stockStatus->load($product->getEntityId(), 'product_id');
+            $stockStatus->delete();
+            $productRepository->delete($product);
+        } catch (NoSuchEntityException $e) {
+            //Product already removed
+        }
+    }
+}
+
+//delete configurable product
+try {
+    $product = $productRepository->get('configurable_12345', true);
+    $stockStatus = $objectManager->create(Status::class);
+    $stockStatus->load($product->getEntityId(), 'product_id');
+    $stockStatus->delete();
+
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+    //Product already removed
+}
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_first_rollback.php'
+);
+Resolver::getInstance()->requireDataFixture(
+    'Magento/ConfigurableProduct/_files/configurable_attribute_second_rollback.php'
+);
+
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Catalog/_files/product_image_rollback.php'
+);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From bf014eb0e19b5f2f4a977aea3af9cb21e136fb1c Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Tue, 6 Oct 2020 23:03:27 +0200
Subject: [PATCH 457/671] 29251 remove redundant dependency

---
 app/code/Magento/ConfigurableProductGraphQl/composer.json  | 1 -
 app/code/Magento/ConfigurableProductGraphQl/etc/module.xml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index 73e134e1522a4..a6e1d1c822435 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -6,7 +6,6 @@
         "php": "~7.3.0||~7.4.0",
         "magento/module-catalog": "*",
         "magento/module-configurable-product": "*",
-        "magento/module-eav": "*",
         "magento/module-graph-ql": "*",
         "magento/module-catalog-graph-ql": "*",
         "magento/module-quote": "*",
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
index 36b6fd40eea15..3aa1658c9388d 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
@@ -10,7 +10,6 @@
         <sequence>
             <module name="Magento_Catalog"/>
             <module name="Magento_ConfigurableProduct"/>
-            <module name="Magento_Eav"/>
             <module name="Magento_GraphQl"/>
             <module name="Magento_CatalogGraphQl"/>
             <module name="Magento_CatalogInventory"/>

From ccc83b21a25aee282be830891b5708017e992211 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Wed, 7 Oct 2020 10:03:28 +0200
Subject: [PATCH 458/671] Fix #30296 - Wrong ip value in sendfriend_log table

---
 .../Model/ResourceModel/SendFriend.php        | 10 +++---
 .../SendFriend/Model/SendFriendTest.php       |  9 +++--
 .../HTTP/PhpEnvironment/RemoteAddress.php     | 10 +++---
 .../Unit/PhpEnvironment/RemoteAddressTest.php | 33 +++++++------------
 4 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
index 618d941f7047e..468fb2ed1af66 100644
--- a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
@@ -6,10 +6,6 @@
 namespace Magento\SendFriend\Model\ResourceModel;
 
 /**
- * SendFriend Log Resource Model
- *
- * @author      Magento Core Team <core@magentocommerce.com>
- *
  * @api
  * @since 100.0.2
  */
@@ -32,6 +28,7 @@ protected function _construct()
      * @param int $ip
      * @param int $startTime
      * @param int $websiteId
+     *
      * @return int
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -58,14 +55,16 @@ public function getSendCount($object, $ip, $startTime, $websiteId = null)
      * @param int $ip
      * @param int $startTime
      * @param int $websiteId
+     *
      * @return $this
      */
     public function addSendItem($ip, $startTime, $websiteId)
     {
         $this->getConnection()->insert(
             $this->getMainTable(),
-            ['ip' => ip2long($ip), 'time' => $startTime, 'website_id' => $websiteId]
+            ['ip' => $ip, 'time' => $startTime, 'website_id' => $websiteId]
         );
+
         return $this;
     }
 
@@ -73,6 +72,7 @@ public function addSendItem($ip, $startTime, $websiteId)
      * Delete Old logs
      *
      * @param int $time
+     *
      * @return $this
      */
     public function deleteLogsBefore($time)
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
index 7013346fd76e2..9117f088e6b8d 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
@@ -13,7 +13,7 @@
 use Magento\SendFriend\Helper\Data as SendFriendHelper;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
-use Zend\Stdlib\Parameters;
+use Laminas\Stdlib\Parameters;
 
 /**
  * Class checks send friend model behavior
@@ -55,6 +55,7 @@ protected function setUp(): void
      * @param array $sender
      * @param array $recipients
      * @param string|bool $expectedResult
+     *
      * @return void
      */
     public function testValidate(array $sender, array $recipients, $expectedResult): void
@@ -185,11 +186,11 @@ public function testisExceedLimitByCookies(): void
      * @magentoDataFixture Magento/SendFriend/_files/sendfriend_log_record_half_hour_before.php
      *
      * @magentoDbIsolation disabled
+     *
      * @return void
      */
     public function testisExceedLimitByIp(): void
     {
-        $this->markTestSkipped('Blocked by MC-31968');
         $parameters = $this->objectManager->create(Parameters::class);
         $parameters->set('REMOTE_ADDR', '127.0.0.1');
         $this->request->setServer($parameters);
@@ -197,10 +198,11 @@ public function testisExceedLimitByIp(): void
     }
 
     /**
-     * Check result
+     * Check test result
      *
      * @param array|bool $expectedResult
      * @param array|bool $result
+     *
      * @return void
      */
     private function checkResult($expectedResult, $result): void
@@ -217,6 +219,7 @@ private function checkResult($expectedResult, $result): void
      *
      * @param array $sender
      * @param array $recipients
+     *
      * @return void
      */
     private function prepareData(array $sender, array $recipients): void
diff --git a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
index dfe4b759e85be..c505c82789f81 100644
--- a/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
+++ b/lib/internal/Magento/Framework/HTTP/PhpEnvironment/RemoteAddress.php
@@ -120,7 +120,7 @@ function (string $ip) {
     public function getRemoteAddress(bool $ipToLong = false)
     {
         if ($this->remoteAddress !== null) {
-            return $this->remoteAddress;
+            return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
         }
 
         $remoteAddress = $this->readAddress();
@@ -135,11 +135,11 @@ public function getRemoteAddress(bool $ipToLong = false)
             $this->remoteAddress = false;
 
             return false;
-        } else {
-            $this->remoteAddress = $remoteAddress;
-
-            return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
         }
+
+        $this->remoteAddress = $remoteAddress;
+
+        return $ipToLong ? ip2long($this->remoteAddress) : $this->remoteAddress;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
index 25f665ed70e84..20aafb797ce0e 100644
--- a/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
+++ b/lib/internal/Magento/Framework/HTTP/Test/Unit/PhpEnvironment/RemoteAddressTest.php
@@ -9,13 +9,10 @@
 
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 /**
- * Test for
- *
  * @see RemoteAddress
  */
 class RemoteAddressTest extends TestCase
@@ -23,24 +20,17 @@ class RemoteAddressTest extends TestCase
     /**
      * @var MockObject|HttpRequest
      */
-    protected $_request;
-
-    /**
-     * @var ObjectManager
-     */
-    protected $_objectManager;
+    private $requestMock;
 
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->_request = $this->getMockBuilder(HttpRequest::class)
+        $this->requestMock = $this->getMockBuilder(HttpRequest::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getServer'])
+            ->onlyMethods(['getServer'])
             ->getMock();
-
-        $this->_objectManager = new ObjectManager($this);
     }
 
     /**
@@ -49,6 +39,7 @@ protected function setUp(): void
      * @param string|bool $expected
      * @param bool $ipToLong
      * @param string[]|null $trustedProxies
+     *
      * @return void
      * @dataProvider getRemoteAddressProvider
      */
@@ -59,18 +50,16 @@ public function testGetRemoteAddress(
         bool $ipToLong,
         array $trustedProxies = null
     ): void {
-        $remoteAddress = $this->_objectManager->getObject(
-            RemoteAddress::class,
-            [
-                'httpRequest' => $this->_request,
-                'alternativeHeaders' => $alternativeHeaders,
-                'trustedProxies' => $trustedProxies,
-            ]
+        $remoteAddress = new RemoteAddress(
+            $this->requestMock,
+            $alternativeHeaders,
+            $trustedProxies
         );
-        $this->_request->expects($this->any())
-            ->method('getServer')
+        $this->requestMock->method('getServer')
             ->willReturnMap($serverValueMap);
 
+        // Check twice to verify if internal variable is cached correctly
+        $this->assertEquals($expected, $remoteAddress->getRemoteAddress($ipToLong));
         $this->assertEquals($expected, $remoteAddress->getRemoteAddress($ipToLong));
     }
 

From e9e951d639b0f8eee1454385eaa24f628b4428c5 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Wed, 7 Oct 2020 11:36:45 +0300
Subject: [PATCH 459/671] MC-37102: Create automated test for "Create customer,
 with 2 websites and with different allowed countries"

---
 .../CreateAccountWithAddressTest.php          | 113 ++++++++++++++++++
 .../Model/Address/CreateAddressTest.php       |  17 +++
 2 files changed, 130 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagement/CreateAccountWithAddressTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagement/CreateAccountWithAddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagement/CreateAccountWithAddressTest.php
new file mode 100644
index 0000000000000..351c84680389b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagement/CreateAccountWithAddressTest.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Customer\Model\AccountManagement;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\AddressInterfaceFactory;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for creation customer with address via customer account management service.
+ *
+ * @magentoDbIsolation enabled
+ */
+class CreateAccountWithAddressTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var AccountManagementInterface */
+    private $accountManagement;
+
+    /** @var CustomerInterfaceFactory */
+    private $customerFactory;
+
+    /** @var CustomerRepositoryInterface */
+    private $customerRepository;
+
+    /** @var AddressInterfaceFactory */
+    private $addressFactory;
+
+    /** @var CustomerInterface */
+    private $customer;
+
+    /** @var Registry */
+    private $registry;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->accountManagement = $this->objectManager->get(AccountManagementInterface::class);
+        $this->customerFactory = $this->objectManager->get(CustomerInterfaceFactory::class);
+        $this->customerRepository = $this->objectManager->get(CustomerRepositoryInterface::class);
+        $this->addressFactory = $this->objectManager->get(AddressInterfaceFactory::class);
+        $this->registry = $this->objectManager->get(Registry::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        if ($this->customer instanceof CustomerInterface) {
+            $this->registry->unregister('isSecureArea');
+            $this->registry->register('isSecureArea', true);
+            $this->customerRepository->delete($this->customer);
+            $this->registry->unregister('isSecureArea');
+            $this->registry->register('isSecureArea', false);
+        }
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     * @magentoConfigFixture default_store general/country/allow BD,BB,AF
+     * @magentoConfigFixture fixture_second_store_store general/country/allow AS,BM
+     * @return void
+     */
+    public function testCreateNewCustomerWithAddress(): void
+    {
+        $availableCountry = 'BD';
+        $address = $this->addressFactory->create();
+        $address->setCountryId($availableCountry)
+            ->setPostcode('75477')
+            ->setRegionId(1)
+            ->setStreet(['Green str, 67'])
+            ->setTelephone('3468676')
+            ->setCity('CityM')
+            ->setFirstname('John')
+            ->setLastname('Smith')
+            ->setIsDefaultShipping(true)
+            ->setIsDefaultBilling(true);
+        $customerEntity = $this->customerFactory->create();
+        $customerEntity->setEmail('test@example.com')
+            ->setFirstname('John')
+            ->setLastname('Smith')
+            ->setStoreId(1);
+        $customerEntity->setAddresses([$address]);
+        $this->customer = $this->accountManagement->createAccount($customerEntity);
+        $this->assertCount(1, $this->customer->getAddresses(), 'The available address wasn\'t saved.');
+        $this->assertSame(
+            $availableCountry,
+            $this->customer->getAddresses()[0]->getCountryId(),
+            'The address was saved with disallowed country.'
+        );
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/Address/CreateAddressTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/Address/CreateAddressTest.php
index eb638eeb329aa..79f8b1466d8d3 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/Address/CreateAddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/Address/CreateAddressTest.php
@@ -424,6 +424,23 @@ public function testAddressCreatedWithGroupAssignByVatIdWithError(): void
         $this->assertEquals(2, $this->getCustomerGroupId('customer5@example.com'));
     }
 
+    /**
+     * @magentoDataFixture Magento/Customer/_files/customer_no_address.php
+     * @magentoDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     * @magentoConfigFixture default_store general/country/allow BD,BB,AF
+     * @magentoConfigFixture fixture_second_store_store general/country/allow AS,BM
+     *
+     * @return void
+     */
+    public function testCreateAvailableAddress(): void
+    {
+        $countryId = 'BB';
+        $addressData = array_merge(self::STATIC_CUSTOMER_ADDRESS_DATA, [AddressInterface::COUNTRY_ID => $countryId]);
+        $customer = $this->customerRepository->get('customer5@example.com');
+        $address = $this->createAddress((int)$customer->getId(), $addressData);
+        $this->assertSame($countryId, $address->getCountryId());
+    }
+
     /**
      * Create customer address with provided address data.
      *

From cc51b773ebe44a252fc8889c3fe45dba29455b2c Mon Sep 17 00:00:00 2001
From: Namrata Vora <namrata@seepossible.com>
Date: Wed, 7 Oct 2020 14:11:17 +0530
Subject: [PATCH 460/671] Added correct block class for frontend viewModel
 reference example.

---
 lib/internal/Magento/Framework/View/Element/Template.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 53355203213fa..e9f164ca2fd14 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -19,7 +19,7 @@
  * custom view models in block arguments in layout handle file.
  *
  * Example:
- * <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
+ * <block name="my.block" class="Magento\Framework\View\Element\Template" template="My_Module::template.phtml" >
  *      <arguments>
  *          <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
  *      </arguments>

From d1aaa1e7bed1ad20262075a1d06322ca57bd82eb Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 7 Oct 2020 14:31:50 +0300
Subject: [PATCH 461/671] MC-38031: Checkout with Multiple Addresses - Review
 Page does not follow the configured total sort order

---
 .../Multishipping/Block/Checkout/Overview.php | 37 +++++++++++++-
 .../Test/Unit/Block/Checkout/OverviewTest.php | 50 ++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 1ea2dc2618778..ef6dae2182f10 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -10,6 +10,8 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Checkout\Helper\Data as CheckoutHelper;
 use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Model\Quote\Address\Total\Collector;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Multishipping checkout overview information
@@ -430,7 +432,7 @@ public function getBillingAddressTotals()
     public function renderTotals($totals, $colspan = null)
     {
         //check if the shipment is multi shipment
-        $totals = $this->getMultishippingTotals($totals);
+        $totals = $this->sortTotals($this->getMultishippingTotals($totals));
 
         if ($colspan === null) {
             $colspan = 3;
@@ -481,4 +483,37 @@ protected function _getRowItemRenderer($type)
         }
         return $renderer;
     }
+
+    /**
+     * Sort total information based on configuration settings.
+     *
+     * @param array $totals
+     * @return array
+     */
+    private function sortTotals($totals): array
+    {
+        $sortedTotals = [];
+        $sorts = $this->_scopeConfig->getValue(
+            Collector::XML_PATH_SALES_TOTALS_SORT,
+            ScopeInterface::SCOPE_STORES
+        );
+
+        foreach ($sorts as $code => $sortOrder) {
+            $sorted[$sortOrder] = $code;
+        }
+        ksort($sorted);
+
+        foreach ($sorted as $code) {
+            if (isset($totals[$code])) {
+                $sortedTotals[$code] = $totals[$code];
+            }
+        }
+
+        $notSorted = array_diff(array_keys($totals), array_keys($sortedTotals));
+        foreach ($notSorted as $code) {
+            $sortedTotals[$code] = $totals[$code];
+        }
+
+        return $sortedTotals;
+    }
 }
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
index 7da77030f308a..2d044afd32c70 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Multishipping\Test\Unit\Block\Checkout;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\UrlInterface;
@@ -67,6 +68,11 @@ class OverviewTest extends TestCase
      */
     private $urlBuilderMock;
 
+    /**
+     * @var MockObject
+     */
+    private $scopeConfigMock;
+
     protected function setUp(): void
     {
         $objectManager = new ObjectManager($this);
@@ -85,6 +91,7 @@ protected function setUp(): void
             $this->createMock(Multishipping::class);
         $this->quoteMock = $this->createMock(Quote::class);
         $this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
         $this->model = $objectManager->getObject(
             Overview::class,
             [
@@ -92,7 +99,8 @@ protected function setUp(): void
                 'totalsCollector' => $this->totalsCollectorMock,
                 'totalsReader' => $this->totalsReaderMock,
                 'multishipping' => $this->checkoutMock,
-                'urlBuilder' => $this->urlBuilderMock
+                'urlBuilder' => $this->urlBuilderMock,
+                '_scopeConfig' => $this->scopeConfigMock
             ]
         );
     }
@@ -187,4 +195,44 @@ public function testGetVirtualProductEditUrl()
         $this->urlBuilderMock->expects($this->once())->method('getUrl')->with('checkout/cart', [])->willReturn($url);
         $this->assertEquals($url, $this->model->getVirtualProductEditUrl());
     }
+
+    /**
+     * Test sort total information
+     *
+     * @return void
+     */
+    public function testSortCollectors(): void
+    {
+        $sorts = [
+            'discount' => 40,
+            'subtotal' => 10,
+            'tax' => 20,
+            'shipping' => 30,
+        ];
+
+        $this->scopeConfigMock->method('getValue')
+            ->with('sales/totals_sort', 'stores')
+            ->willReturn($sorts);
+
+        $totalsNotSorted = [
+            'subtotal' => [],
+            'shipping' => [],
+            'tax' => [],
+        ];
+
+        $totalsExpected = [
+            'subtotal' => [],
+            'tax' => [],
+            'shipping' => [],
+        ];
+
+        $method = new \ReflectionMethod($this->model, 'sortTotals');
+        $method->setAccessible(true);
+        $result = $method->invoke($this->model, $totalsNotSorted);
+
+        $this->assertEquals(
+            $totalsExpected,
+            $result
+        );
+    }
 }

From 73c6045330654bbf075538a8ea1ca341ad56f5f8 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 7 Oct 2020 15:14:48 +0300
Subject: [PATCH 462/671] MC-38031: Checkout with Multiple Addresses - Review
 Page does not follow the configured total sort order

---
 app/code/Magento/Multishipping/Block/Checkout/Overview.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index ef6dae2182f10..3d6d4b195050d 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -498,6 +498,7 @@ private function sortTotals($totals): array
             ScopeInterface::SCOPE_STORES
         );
 
+        $sorted = [];
         foreach ($sorts as $code => $sortOrder) {
             $sorted[$sortOrder] = $code;
         }

From 88f63a6cc4d40e89bcbaabfe27f883981222d66b Mon Sep 17 00:00:00 2001
From: Vadim Malesh <51680850+engcom-Charlie@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:29:02 +0300
Subject: [PATCH 463/671] add testCaseId

---
 .../SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
index 52d456bc6225d..d225e5fa28f97 100644
--- a/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
@@ -13,6 +13,7 @@
             <title value="SalesRule Discount Is Applied On PackageValue For TableRate"/>
             <description value="SalesRule Discount Is Applied On PackageValue For TableRate"/>
             <severity value="AVERAGE"/>
+            <testCaseId value="MC-38271"/>
             <group value="shipping"/>
         </annotations>
         <before>

From 7db164672218f0abca653a088dc9123e45e3c87e Mon Sep 17 00:00:00 2001
From: Dmytro Horytskyi <dhorytskyi@magento.com>
Date: Wed, 7 Oct 2020 11:09:46 -0500
Subject: [PATCH 464/671] MC-37347: [OnPrem] Catalog Products Filter in 2.3.3
 not working correctly

---
 ...lterByNameByStoreViewOnProductGridTest.xml | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
index c6f3c69a2aa48..7cf2e132c016d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml
@@ -19,29 +19,35 @@
             <useCaseId value="MC-37347"/>
             <group value="catalog"/>
         </annotations>
+
         <before>
-            <createData entity="SimpleProduct2" stepKey="createSimpleProduct"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct1"/>
+            <createData entity="SimpleProduct2" stepKey="createSimpleProduct2"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
+
         <after>
-            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <deleteData createDataKey="createSimpleProduct1" stepKey="deleteSimpleProduct1"/>
+            <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
+
         <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToEditPage">
-            <argument name="productId" value="$$createSimpleProduct.id$$"/>
+            <argument name="productId" value="$$createSimpleProduct1.id$$"/>
         </actionGroup>
         <actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="switchToDefaultStoreView">
             <argument name="storeView" value="_defaultStore.name"/>
         </actionGroup>
         <scrollToTopOfPage stepKey="scrollToTopOfAdminProductFormSection"/>
         <click selector="{{AdminProductFormSection.productNameUseDefault}}" stepKey="uncheckUseDefault"/>
-        <fillField selector="{{AdminProductFormSection.productName}}" userInput="{{SimpleProduct.name}}" stepKey="fillNewName"/>
+        <fillField selector="{{AdminProductFormSection.productName}}" userInput="$$createSimpleProduct2.name$$" stepKey="fillNewName"/>
         <actionGroup ref="SaveProductFormActionGroup" stepKey="saveSimpleProduct"/>
         <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductIndex"/>
-        <actionGroup ref="FilterProductGridByNameActionGroup" stepKey="filterGridByName">
-            <argument name="product" value="SimpleProduct"/>
+        <actionGroup ref="FilterProductGridByName2ActionGroup" stepKey="filterGridByName">
+            <argument name="name" value="$$createSimpleProduct2.name$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.firstProductRow}}" userInput="{{SimpleProduct2.name}}" stepKey="seeProductNameInGrid"/>
+        <seeElement selector="{{AdminProductGridSection.productRowBySku('$$createSimpleProduct2.sku$$')}}" stepKey="seeProduct2InGrid"/>
+        <dontSeeElement selector="{{AdminProductGridSection.productRowBySku('$$createSimpleProduct1.sku$$')}}" stepKey="dontSeeProduct1InGrid"/>
     </test>
 </tests>

From ae19b0ddc8d05dc788ccb65c60b7518d48991978 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Wed, 7 Oct 2020 20:41:01 +0300
Subject: [PATCH 465/671] MC-38031: Checkout with Multiple Addresses - Review
 Page does not follow the configured total sort order

---
 app/code/Magento/Multishipping/Block/Checkout/Overview.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 3d6d4b195050d..942741e9f7975 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -431,8 +431,11 @@ public function getBillingAddressTotals()
      */
     public function renderTotals($totals, $colspan = null)
     {
-        //check if the shipment is multi shipment
-        $totals = $this->sortTotals($this->getMultishippingTotals($totals));
+        // check if the shipment is multi shipment
+        $totals = $this->getMultishippingTotals($totals);
+
+        // sort totals by configuration settings
+        $totals = $this->sortTotals($totals);
 
         if ($colspan === null) {
             $colspan = 3;

From bc53649c4aaa7cf51ab32dc7fa1000c79263d4ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Wed, 7 Oct 2020 23:05:07 +0200
Subject: [PATCH 466/671] Fix #30296 - fix retrieving send count by ip, add
 verification of ip conversion into int to integration test

---
 .../Model/ResourceModel/SendFriend.php          |  2 +-
 .../Magento/SendFriend/Model/SendFriendTest.php | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
index 468fb2ed1af66..edb572dfdd4d1 100644
--- a/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
+++ b/app/code/Magento/SendFriend/Model/ResourceModel/SendFriend.php
@@ -43,7 +43,7 @@ public function getSendCount($object, $ip, $startTime, $websiteId = null)
                 AND  time>=:time
                 AND  website_id=:website_id'
         );
-        $bind = ['ip' => ip2long($ip), 'time' => $startTime, 'website_id' => (int)$websiteId];
+        $bind = ['ip' => $ip, 'time' => $startTime, 'website_id' => (int)$websiteId];
 
         $row = $connection->fetchRow($select, $bind);
         return $row['count'];
diff --git a/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php b/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
index 9117f088e6b8d..6098883959dd3 100644
--- a/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
+++ b/dev/tests/integration/testsuite/Magento/SendFriend/Model/SendFriendTest.php
@@ -28,6 +28,9 @@ class SendFriendTest extends TestCase
     /** @var SendFriend */
     private $sendFriend;
 
+    /** @var ResourceModel\SendFriend */
+    private $sendFriendResource;
+
     /** @var CookieManagerInterface */
     private $cookieManager;
 
@@ -43,6 +46,7 @@ protected function setUp(): void
 
         $this->objectManager = Bootstrap::getObjectManager();
         $this->sendFriend = $this->objectManager->get(SendFriendFactory::class)->create();
+        $this->sendFriendResource = $this->objectManager->get(ResourceModel\SendFriend::class);
         $this->cookieManager = $this->objectManager->get(CookieManagerInterface::class);
         $this->request = $this->objectManager->get(RequestInterface::class);
     }
@@ -191,10 +195,21 @@ public function testisExceedLimitByCookies(): void
      */
     public function testisExceedLimitByIp(): void
     {
+        $remoteAddr = '127.0.0.1';
         $parameters = $this->objectManager->create(Parameters::class);
-        $parameters->set('REMOTE_ADDR', '127.0.0.1');
+        $parameters->set('REMOTE_ADDR', $remoteAddr);
         $this->request->setServer($parameters);
         $this->assertTrue($this->sendFriend->isExceedLimit());
+        // Verify that ip is saved correctly as integer value
+        $this->assertEquals(
+            1,
+            (int)$this->sendFriendResource->getSendCount(
+                null,
+                ip2long($remoteAddr),
+                time() - (60 * 60 * 24 * 365),
+                1
+            )
+        );
     }
 
     /**

From 549d029752893e5a849b2f359f8203f50947c847 Mon Sep 17 00:00:00 2001
From: Arnob Saha <arnobsh@gmail.com>
Date: Tue, 6 Oct 2020 21:39:14 -0500
Subject: [PATCH 467/671] MC-37672: Import Error : CSV : Errors

- Adding bengali language for translation
---
 .../Model/Import/ProductTest.php              |  6 ++
 ...valid_url_keys_with_different_language.csv |  4 +
 .../Filter/Test/Unit/TranslitTest.php         |  3 +-
 .../Magento/Framework/Filter/Translit.php     | 99 +++++++++++++++++++
 4 files changed, 111 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_check_valid_url_keys_with_different_language.csv

diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index a9699ea4a8050..5beba9d52f45c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -1646,6 +1646,12 @@ public function validateUrlKeysDataProvider()
                      RowValidatorInterface::ERROR_DUPLICATE_URL_KEY => 0
                  ]
             ],
+            [
+                'products_to_check_valid_url_keys_with_different_language.csv',
+                [
+                    RowValidatorInterface::ERROR_DUPLICATE_URL_KEY => 0
+                ]
+            ],
             [
                 'products_to_check_duplicated_url_keys.csv',
                 [
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_check_valid_url_keys_with_different_language.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_check_valid_url_keys_with_different_language.csv
new file mode 100644
index 0000000000000..0995eba0b3e90
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/products_to_check_valid_url_keys_with_different_language.csv
@@ -0,0 +1,4 @@
+sku,product_type,store_view_code,name,price,attribute_set_code,url_key
+24-MG04,simple,,"লক্ষ্য এনালগ ওয়াচ টি ২০",25,Default,লক্ষ্য এনালগ ওয়াচ টি ২০
+24-MG01,simple,,"ধৈর্যশীলতা ওয়াচ টি ২০",34,Default,ধৈর্যশীলতা ওয়াচ টি ২০
+24-MG03,simple,,"সামিট ওয়াচ টি ২০",58,Default,সামিট ওয়াচ টি ২০
diff --git a/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php b/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php
index c5bd097a280b8..58238dbc7de57 100644
--- a/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php
+++ b/lib/internal/Magento/Framework/Filter/Test/Unit/TranslitTest.php
@@ -62,7 +62,8 @@ public function filterDataProvider()
                 '         EUR ->         ',
                 $isIconv
             ],
-            ['™', 'tm', 'tm', $isIconv]
+            ['™', 'tm', 'tm', $isIconv],
+            ['লক্ষ্য এনালগ ওয়াচ টি ২০', 'laksoa enaalaga oyaoaca tai 20', 'laksoa enaalaga oyaoaca tai 20', $isIconv]
         ];
     }
 
diff --git a/lib/internal/Magento/Framework/Filter/Translit.php b/lib/internal/Magento/Framework/Filter/Translit.php
index a6162aa7a7fff..38ec05d1ee9ba 100644
--- a/lib/internal/Magento/Framework/Filter/Translit.php
+++ b/lib/internal/Magento/Framework/Filter/Translit.php
@@ -399,6 +399,105 @@ class Translit implements \Zend_Filter_Interface
         'ώ' => 'o',
         'Ω' => 'o',
         'Ώ' => 'o',
+        'অ' => 'a',
+        'আ' => 'aa',
+        'ই' => 'i',
+        'ঈ' => 'ii',
+        'উ' => 'u',
+        'ঊ' => 'uu',
+        'ঋ' => 'r',
+        'ৠ' => 'ri',
+        'এ' => 'e',
+        'ঐ' => 'ai',
+        'ও' => 'o',
+        'ঔ' => 'ou',
+        'ক' => 'ka',
+        'খ' => 'kha',
+        'গ' => 'ga',
+        'ঘ' => 'gha',
+        'ঙ' => 'na',
+        'চ' => 'ca',
+        'ছ' => 'cha',
+        'জ' => 'ja',
+        'ঝ' => 'jha',
+        'ঞ' => 'na',
+        'ট' => 'ta',
+        'ঠ' => 'tha',
+        'ড' => 'da',
+        'ড়' => 'ra',
+        'ঢ' => 'dha',
+        'ঢ়' => 'rha',
+        'ণ' => 'na',
+        'ত' => 'ta',
+        'ৎ' => 't',
+        'থ' => 'tha',
+        'দ' => 'da',
+        'ধ' => 'dha',
+        'ন' => 'na',
+        'প' => 'pa',
+        'ফ' => 'pha',
+        'ব' => 'ba',
+        'ভ' => 'bha',
+        'ম' => 'ma',
+        'য' => 'ya',
+        'য়' => 'ya',
+        'র' => 'ra',
+        'ল' => 'la',
+        'শ' => 'sa',
+        'ষ' => 'sha',
+        'স' => 'sa',
+        'হ' => 'ha',
+        '০' => '0',
+        '১' => '1',
+        '২' => '2',
+        '৩' => '3',
+        '৪' => '4',
+        '৫' => '5',
+        '৬' => '6',
+        '৭' => '7',
+        '৮' => '8',
+        '৯' => '9',
+        'ক্ষ' => 'kso',
+        'ষ্ণ' => 'sno',
+        'জ্ঞ' => 'jno',
+        'ঞ্জ' => 'nchho',
+        'হ্ম' => 'hmo',
+        'ঞ্চ' => 'ncho',
+        'ঙ্ক' => 'ngko',
+        'ট্ট' => 'tto',
+        'ক্ষ্ম' => 'ksmo',
+        'হ্ন' => 'hno',
+        'হ্ণ' => 'hno',
+        'ক্র' => 'kro',
+        'গ্ধ' => 'gdho',
+        'ত্র' => 'tro',
+        'ক্ত' => 'kto',
+        'ক্স' => 'kso',
+        'ত্ত' => 'tto',
+        'ত্ম' => 'tmo',
+        'ক্ক' => 'kko',
+        'ক্ম' => 'kmo',
+        'ক্ল' => 'klo',
+        'া' => 'a',
+        'ি' => 'i',
+        'ী' => 'ee',
+        'ু' => 'o',
+        'ূ' => 'u',
+        'ৃ' => 'ri',
+        'ৄ' => 'rii',
+        'ে' => 'a',
+        'ৈ' => 'ai',
+        'ো' => 'o',
+        'ৌ' => 'ow',
+        '্য' => 'a',
+        '্র' => 'r',
+        'ঁ' => 'n',
+        'ঃ' => 'oh',
+        '়' => 'o',
+        '্' => 'h',
+        'ং' => 'ng',
+        'ৢ' => 'n',
+        'ৣ' => 'nn'
     ];
 
     /**

From 61cb299119dacdb5f5553cb1b46f038ca32a39fa Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 8 Oct 2020 12:59:33 +0300
Subject: [PATCH 468/671] MC-36830: [Issue] Fix for empty category field values
 in REST calls

---
 .../Category/Product/Plugin/TableResolver.php |  5 +-
 .../Product/Plugin/TableResolverTest.php      | 77 +++++++++++++++++++
 .../Unit/Model/ResourceModel/IndexTest.php    | 42 ++++++++++
 .../ScopeResolver/IndexScopeResolver.php      |  3 +
 4 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/TableResolverTest.php

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
index 936e6163cbcc5..0c0c72b0322dc 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/TableResolver.php
@@ -55,7 +55,10 @@ public function afterGetTableName(
         string $result,
         $modelEntity
     ) {
-        if (!is_array($modelEntity) && $modelEntity === AbstractAction::MAIN_INDEX_TABLE) {
+        if (!is_array($modelEntity) &&
+            $modelEntity === AbstractAction::MAIN_INDEX_TABLE &&
+            $this->storeManager->getStore()->getId()
+        ) {
             $catalogCategoryProductDimension = new Dimension(
                 \Magento\Store\Model\Store::ENTITY,
                 $this->storeManager->getStore()->getId()
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/TableResolverTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/TableResolverTest.php
new file mode 100644
index 0000000000000..c5018f1aa6313
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Category/Product/Plugin/TableResolverTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Test\Unit\Model\Indexer\Category\Product\Plugin;
+
+use Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\TestCase;
+
+class TableResolverTest extends TestCase
+{
+    /**
+     * Tests replacing catalog_category_product_index table name
+     *
+     * @param int $storeId
+     * @param string $tableName
+     * @param string $expected
+     * @dataProvider afterGetTableNameDataProvider
+     */
+    public function testAfterGetTableName(int $storeId, string $tableName, string $expected): void
+    {
+        $storeManagerMock = $this->getMockForAbstractClass(StoreManagerInterface::class);
+
+        $storeMock = $this->getMockBuilder(Store::class)
+            ->onlyMethods(['getId'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeMock->method('getId')
+            ->willReturn($storeId);
+
+        $storeManagerMock->method('getStore')->willReturn($storeMock);
+
+        $tableResolverMock = $this->getMockBuilder(IndexScopeResolver::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $tableResolverMock->method('resolve')->willReturn('catalog_category_product_index_store1');
+
+        $subjectMock = $this->getMockBuilder(ResourceConnection::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $model = new TableResolver($storeManagerMock, $tableResolverMock);
+
+        $this->assertEquals(
+            $expected,
+            $model->afterGetTableName($subjectMock, $tableName, 'catalog_category_product_index')
+        );
+    }
+
+    /**
+     * Data provider for testAfterGetTableName
+     *
+     * @return array
+     */
+    public function afterGetTableNameDataProvider(): array
+    {
+        return [
+            [
+                'storeId' => 1,
+                'tableName' => 'catalog_category_product_index',
+                'expected' => 'catalog_category_product_index_store1'
+            ],
+            [
+                'storeId' => 0,
+                'tableName' => 'catalog_category_product_index',
+                'expected' => 'catalog_category_product_index'
+            ],
+        ];
+    }
+}
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
index d6f5fb9368378..5aca7e6c2555b 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
@@ -417,6 +417,48 @@ public function testGetCategoryProductIndexData()
         );
     }
 
+    /**
+     * Test getCategoryProductIndexData method for all stores
+     */
+    public function testGetCategoryProductIndexDataForAllStores()
+    {
+        $connection = $this->connection;
+        $select = $this->select;
+
+        $connection->expects($this->any())
+            ->method('select')
+            ->willReturn($select);
+
+        $select->expects($this->any())
+            ->method('from')
+            ->with(
+                ['catalog_category_product_index'],
+                ['category_id', 'product_id', 'position', 'store_id']
+            )->willReturnSelf();
+
+        $select->expects($this->any())
+            ->method('where')
+            ->willReturnSelf();
+
+        $connection->expects($this->once())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([[
+                'product_id' => 1,
+                'category_id' => 1,
+                'position' => 1,
+            ]]);
+
+        $this->assertEquals(
+            [
+                1 => [
+                    1 => 1,
+                ],
+            ],
+            $this->model->getCategoryProductIndexData(0, [1])
+        );
+    }
+
     /**
      * Test getMovedCategoryProductIds method
      */
diff --git a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
index a68de6ad36f9a..164d2da3d9123 100644
--- a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
+++ b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
@@ -44,6 +44,9 @@ public function resolve($index, array $dimensions)
     {
         $tableNameParts = [];
         foreach ($dimensions as $dimension) {
+            if (!$dimension->getValue()) {
+                continue;
+            }
             switch ($dimension->getName()) {
                 case 'scope':
                     $tableNameParts[$dimension->getName()] = $dimension->getName() . $this->getScopeId($dimension);

From 1c1e70e1f96e9e027b667a9c9fc4cb7aca78dc19 Mon Sep 17 00:00:00 2001
From: Sudheer S <sudheers@kensium.com>
Date: Thu, 8 Oct 2020 16:50:34 +0530
Subject: [PATCH 469/671] 30349: Product filter with category_id does not work
 as expected - fixed total_count and items issues

---
 .../Model/Resolver/Products/DataProvider/ProductSearch.php      | 2 +-
 .../CollectionProcessor/FilterProcessor/CategoryFilter.php      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
index 4807cad54bd50..13bd29e83d87f 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php
@@ -113,7 +113,7 @@ public function getList(
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($searchCriteriaForCollection);
         $searchResults->setItems($collection->getItems());
-        $searchResults->setTotalCount($searchResult->getTotalCount());
+        $searchResults->setTotalCount($collection->getSize());
         return $searchResults;
     }
 
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
index f709f8cd6eb72..92888a2775e17 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
@@ -61,7 +61,6 @@ public function apply(Filter $filter, AbstractDb $collection)
             $category = $this->categoryFactory->create();
             $this->categoryResourceModel->load($category, $categoryId);
             $categoryProducts[$categoryId] = $category->getProductCollection()->getAllIds();
-            $collection->addCategoryFilter($category);
         }
 
         $categoryProductIds = array_unique(array_merge(...$categoryProducts));

From 4a59b3e205907feab9957450f5dc3fd972d396c0 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Thu, 8 Oct 2020 15:54:23 +0300
Subject: [PATCH 470/671] MC-36830: [Issue] Fix for empty category field values
 in REST calls

---
 .../Unit/Model/ResourceModel/IndexTest.php    | 42 -------------------
 .../ScopeResolver/IndexScopeResolver.php      |  3 --
 2 files changed, 45 deletions(-)

diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
index 5aca7e6c2555b..d6f5fb9368378 100644
--- a/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
+++ b/app/code/Magento/Elasticsearch/Test/Unit/Model/ResourceModel/IndexTest.php
@@ -417,48 +417,6 @@ public function testGetCategoryProductIndexData()
         );
     }
 
-    /**
-     * Test getCategoryProductIndexData method for all stores
-     */
-    public function testGetCategoryProductIndexDataForAllStores()
-    {
-        $connection = $this->connection;
-        $select = $this->select;
-
-        $connection->expects($this->any())
-            ->method('select')
-            ->willReturn($select);
-
-        $select->expects($this->any())
-            ->method('from')
-            ->with(
-                ['catalog_category_product_index'],
-                ['category_id', 'product_id', 'position', 'store_id']
-            )->willReturnSelf();
-
-        $select->expects($this->any())
-            ->method('where')
-            ->willReturnSelf();
-
-        $connection->expects($this->once())
-            ->method('fetchAll')
-            ->with($select)
-            ->willReturn([[
-                'product_id' => 1,
-                'category_id' => 1,
-                'position' => 1,
-            ]]);
-
-        $this->assertEquals(
-            [
-                1 => [
-                    1 => 1,
-                ],
-            ],
-            $this->model->getCategoryProductIndexData(0, [1])
-        );
-    }
-
     /**
      * Test getMovedCategoryProductIds method
      */
diff --git a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
index 164d2da3d9123..a68de6ad36f9a 100644
--- a/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
+++ b/lib/internal/Magento/Framework/Indexer/ScopeResolver/IndexScopeResolver.php
@@ -44,9 +44,6 @@ public function resolve($index, array $dimensions)
     {
         $tableNameParts = [];
         foreach ($dimensions as $dimension) {
-            if (!$dimension->getValue()) {
-                continue;
-            }
             switch ($dimension->getName()) {
                 case 'scope':
                     $tableNameParts[$dimension->getName()] = $dimension->getName() . $this->getScopeId($dimension);

From 374593d408c53dc0272310a756a317e90715971e Mon Sep 17 00:00:00 2001
From: tuna <ladiesman9x@gmail.com>
Date: Mon, 5 Oct 2020 18:31:28 +0700
Subject: [PATCH 471/671] Clean code and remove whitespace in markup

up
---
 .../frontend/templates/layer/filter.phtml     | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
index 6b65d184b462a..83f40ab4911e7 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <?php
-/** @var $block \Magento\LayeredNavigation\Block\Navigation\FilterRenderer */
+/** @var \Magento\LayeredNavigation\Block\Navigation\FilterRenderer $block */
+/** @var \Magento\Framework\Escaper $escaper */
 /** @var \Magento\LayeredNavigation\ViewModel\Layer\Filter $viewModel */
 $viewModel = $block->getData('product_layer_view_model');
 ?>
@@ -16,28 +16,29 @@ $viewModel = $block->getData('product_layer_view_model');
     <?php foreach ($filterItems as $filterItem): ?>
         <li class="item">
             <?php if ($filterItem->getCount() > 0): ?>
-                <a href="<?= $block->escapeUrl($filterItem->getUrl()) ?>" rel="nofollow">
-                    <?= /* @noEscape */ $filterItem->getLabel() ?>
-                    <?php if ($viewModel->shouldDisplayProductCountOnLayer()): ?>
-                        <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?>
-                          <span class="filter-count-label">
-                            <?php if ($filterItem->getCount() == 1):
-                                ?> <?= $block->escapeHtml(__('item')) ?><?php
+                <a
+                    href="<?= $escaper->escapeUrl($filterItem->getUrl()) ?>"
+                    rel="nofollow"
+                ><?= /* @noEscape */ $filterItem->getLabel() ?><?php
+                if ($viewModel->shouldDisplayProductCountOnLayer()): ?><span
+                        class="count"><?= /* @noEscape */ (int) $filterItem->getCount() ?><span
+                            class="filter-count-label"><?php
+                            if ($filterItem->getCount() == 1): ?>
+                                <?= $escaper->escapeHtml(__('item')) ?><?php
                             else:
-                                ?> <?= $block->escapeHtml(__('item')) ?><?php
+                                ?><?= $escaper->escapeHtml(__('item')) ?><?php
                             endif;?></span></span>
-                    <?php endif; ?>
-                </a>
+                    <?php endif; ?></a>
             <?php else: ?>
-                <?= /* @noEscape */ $filterItem->getLabel() ?>
-                <?php if ($viewModel->shouldDisplayProductCountOnLayer()): ?>
-                    <span class="count"><?= /* @noEscape */ (int)$filterItem->getCount() ?>
-                      <span class="filter-count-label">
-                        <?php if ($filterItem->getCount() == 1):
-                            ?><?= $block->escapeHtml(__('items')) ?><?php
-                        else:
-                            ?><?= $block->escapeHtml(__('items')) ?><?php
-                        endif;?></span></span>
+                <?= /* @noEscape */ $filterItem->getLabel() ?><?php
+                if ($viewModel->shouldDisplayProductCountOnLayer()): ?><span
+                        class="count"><?= /* @noEscape */ (int) $filterItem->getCount() ?><span
+                            class="filter-count-label"><?php
+                            if ($filterItem->getCount() == 1): ?>
+                                <?= $escaper->escapeHtml(__('items')) ?><?php
+                            else:
+                                ?><?= $escaper->escapeHtml(__('items')) ?><?php
+                            endif;?></span></span>
                 <?php endif; ?>
             <?php endif; ?>
         </li>

From aa034d06859b1bff72121d98d094ec0944084140 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Fri, 9 Oct 2020 12:01:48 +0300
Subject: [PATCH 472/671] MC-30631: Database sessions pile up

---
 .../Magento/Framework/Session/Config.php      | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 296b7944ea4f6..3bb30d0f6ec3e 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -28,6 +28,18 @@ class Config implements ConfigInterface
     /** Configuration path for session cache limiter */
     const PARAM_SESSION_CACHE_LIMITER = 'session/cache_limiter';
 
+    /** Configuration path for session garbage collection probability */
+    const PARAM_SESSION_GC_PROBABILITY = 'session/gc_probability';
+
+    /** Configuration path for session garbage collection divisor */
+    const PARAM_SESSION_GC_DIVISOR = 'session/gc_divisor';
+
+    /**
+     * Configuration path for session garbage collection max lifetime.
+     * The number of seconds after which data will be seen as 'garbage'.
+     */
+    const PARAM_SESSION_GC_MAXLIFETIME = 'session/gc_maxlifetime';
+
     /** Configuration path for cookie domain */
     const XML_PATH_COOKIE_DOMAIN = 'web/cookie/cookie_domain';
 
@@ -102,6 +114,7 @@ class Config implements ConfigInterface
      * @param string $scopeType
      * @param string $lifetimePath
      * @SuppressWarnings(PHPMD.NPathComplexity)
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function __construct(
         \Magento\Framework\ValidatorFactory $validatorFactory,
@@ -149,6 +162,30 @@ public function __construct(
             $this->setOption('session.cache_limiter', $cacheLimiter);
         }
 
+        /**
+         * Session garbage collection probability
+         */
+        $gcProbability = $deploymentConfig->get(self::PARAM_SESSION_GC_PROBABILITY);
+        if ($gcProbability) {
+            $this->setOption('session.gc_probability', $gcProbability);
+        }
+
+        /**
+         * Session garbage collection divisor
+         */
+        $gcDivisor = $deploymentConfig->get(self::PARAM_SESSION_GC_DIVISOR);
+        if ($gcDivisor) {
+            $this->setOption('session.gc_divisor', $gcDivisor);
+        }
+
+        /**
+         * Session garbage collection max lifetime
+         */
+        $gcMaxlifetime = $deploymentConfig->get(self::PARAM_SESSION_GC_MAXLIFETIME);
+        if ($gcMaxlifetime) {
+            $this->setOption('session.gc_maxlifetime', $gcMaxlifetime);
+        }
+
         /**
          * Cookie settings: lifetime, path, domain, httpOnly. These govern settings for the session cookie.
          */

From c2758f41ba82574273ce9a47786a1ba57eb1eeef Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 9 Oct 2020 12:15:45 +0300
Subject: [PATCH 473/671] MC-35740: Using API to capture payment

---
 .../AddTransactionCommentAfterCapture.php     | 63 +++++++++++++++
 .../AddTransactionCommentAfterCaptureTest.php | 81 +++++++++++++++++++
 app/code/Magento/Sales/etc/webapi_rest/di.xml |  3 +
 app/code/Magento/Sales/etc/webapi_soap/di.xml |  3 +
 4 files changed, 150 insertions(+)
 create mode 100644 app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php
 create mode 100644 app/code/Magento/Sales/Test/Unit/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCaptureTest.php

diff --git a/app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php b/app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php
new file mode 100644
index 0000000000000..256d097b9eef0
--- /dev/null
+++ b/app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Plugin\Model\Service\Invoice;
+
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\Service\InvoiceService;
+
+/**
+ * Plugin to add transaction comment after capture invoice
+ */
+class AddTransactionCommentAfterCapture
+{
+    /**
+     * @var InvoiceRepositoryInterface
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var TransactionFactory
+     */
+    private $transactionFactory;
+
+    /**
+     * @param InvoiceRepositoryInterface $invoiceRepository
+     * @param TransactionFactory $transactionFactory
+     */
+    public function __construct(
+        InvoiceRepositoryInterface $invoiceRepository,
+        TransactionFactory $transactionFactory
+    ) {
+        $this->transactionFactory = $transactionFactory;
+        $this->invoiceRepository = $invoiceRepository;
+    }
+
+    /**
+     * Add transaction comment to the order after capture invoice
+     *
+     * @param InvoiceService $subject
+     * @param bool $result
+     * @param int $invoiceId
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterSetCapture(InvoiceService $subject, bool $result, $invoiceId): bool
+    {
+        if ($result) {
+            $invoice = $this->invoiceRepository->get($invoiceId);
+            $invoice->getOrder()->setIsInProcess(true);
+            $this->transactionFactory->create()
+                ->addObject($invoice)
+                ->addObject($invoice->getOrder())
+                ->save();
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Sales/Test/Unit/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCaptureTest.php b/app/code/Magento/Sales/Test/Unit/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCaptureTest.php
new file mode 100644
index 0000000000000..8d1a2f5256370
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Unit/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCaptureTest.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Test\Unit\Plugin\Model\Service\Invoice;
+
+use Magento\Framework\DB\Transaction;
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Sales\Api\InvoiceRepositoryInterface;
+use Magento\Sales\Model\Order;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\Service\InvoiceService;
+use Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test to add transaction comment to the order after capture invoice
+ */
+class AddTransactionCommentAfterCaptureTest extends TestCase
+{
+    /**
+     * @var InvoiceRepositoryInterface|MockObject
+     */
+    private $invoiceRepository;
+
+    /**
+     * @var TransactionFactory|MockObject
+     */
+    private $transactionFactory;
+
+    /**
+     * @var AddTransactionCommentAfterCapture
+     */
+    private $plugin;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->invoiceRepository = $this->createMock(InvoiceRepositoryInterface::class);
+        $this->transactionFactory = $this->createMock(TransactionFactory::class);
+
+        $this->plugin = new AddTransactionCommentAfterCapture(
+            $this->invoiceRepository,
+            $this->transactionFactory
+        );
+    }
+
+    /**
+     * Test to add transaction comment after capture invoice
+     */
+    public function testPlugin(): void
+    {
+        $result = true;
+        $invoiceId = 3;
+
+        $orderMock = $this->createMock(Order::class);
+        $invoiceMock = $this->createMock(Invoice::class);
+        $invoiceMock->method('getOrder')->willReturn($orderMock);
+        $this->invoiceRepository->method('get')->with($invoiceId)->willReturn($invoiceMock);
+
+        $transactionMock = $this->createMock(Transaction::class);
+        $transactionMock->expects($this->at(0))->method('addObject')->with($invoiceMock)->willReturnSelf();
+        $transactionMock->expects($this->at(1))->method('addObject')->with($orderMock)->willReturnSelf();
+        $transactionMock->expects($this->once())->method('save');
+        $this->transactionFactory->method('create')->willReturn($transactionMock);
+
+        /** @var InvoiceService $invoiceService */
+        $invoiceService = $this->createMock(InvoiceService::class);
+
+        $this->assertEquals(
+            $result,
+            $this->plugin->afterSetCapture($invoiceService, $result, $invoiceId)
+        );
+    }
+}
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 1a8478438b04a..71fc2cab22f13 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -22,4 +22,7 @@
     <type name="Magento\Sales\Model\Order\ShipmentRepository">
         <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
     </type>
+    <type name="Magento\Sales\Model\Service\InvoiceService">
+        <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 1a8478438b04a..71fc2cab22f13 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -22,4 +22,7 @@
     <type name="Magento\Sales\Model\Order\ShipmentRepository">
         <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
     </type>
+    <type name="Magento\Sales\Model\Service\InvoiceService">
+        <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
+    </type>
 </config>

From d00db30ea32c35aa6b5d76ca080a2f5b77c84ee7 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Fri, 9 Oct 2020 12:23:57 +0300
Subject: [PATCH 474/671] MC-37543: Create automated test for "Add static block
 on a category page"

---
 .../Catalog/Block/Category/ViewTest.php       | 91 +++++++++++++++++++
 .../Category/Save/SaveCategoryTest.php        | 83 +++++++++++++++++
 .../_files/category_with_cms_block.php        | 46 ++++++++++
 .../category_with_cms_block_rollback.php      | 32 +++++++
 4 files changed, 252 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php
new file mode 100644
index 0000000000000..d08af2b85a67b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Block\Category;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\View\LayoutInterface;
+use Magento\TestFramework\Catalog\Model\GetCategoryByName;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for view category block.
+ *
+ * @magentoAppArea frontend
+ * @magentoDbIsolation enabled
+ */
+class ViewTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Registry */
+    private $registry;
+
+    /** @var GetCategoryByName */
+    private $getCategoryByName;
+
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var LayoutInterface */
+    private $layout;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->getCategoryByName = $this->objectManager->get(GetCategoryByName::class);
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
+        $this->layout = $this->objectManager->get(LayoutInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister('current_category');
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category_with_cms_block.php
+     *
+     * @return void
+     */
+    public function testCmsBlockDisplayedOnCategory(): void
+    {
+        $categoryId = $this->getCategoryByName->execute('Category with cms block')->getId();
+        $category = $this->categoryRepository->get($categoryId, 1);
+        $this->registerCategory($category);
+        $block = $this->layout->createBlock(View::class)->setTemplate('Magento_Catalog::category/cms.phtml');
+        $this->assertStringContainsString('<h1>Fixture Block Title</h1>', $block->toHtml());
+    }
+
+    /**
+     * Register category in registry
+     *
+     * @param CategoryInterface $category
+     * @return void
+     */
+    private function registerCategory(CategoryInterface $category): void
+    {
+        $this->registry->unregister('current_category');
+        $this->registry->register('current_category', $category);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
new file mode 100644
index 0000000000000..36641e010dfc6
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Category\Save;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Cms\Api\GetBlockByIdentifierInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Test cases related to save category with enabled category flat.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
+ */
+class SaveCategoryTest extends AbstractSaveCategoryTest
+{
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var GetBlockByIdentifierInterface */
+    private $getBlockByIdentifier;
+
+    /** @var string */
+    private $createdCategoryId;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->categoryRepository = $this->_objectManager->get(CategoryRepositoryInterface::class);
+        $this->getBlockByIdentifier = $this->_objectManager->get(GetBlockByIdentifierInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        try {
+            $this->categoryRepository->deleteByIdentifier($this->createdCategoryId);
+        } catch (NoSuchEntityException $e) {
+            //Category already deleted.
+        }
+        $this->createdCategoryId = null;
+
+        parent::tearDown();
+
+    }
+
+    /**
+     * @magentoDataFixture Magento/Cms/_files/block.php
+     *
+     * @return void
+     */
+    public function testCreateCategoryWithCmsBlock(): void
+    {
+        $blockId = $this->getBlockByIdentifier->execute('fixture_block', 1)->getId();
+        $postData = [
+            CategoryInterface::KEY_NAME => 'Category with cms block',
+            CategoryInterface::KEY_IS_ACTIVE => 1,
+            CategoryInterface::KEY_INCLUDE_IN_MENU => 1,
+            'display_mode' => Category::DM_MIXED,
+            'landing_page' => $blockId,
+            'available_sort_by' => 1,
+            'default_sort_by' => 1,
+        ];
+        $responseData = $this->performSaveCategoryRequest($postData);
+        $this->assertRequestIsSuccessfullyPerformed($responseData);
+        $this->createdCategoryId = $responseData['category']['entity_id'];
+        $category = $this->categoryRepository->get($this->createdCategoryId);
+        $this->assertEquals($blockId, $category->getLandingPage());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php
new file mode 100644
index 0000000000000..03eb767741579
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Model\Category;
+use Magento\Cms\Api\GetBlockByIdentifierInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Helper\DefaultCategory;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Cms/_files/block.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+/** @var CategoryInterfaceFactory $categoryFactory */
+$categoryFactory = $objectManager->get(CategoryInterfaceFactory::class);
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+/** @var DefaultCategory $categoryHelper */
+$categoryHelper = $objectManager->get(DefaultCategory::class);
+$currentStoreId = (int)$storeManager->getStore()->getId();
+/** @var GetBlockByIdentifierInterface $getBlockByIdentifierInterface */
+$getBlockByIdentifier = $objectManager->get(GetBlockByIdentifierInterface::class);
+$block = $getBlockByIdentifier->execute('fixture_block', $currentStoreId);
+
+$storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+$category = $categoryFactory->create();
+$category->setName('Category with cms block')
+    ->setParentId($categoryHelper->getId())
+    ->setLevel(2)
+    ->setAvailableSortBy('name')
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->setDisplayMode(Category::DM_MIXED)
+    ->setLandingPage($block->getId());
+$categoryRepository->save($category);
+$storeManager->setCurrentStore($currentStoreId);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block_rollback.php
new file mode 100644
index 0000000000000..4725fde47818c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block_rollback.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Catalog\Model\GetCategoryByName;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+/** @var GetCategoryByName $getCategoryByName */
+$getCategoryByName = $objectManager->get(GetCategoryByName::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+$category = $getCategoryByName->execute('Category with cms block');
+if ($category->getId()) {
+    $categoryRepository->delete($category);
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+Resolver::getInstance()->requireDataFixture('Magento/Cms/_files/block_rollback.php');

From fc47ae2420d64f3f070007a43335781d466340c5 Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Fri, 9 Oct 2020 15:10:01 +0300
Subject: [PATCH 475/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../Catalog/Model/CategoryRepository.php      |  57 +++++---
 .../CategoryRepository/PopulateWithValues.php | 123 ++++++++++++++++++
 .../Catalog/Api/CategoryRepositoryTest.php    |  97 +++++++++++++-
 3 files changed, 252 insertions(+), 25 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php

diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index 0ce52b966c32c..fe3ae4cc468a1 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -7,10 +7,16 @@
 
 namespace Magento\Catalog\Model;
 
+use Magento\Catalog\Model\CategoryRepository\PopulateWithValues;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Framework\Api\ExtensibleDataObjectConverter;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
 use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Repository for categories.
@@ -25,27 +31,27 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
     protected $instances = [];
 
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @var \Magento\Catalog\Model\CategoryFactory
+     * @var CategoryFactory
      */
     protected $categoryFactory;
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Category
+     * @var CategoryResource
      */
     protected $categoryResource;
 
     /**
-     * @var \Magento\Framework\EntityManager\MetadataPool
+     * @var MetadataPool
      */
     protected $metadataPool;
 
     /**
-     * @var \Magento\Framework\Api\ExtensibleDataObjectConverter
+     * @var ExtensibleDataObjectConverter
      */
     private $extensibleDataObjectConverter;
 
@@ -57,28 +63,37 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
     protected $useConfigFields = ['available_sort_by', 'default_sort_by', 'filter_price_range'];
 
     /**
-     * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Category $categoryResource
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @var PopulateWithValues
+     */
+    private $populateWithValues;
+
+    /**
+     * @param CategoryFactory $categoryFactory
+     * @param CategoryResource $categoryResource
+     * @param StoreManagerInterface $storeManager
+     * @param PopulateWithValues $populateWithValues
      */
     public function __construct(
-        \Magento\Catalog\Model\CategoryFactory $categoryFactory,
-        \Magento\Catalog\Model\ResourceModel\Category $categoryResource,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        CategoryFactory $categoryFactory,
+        CategoryResource $categoryResource,
+        StoreManagerInterface $storeManager,
+        PopulateWithValues $populateWithValues
     ) {
         $this->categoryFactory = $categoryFactory;
         $this->categoryResource = $categoryResource;
         $this->storeManager = $storeManager;
+        $objectManager = ObjectManager::getInstance();
+        $this->populateWithValues = $populateWithValues ?? $objectManager->get(PopulateWithValues::class);
     }
 
     /**
      * @inheritdoc
      */
-    public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
+    public function save(CategoryInterface $category)
     {
         $storeId = (int)$this->storeManager->getStore()->getId();
         $existingData = $this->getExtensibleDataObjectConverter()
-            ->toNestedArray($category, [], \Magento\Catalog\Api\Data\CategoryInterface::class);
+            ->toNestedArray($category, [], CategoryInterface::class);
         $existingData = array_diff_key($existingData, array_flip(['path', 'level', 'parent_id']));
         $existingData['store_id'] = $storeId;
 
@@ -110,7 +125,7 @@ public function save(\Magento\Catalog\Api\Data\CategoryInterface $category)
             $existingData['parent_id'] = $parentId;
             $existingData['level'] = null;
         }
-        $category->addData($existingData);
+        $this->populateWithValues->execute($category, $existingData);
         try {
             $this->validateCategory($category);
             $this->categoryResource->save($category);
@@ -151,7 +166,7 @@ public function get($categoryId, $storeId = null)
     /**
      * @inheritdoc
      */
-    public function delete(\Magento\Catalog\Api\Data\CategoryInterface $category)
+    public function delete(CategoryInterface $category)
     {
         try {
             $categoryId = $category->getId();
@@ -213,15 +228,15 @@ protected function validateCategory(Category $category)
     /**
      * Lazy loader for the converter.
      *
-     * @return \Magento\Framework\Api\ExtensibleDataObjectConverter
+     * @return ExtensibleDataObjectConverter
      *
      * @deprecated 101.0.0
      */
     private function getExtensibleDataObjectConverter()
     {
         if ($this->extensibleDataObjectConverter === null) {
-            $this->extensibleDataObjectConverter = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\Api\ExtensibleDataObjectConverter::class);
+            $this->extensibleDataObjectConverter = ObjectManager::getInstance()
+                ->get(ExtensibleDataObjectConverter::class);
         }
         return $this->extensibleDataObjectConverter;
     }
@@ -229,13 +244,13 @@ private function getExtensibleDataObjectConverter()
     /**
      * Lazy loader for the metadata pool.
      *
-     * @return \Magento\Framework\EntityManager\MetadataPool
+     * @return MetadataPool
      */
     private function getMetadataPool()
     {
         if (null === $this->metadataPool) {
-            $this->metadataPool = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\Framework\EntityManager\MetadataPool::class);
+            $this->metadataPool = ObjectManager::getInstance()
+                ->get(MetadataPool::class);
         }
         return $this->metadataPool;
     }
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
new file mode 100644
index 0000000000000..6fdde51bd60de
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\CategoryRepository;
+
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
+use Magento\Catalog\Model\Category;
+use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
+use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
+use Magento\Framework\Api\FilterBuilder;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+
+/**
+ * Add data to category entity and populate with default values
+ */
+class PopulateWithValues
+{
+    /**
+     * @var ScopeOverriddenValue
+     */
+    private $scopeOverriddenValue;
+
+    /**
+     * @var AttributeRepository
+     */
+    private $attributeRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var FilterBuilder
+     */
+    private $filterBuilder;
+
+    /**
+     * @param ScopeOverriddenValue $scopeOverriddenValue
+     * @param AttributeRepository $attributeRepository
+     * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param FilterBuilder $filterBuilder
+     */
+    public function __construct(
+        ScopeOverriddenValue $scopeOverriddenValue,
+        AttributeRepository $attributeRepository,
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        FilterBuilder $filterBuilder
+    ) {
+        $this->scopeOverriddenValue = $scopeOverriddenValue;
+        $this->attributeRepository = $attributeRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->filterBuilder = $filterBuilder;
+    }
+
+    /**
+     * Set null to entity default values
+     *
+     * @param CategoryInterface $category
+     * @param array $existingData
+     * @return void
+     */
+    public function execute(CategoryInterface $category, array $existingData): void
+    {
+        $storeId = $existingData['store_id'];
+        $overriddenValues = array_filter($category->getData(), function ($key) use ($category, $storeId) {
+            /** @var Category $category */
+            return $this->scopeOverriddenValue->containsValue(
+                CategoryInterface::class,
+                $category,
+                $key,
+                $storeId
+            );
+        }, ARRAY_FILTER_USE_KEY);
+        $defaultValues = array_diff_key($category->getData(), $overriddenValues);
+        array_walk($defaultValues, function (&$value, $key) {
+            $attributes = $this->getAttributes();
+            if (isset($attributes[$key]) && !$attributes[$key]->isStatic()) {
+                $value = null;
+            }
+        });
+        $category->addData($defaultValues);
+        $category->addData($existingData);
+        $useDefaultAttributes = array_filter($category->getData(), function ($attributeValue) {
+            return null === $attributeValue;
+        });
+        $category->setData('use_default', array_map(function () {
+            return true;
+        }, $useDefaultAttributes));
+    }
+
+    /**
+     * Returns entity attributes.
+     *
+     * @return AttributeInterface[]
+     */
+    private function getAttributes()
+    {
+        $searchResult = $this->attributeRepository->getList(
+            $this->searchCriteriaBuilder->addFilters(
+                [
+                    $this->filterBuilder
+                        ->setField('is_global')
+                        ->setConditionType('in')
+                        ->setValue([ScopedAttributeInterface::SCOPE_STORE, ScopedAttributeInterface::SCOPE_WEBSITE])
+                        ->create()
+                ]
+            )->create()
+        );
+        $result = [];
+        foreach ($searchResult->getItems() as $attribute) {
+            $result[$attribute->getAttributeCode()] = $attribute;
+        }
+
+        return $result;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
index fd0519ab2b34e..aaf03e82551fd 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -10,10 +10,14 @@
 use Magento\Authorization\Model\RoleFactory;
 use Magento\Authorization\Model\Rules;
 use Magento\Authorization\Model\RulesFactory;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\Integration\Api\AdminTokenServiceInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
+use Magento\UrlRewrite\Model\Storage\DbStorage;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
 /**
@@ -145,8 +149,8 @@ public function testCreate()
      */
     public function testDelete()
     {
-        /** @var \Magento\UrlRewrite\Model\Storage\DbStorage $storage */
-        $storage = Bootstrap::getObjectManager()->get(\Magento\UrlRewrite\Model\Storage\DbStorage::class);
+        /** @var DbStorage $storage */
+        $storage = Bootstrap::getObjectManager()->get(DbStorage::class);
         $categoryId = $this->modelId;
         $data = [
             UrlRewrite::ENTITY_ID => $categoryId,
@@ -290,7 +294,7 @@ public function testUpdateUrlKey()
         $this->assertEquals("Update Category Test New Name", $category->getName());
 
         // check for the url rewrite for the new name
-        $storage = Bootstrap::getObjectManager()->get(\Magento\UrlRewrite\Model\Storage\DbStorage::class);
+        $storage = Bootstrap::getObjectManager()->get(DbStorage::class);
         $data = [
             UrlRewrite::ENTITY_ID => $categoryId,
             UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
@@ -307,7 +311,7 @@ public function testUpdateUrlKey()
         $this->assertEquals('update-category-test-new-name.html', $urlRewrite->getRequestPath());
 
         // check for the forward from the old name to the new name
-        $storage = Bootstrap::getObjectManager()->get(\Magento\UrlRewrite\Model\Storage\DbStorage::class);
+        $storage = Bootstrap::getObjectManager()->get(DbStorage::class);
         $data = [
             UrlRewrite::ENTITY_ID => $categoryId,
             UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
@@ -557,6 +561,91 @@ public function testSaveDesign(): void
         $this->createdCategories = [$result['id']];
     }
 
+    /**
+     * Check if repository does not override default values for attributes out of request
+     *
+     * @throws \Exception
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testUpdateScopeAttribute()
+    {
+        $categoryId = 333;
+        $categoryData = [
+            'name' => 'Scope Specific Value',
+        ];
+        $result = $this->updateCategoryForSpecificStore($categoryId, $categoryData);
+        $this->assertEquals($categoryId, $result['id']);
+
+        /** @var \Magento\Catalog\Model\Category $model */
+        $model = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Category::class);
+        $category = $model->load($categoryId);
+
+        /** @var ScopeOverriddenValue $scopeOverriddenValue */
+        $scopeOverriddenValue = Bootstrap::getObjectManager()->get(ScopeOverriddenValue::class);
+        self::assertTrue($scopeOverriddenValue->containsValue(
+            CategoryInterface::class,
+            $category,
+            'name',
+            Store::DISTRO_STORE_ID
+        ), 'Name is not saved for specific store');
+        self::assertFalse($scopeOverriddenValue->containsValue(
+            CategoryInterface::class,
+            $category,
+            'is_active',
+            Store::DISTRO_STORE_ID
+        ), 'is_active is overriden for default store');
+        self::assertFalse($scopeOverriddenValue->containsValue(
+            CategoryInterface::class,
+            $category,
+            'url_key',
+            Store::DISTRO_STORE_ID
+        ), 'url_key is overriden for default store');
+
+        $this->deleteCategory($categoryId);
+    }
+
+    /**
+     * Update given category via web API for specific store code.
+     *
+     * @param int $id
+     * @param array $data
+     * @param string|null $token
+     * @param string $storeCode
+     * @return array
+     */
+    protected function updateCategoryForSpecificStore(
+        int $id,
+        array $data,
+        ?string $token = null,
+        string $storeCode = 'default'
+    ) {
+        $serviceInfo =
+            [
+                'rest' => [
+                    'resourcePath' => self::RESOURCE_PATH . '/' . $id,
+                    'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+                ],
+                'soap' => [
+                    'service' => self::SERVICE_NAME,
+                    'serviceVersion' => 'V1',
+                    'operation' => self::SERVICE_NAME . 'Save',
+                ],
+            ];
+        if ($token) {
+            $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
+        }
+
+        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
+            $data['id'] = $id;
+
+            return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data], null, $storeCode);
+        } else {
+            $data['id'] = $id;
+
+            return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data], null, $storeCode);
+        }
+    }
+
     /**
      * @inheritDoc
      *

From 1fd701539fef71e05bdcfd7bcf5a09671482d199 Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <engcom-vendorworker-foxtrot@adobe.com>
Date: Fri, 9 Oct 2020 16:18:07 +0300
Subject: [PATCH 476/671] magento/magento2#26967: Fix for queue numeric
 argument conversion - integration test update.

---
 .../Magento/Framework/MessageQueue/TopologyTest.php         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
index c8600e1e38faa..5c85d6ddb7c70 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
@@ -48,7 +48,7 @@ public function testTopologyInstallation(array $expectedConfig, array $bindingCo
         $this->assertArrayHasKey($name, $this->declaredExchanges);
         unset($this->declaredExchanges[$name]['message_stats']);
         unset($this->declaredExchanges[$name]['user_who_performed_action']);
-        $this->assertEquals(
+        $this->assertSame(
             $expectedConfig,
             $this->declaredExchanges[$name],
             'Invalid exchange configuration: ' . $name
@@ -59,7 +59,7 @@ public function testTopologyInstallation(array $expectedConfig, array $bindingCo
             unset($value['properties_key']);
             return $value;
         }, $bindings);
-        $this->assertEquals(
+        $this->assertSame(
             $bindingConfig,
             $bindings,
             'Invalid exchange bindings configuration: ' . $name
@@ -121,7 +121,7 @@ public function exchangeDataProvider()
                         'arguments' => [
                             'argument1' => 'value',
                             'argument2' => true,
-                            'argument3' => '150',
+                            'argument3' => 150,
                         ],
                     ],
                 ]

From 78dd01ad38fdd662f954c933c9b8ea77d63e1a10 Mon Sep 17 00:00:00 2001
From: Jeroen <jeroen@reachdigital.nl>
Date: Fri, 4 Sep 2020 16:34:59 +0200
Subject: [PATCH 477/671] Check if copy method is copy before sending comment
 email

---
 app/code/Magento/Sales/Model/Order/Email/NotifySender.php  | 2 +-
 .../Unit/Model/Order/Email/Sender/AbstractSenderTest.php   | 2 +-
 .../Order/Email/Sender/CreditmemoCommentSenderTest.php     | 7 +++++--
 .../Model/Order/Email/Sender/InvoiceCommentSenderTest.php  | 7 +++++--
 .../Model/Order/Email/Sender/ShipmentCommentSenderTest.php | 7 +++++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
index 9e40ab769b0a6..1bb3053bf751f 100644
--- a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
@@ -35,7 +35,7 @@ protected function checkAndSend(Order $order, $notify = true)
 
         if ($notify) {
             $sender->send();
-        } else {
+        } elseif ($this->identityContainer->getCopyMethod() === 'copy') {
             // Email copies are sent as separated emails if their copy method
             // is 'copy' or a customer should not be notified
             $sender->sendCopyTo();
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
index b826e058b679e..0494616b8cefd 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -192,7 +192,7 @@ public function stepIdentityContainerInit($identityMockClassName)
     {
         $this->identityContainerMock = $this->getMockBuilder($identityMockClassName)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId'])
+            ->onlyMethods(['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod'])
             ->getMock();
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
index 0ed2a379f5b73..d191ae9356236 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/CreditmemoCommentSenderTest.php
@@ -97,7 +97,7 @@ public function testSendVirtualOrder()
         $this->assertFalse($result);
     }
 
-    public function testSendTrueWithCustomerCopy()
+    public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -140,7 +140,7 @@ public function testSendTrueWithCustomerCopy()
         $this->assertTrue($result);
     }
 
-    public function testSendTrueWithoutCustomerCopy()
+    public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -161,6 +161,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(true);
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
index 68f2bd7b1a628..9e4e89766dfe1 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
@@ -65,7 +65,7 @@ public function testSendFalse()
         $this->assertFalse($result);
     }
 
-    public function testSendTrueWithCustomerCopy()
+    public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $this->stepAddressFormat($billingAddress);
@@ -110,7 +110,7 @@ public function testSendTrueWithCustomerCopy()
         $this->assertTrue($result);
     }
 
-    public function testSendTrueWithoutCustomerCopy()
+    public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $customerName = 'Test Customer';
@@ -132,6 +132,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(true);
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
         $this->templateContainerMock->expects($this->once())
             ->method('setTemplateVars')
             ->with(
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
index 5421991fae848..91e7ae18d3550 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
@@ -58,7 +58,7 @@ public function testSendFalse()
         $this->assertFalse($result);
     }
 
-    public function testSendTrueWithCustomerCopy()
+    public function testSendTrueWithoutCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -101,7 +101,7 @@ public function testSendTrueWithCustomerCopy()
         $this->assertTrue($result);
     }
 
-    public function testSendTrueWithoutCustomerCopy()
+    public function testSendTrueWithCustomerCopy()
     {
         $billingAddress = $this->addressMock;
         $comment = 'comment_test';
@@ -116,6 +116,9 @@ public function testSendTrueWithoutCustomerCopy()
         $this->identityContainerMock->expects($this->once())
             ->method('isEnabled')
             ->willReturn(true);
+        $this->identityContainerMock->expects($this->once())
+            ->method('getCopyMethod')
+            ->willReturn('copy');
         $this->orderMock->expects($this->any())
             ->method('getCustomerName')
             ->willReturn($customerName);

From a535faa775d861570058fd80f9ff0f34bbd7515b Mon Sep 17 00:00:00 2001
From: Your Name <mmdhudasia@gmail.com>
Date: Sat, 10 Oct 2020 12:26:16 +0530
Subject: [PATCH 478/671] 26133: Fixed - Coupon code text field not display in
 proper width in Internet Explorer/EDGE browser

---
 .../luma/Magento_Checkout/web/css/source/module/_cart.less | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 5d9746317af55..e8f2d1c5eb1ed 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -727,6 +727,13 @@
                     position: static;
                 }
             }
+            .content {
+              .fieldset {
+                .actions-toolbar {
+                   width: auto;
+                }
+              }
+            }
             &.discount {
                 width: auto;
             }

From af2d29a16e8b7bc30a872d9e20914bdae5b24111 Mon Sep 17 00:00:00 2001
From: Sunil Patel <patelsunil42@gmail.com>
Date: Sat, 10 Oct 2020 07:29:20 +0000
Subject: [PATCH 479/671] magento/magento2#30388 : fix js error on edit review
 page

---
 .../Magento/Review/Block/Adminhtml/Edit.php   | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index c85374edb8d98..15110f4f89cad 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Review\Block\Adminhtml;
 
 /**
@@ -44,7 +45,8 @@ public function __construct(
         \Magento\Review\Helper\Action\Pager $reviewActionPager,
         \Magento\Framework\Registry $registry,
         array $data = []
-    ) {
+    )
+    {
         $this->_coreRegistry = $registry;
         $this->_reviewActionPager = $reviewActionPager;
         $this->_reviewFactory = $reviewFactory;
@@ -78,12 +80,12 @@ protected function _construct()
                 [
                     'label' => __('Previous'),
                     'onclick' => 'setLocation(\'' . $this->getUrl(
-                        'review/*/*',
-                        [
-                            'id' => $prevId,
-                            'ret' => $this->getRequest()->getParam('ret'),
-                        ]
-                    ) . '\')'
+                            'review/*/*',
+                            [
+                                'id' => $prevId,
+                                'ret' => $this->getRequest()->getParam('ret'),
+                            ]
+                        ) . '\')'
                 ],
                 3,
                 10
@@ -139,12 +141,12 @@ protected function _construct()
                 [
                     'label' => __('Next'),
                     'onclick' => 'setLocation(\'' . $this->getUrl(
-                        'review/*/*',
-                        [
-                            'id' => $nextId,
-                            'ret' => $this->getRequest()->getParam('ret'),
-                        ]
-                    ) . '\')'
+                            'review/*/*',
+                            [
+                                'id' => $nextId,
+                                'ret' => $this->getRequest()->getParam('ret'),
+                            ]
+                        ) . '\')'
                 ],
                 3,
                 105
@@ -220,10 +222,13 @@ protected function _construct()
                         );
                     }
            }
-           Event.observe(window, \'load\', function(){
-                 Event.observe($("select_stores"), \'change\', review.updateRating);
-           });
         ';
+        if (!$this->_storeManager->hasSingleStore()) {
+            $this->_formInitScripts[] = 'Event.observe(window, \'load\', function(){
+                     Event.observe($("select_stores"), \'change\', review.updateRating);
+                });
+                 ';
+        }
     }
 
     /**

From e08499bd5083956ac807c4bd93354714bc9005f7 Mon Sep 17 00:00:00 2001
From: Sunil Patel <patelsunil42@gmail.com>
Date: Sat, 10 Oct 2020 07:40:39 +0000
Subject: [PATCH 480/671] magento/magento2#30388 : fix js error on edit review
 page

---
 .../Magento/Review/Block/Adminhtml/Edit.php   | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index 15110f4f89cad..c5667af20c82c 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Review\Block\Adminhtml;
 
 /**
@@ -45,8 +44,7 @@ public function __construct(
         \Magento\Review\Helper\Action\Pager $reviewActionPager,
         \Magento\Framework\Registry $registry,
         array $data = []
-    )
-    {
+    ) {
         $this->_coreRegistry = $registry;
         $this->_reviewActionPager = $reviewActionPager;
         $this->_reviewFactory = $reviewFactory;
@@ -80,12 +78,12 @@ protected function _construct()
                 [
                     'label' => __('Previous'),
                     'onclick' => 'setLocation(\'' . $this->getUrl(
-                            'review/*/*',
-                            [
-                                'id' => $prevId,
-                                'ret' => $this->getRequest()->getParam('ret'),
-                            ]
-                        ) . '\')'
+                        'review/*/*',
+                        [
+                            'id' => $prevId,
+                            'ret' => $this->getRequest()->getParam('ret'),
+                        ]
+                    ) . '\')'
                 ],
                 3,
                 10
@@ -141,12 +139,12 @@ protected function _construct()
                 [
                     'label' => __('Next'),
                     'onclick' => 'setLocation(\'' . $this->getUrl(
-                            'review/*/*',
-                            [
-                                'id' => $nextId,
-                                'ret' => $this->getRequest()->getParam('ret'),
-                            ]
-                        ) . '\')'
+                        'review/*/*',
+                        [
+                            'id' => $nextId,
+                            'ret' => $this->getRequest()->getParam('ret'),
+                        ]
+                    ) . '\')'
                 ],
                 3,
                 105

From a4be3e0e51eae4f8d9ebc4c8b9c833ef656aa779 Mon Sep 17 00:00:00 2001
From: Sunil Patel <patelsunil42@gmail.com>
Date: Sat, 10 Oct 2020 09:48:23 +0000
Subject: [PATCH 481/671] magento/magento2#30347 : fix js error on delete
 bundle options

---
 .../view/adminhtml/web/js/components/bundle-dynamic-rows.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js
index e9b05182b855d..7f07750812497 100644
--- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js
+++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js
@@ -72,7 +72,7 @@ define([
          */
         removeBundleItemsFromOption: function (index) {
             var bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName),
-                bundleSelectionsLength = (bundleSelections.elems() || []).length,
+                bundleSelectionsLength = bundleSelections ? (bundleSelections.elems() || []).length:[],
                 i;
 
             if (bundleSelectionsLength) {

From a88f5808e69a3823645988cb0a6e3f91fc682272 Mon Sep 17 00:00:00 2001
From: Sunil Patel <patelsunil42@gmail.com>
Date: Sat, 10 Oct 2020 09:52:49 +0000
Subject: [PATCH 482/671] Revert "magento/magento2#30347 : fix js error on
 delete bundle options"

This reverts commit a4be3e0e51eae4f8d9ebc4c8b9c833ef656aa779.
---
 .../view/adminhtml/web/js/components/bundle-dynamic-rows.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js
index 7f07750812497..e9b05182b855d 100644
--- a/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js
+++ b/app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-dynamic-rows.js
@@ -72,7 +72,7 @@ define([
          */
         removeBundleItemsFromOption: function (index) {
             var bundleSelections = registry.get(this.name + '.' + index + '.' + this.bundleSelectionsName),
-                bundleSelectionsLength = bundleSelections ? (bundleSelections.elems() || []).length:[],
+                bundleSelectionsLength = (bundleSelections.elems() || []).length,
                 i;
 
             if (bundleSelectionsLength) {

From 7ea472187a74f57588ea5945646cadd356e9da95 Mon Sep 17 00:00:00 2001
From: Sunil Patel <patelsunil42@gmail.com>
Date: Sat, 10 Oct 2020 10:58:30 +0000
Subject: [PATCH 483/671] magento/magento2#30388 : fix js error on edit review
 page

---
 app/code/Magento/Review/Block/Adminhtml/Edit.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index c5667af20c82c..9162d293f9332 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -222,9 +222,12 @@ protected function _construct()
            }
         ';
         if (!$this->_storeManager->hasSingleStore()) {
-            $this->_formInitScripts[] = 'Event.observe(window, \'load\', function(){
-                     Event.observe($("select_stores"), \'change\', review.updateRating);
-                });
+            $this->_formInitScripts[] = '
+                    require(["jquery","prototype"], function(jQuery){
+                        Event.observe(window, \'load\', function(){
+                        Event.observe($("select_stores"), \'change\', review.updateRating);
+                        });
+                      })
                  ';
         }
     }

From 5be9b846a007e0b08e4e3349db4e7903c88fe8ae Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Sun, 11 Oct 2020 09:48:30 +0300
Subject: [PATCH 484/671] MC-38113: Same shipping address is repeating multiple
 times in storefront checkout when Reordered

---
 ...ckoutFillingShippingSectionActionGroup.xml |  1 +
 ...CustomerHasNoOtherAddressesActionGroup.xml | 17 ++++++
 .../Magento/Sales/Model/AdminOrder/Create.php |  6 ++
 .../ActionGroup/AdminReorderActionGroup.xml   | 22 +++++++
 ...eorderAddressNotSavedInAddressBookTest.xml | 58 +++++++++++++++++++
 .../templates/order/create/form/address.phtml |  4 +-
 6 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml
 create mode 100644 app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
index 60188224871eb..e1092a87e4a01 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
@@ -27,6 +27,7 @@
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForShippingLoadingMask"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
         <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml
new file mode 100644
index 0000000000000..58a5069403b7f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml
@@ -0,0 +1,17 @@
+<?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="AssertCustomerHasNoOtherAddressesActionGroup">
+        <annotations>
+            <description>Verifies customer no additional address in address book</description>
+        </annotations>
+        <amOnPage url="customer/address/" stepKey="goToAddressPage"/>
+        <waitForText userInput="You have no other address entries in your address book." selector=".block-addresses-list" stepKey="assertOtherAddresses"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 393d61b69bf22..80e0ce168d7f5 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -550,6 +550,9 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
 
         $quote = $this->getQuote();
         if (!$quote->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) {
+            $quote->getBillingAddress()->setCustomerAddressId(
+                $quote->getShippingAddress()->getCustomerAddressId()
+            );
             $this->setShippingAsBilling(1);
         }
 
@@ -2120,6 +2123,9 @@ private function isAddressesAreEqual(Order $order)
             $billingData['address_type'],
             $billingData['entity_id']
         );
+        if (isset($shippingData['customer_address_id']) && !isset($billingData['customer_address_id'])) {
+            unset($shippingData['customer_address_id']);
+        }
 
         return $shippingData == $billingData;
     }
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml
new file mode 100644
index 0000000000000..f4f076f25af8b
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.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="AdminReorderActionGroup">
+        <annotations>
+            <description>Reorder existing order. Requires admin order page to be opened.</description>
+        </annotations>
+
+        <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
+        <waitForPageLoad stepKey="waitPageLoad"/>
+
+        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmit"/>
+        <waitForPageLoad stepKey="waitOrderCreated"/>
+        <waitForText selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeOrderCreatedMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
new file mode 100644
index 0000000000000..aca0c4e6a8f8a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminReorderAddressNotSavedInAddressBookTest">
+        <annotations>
+            <title value="Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
+            <stories value="MC-38113: Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
+            <description value="Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
+            <features value="Sales"/>
+            <testCaseId value="MC-38113"/>
+            <severity value="MAJOR"/>
+            <group value="Sales"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="Category"/>
+            <createData entity="ApiSimpleProduct" stepKey="Product">
+                <requiredEntity createDataKey="Category"/>
+            </createData>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
+            <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
+                <argument name="customer" value="CustomerEntityOne"/>
+            </actionGroup>
+            <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
+        </before>
+        <after>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <actionGroup ref="DeleteCustomerFromAdminActionGroup" stepKey="deleteCustomer"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <deleteData createDataKey="Product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="Category" stepKey="deleteCategory"/>
+        </after>
+
+        <!-- Create order for registered customer -->
+        <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToOrder">
+            <argument name="product" value="$Product$"/>
+        </actionGroup>
+        <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="openCheckoutPage"/>
+        <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="fillAddressForm"/>
+        <actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
+        <grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
+
+        <!-- Reorder created order -->
+        <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderById">
+            <argument name="orderId" value="$grabOrderNumber"/>
+        </actionGroup>
+        <actionGroup ref="AdminReorderActionGroup" stepKey="reorder"/>
+
+        <!-- Assert no additional addresses saved -->
+        <actionGroup ref="AssertCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index dc007e4801b41..12927dcf526a3 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -114,7 +114,9 @@ endif; ?>
                    type="checkbox"
                    id="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
                    value="1"
-                <?php if (!$block->getDontSaveInAddressBook()): ?> checked="checked"<?php endif; ?>
+                <?php if (!$block->getDontSaveInAddressBook() && !$block->getAddressId()): ?>
+                    checked="checked"
+                <?php endif; ?>
                    class="admin__control-checkbox"/>
             <label for="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
                    class="admin__field-label"><?= $block->escapeHtml(__('Save in address book')) ?></label>

From 9d093c9d0e91512caa64b4a3476cbf4476d41b04 Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Sun, 11 Oct 2020 10:23:43 +0300
Subject: [PATCH 485/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../Catalog/Model/CategoryRepository/PopulateWithValues.php   | 2 +-
 .../testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
index 6fdde51bd60de..410aa3db1f255 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
@@ -10,7 +10,7 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
 use Magento\Catalog\Model\Category;
-use Magento\Eav\Api\AttributeRepositoryInterface as AttributeRepository;
+use Magento\Catalog\Api\CategoryAttributeRepositoryInterface as AttributeRepository;
 use Magento\Eav\Api\Data\AttributeInterface;
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Framework\Api\FilterBuilder;
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
index aaf03e82551fd..e7d47ff64a109 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -593,13 +593,13 @@ public function testUpdateScopeAttribute()
             $category,
             'is_active',
             Store::DISTRO_STORE_ID
-        ), 'is_active is overriden for default store');
+        ), 'is_active is overridden for default store');
         self::assertFalse($scopeOverriddenValue->containsValue(
             CategoryInterface::class,
             $category,
             'url_key',
             Store::DISTRO_STORE_ID
-        ), 'url_key is overriden for default store');
+        ), 'url_key is overridden for default store');
 
         $this->deleteCategory($categoryId);
     }

From 28bcc626117050e1306ac2e00ac190acd0e82f69 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Mon, 12 Oct 2020 09:05:43 +0300
Subject: [PATCH 486/671] MC-37543: Create automated test for "Add static block
 on a category page"

---
 .../Controller/Adminhtml/Category/Save/SaveCategoryTest.php    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
index 36641e010dfc6..155a5f255c15a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
@@ -14,7 +14,7 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
- * Test cases related to save category with enabled category flat.
+ * Test cases for save category controller.
  *
  * @magentoAppArea adminhtml
  * @magentoDbIsolation disabled
@@ -54,7 +54,6 @@ protected function tearDown(): void
         $this->createdCategoryId = null;
 
         parent::tearDown();
-
     }
 
     /**

From d8a15b946939ac1bc48997bea6b5a99e39057622 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 12 Oct 2020 10:22:09 +0300
Subject: [PATCH 487/671] MC-25172: [MFTF] AppConfigDumpSuite Does Not Clean Up
 in After Steps Which Breaks CLI Configuration Steps In Tests That Run Later
 in Execution

---
 app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml | 1 +
 .../AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml b/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml
index 762d17bdf87f1..127677ce05e0d 100644
--- a/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml
+++ b/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml
@@ -8,6 +8,7 @@
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="AppConfigDumpSuite">
         <before>
+            <!-- Command app:config:dump is not reversible and magento instance stays configuration read only after this test. You need to restore etc/env.php manually to make magento configuration writable again.-->
             <magentoCLI command="app:config:dump" stepKey="configDump"/>
         </before>
         <after>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
index 188b12c6a91c3..0c0372850a3c4 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Test/AdminCheckInputFieldsDisabledAfterAppConfigDumpTest.xml
@@ -13,13 +13,14 @@
             <features value="Configuration"/>
             <stories value="Disable configuration inputs"/>
             <title value="Check that all input fields disabled after executing CLI app:config:dump"/>
-            <description value="Check that all input fields disabled after executing CLI app:config:dump"/>
+            <description value="Check that all input fields disabled after executing CLI app:config:dump. Command app:config:dump is not reversible and magento instance stays configuration read only after this test. You need to restore etc/env.php manually to make magento configuration writable again."/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-11158"/>
             <useCaseId value="MAGETWO-96428"/>
             <group value="configuration"/>
         </annotations>
         <before>
+            <!-- Command app:config:dump is not reversible and magento instance stays configuration read only after this test. You need to restore etc/env.php manually to make magento configuration writable again.-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>

From 79c7f31fc0423fce8e9c1581112467c715af6b8b Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Mon, 12 Oct 2020 10:37:28 +0300
Subject: [PATCH 488/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../Test/Unit/Model/CategoryRepositoryTest.php  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
index 900f630a7434d..61e8133da5759 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\CategoryRepository;
+use Magento\Catalog\Model\CategoryRepository\PopulateWithValues;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityMetadata;
@@ -63,6 +64,11 @@ class CategoryRepositoryTest extends TestCase
      */
     protected $metadataPoolMock;
 
+    /**
+     * @var MockObject
+     */
+    protected $populateWithValuesMock;
+
     protected function setUp(): void
     {
         $this->categoryFactoryMock = $this->createPartialMock(
@@ -94,6 +100,12 @@ protected function setUp(): void
             ->with(CategoryInterface::class)
             ->willReturn($metadataMock);
 
+        $this->populateWithValuesMock = $this
+            ->getMockBuilder(PopulateWithValues::class)
+            ->setMethods(['execute'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = (new ObjectManager($this))->getObject(
             CategoryRepository::class,
             [
@@ -102,6 +114,7 @@ protected function setUp(): void
                 'storeManager' => $this->storeManagerMock,
                 'metadataPool' => $this->metadataPoolMock,
                 'extensibleDataObjectConverter' => $this->extensibleDataObjectConverterMock,
+                'populateWithValues' => $this->populateWithValuesMock,
             ]
         );
     }
@@ -202,7 +215,7 @@ public function testFilterExtraFieldsOnUpdateCategory($categoryId, $categoryData
             ->method('toNestedArray')
             ->willReturn($categoryData);
         $categoryMock->expects($this->once())->method('validate')->willReturn(true);
-        $categoryMock->expects($this->once())->method('addData')->with($dataForSave);
+        $this->populateWithValuesMock->expects($this->once())->method('execute')->with($categoryMock, $dataForSave);
         $this->categoryResourceMock->expects($this->once())
             ->method('save')
             ->willReturn(DataObject::class);
@@ -230,11 +243,11 @@ public function testCreateNewCategory()
 
         $categoryMock->expects($this->once())->method('getParentId')->willReturn($parentCategoryId);
         $parentCategoryMock->expects($this->once())->method('getPath')->willReturn('path');
-        $categoryMock->expects($this->once())->method('addData')->with($dataForSave);
         $categoryMock->expects($this->once())->method('validate')->willReturn(true);
         $this->categoryResourceMock->expects($this->once())
             ->method('save')
             ->willReturn(DataObject::class);
+        $this->populateWithValuesMock->expects($this->once())->method('execute')->with($categoryMock, $dataForSave);
         $this->assertEquals($categoryMock, $this->model->save($categoryMock));
     }
 

From c7c4ad60ecf20c04104891d7c0bdaa84bacb8903 Mon Sep 17 00:00:00 2001
From: "vadim.malesh" <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 12 Oct 2020 11:36:47 +0300
Subject: [PATCH 489/671] fix static

---
 app/code/Magento/Sales/Model/Order/Email/NotifySender.php     | 1 +
 .../Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php | 4 +++-
 .../Model/Order/Email/Sender/InvoiceCommentSenderTest.php     | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
index 1bb3053bf751f..468842d7b2ce4 100644
--- a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
@@ -10,6 +10,7 @@
 
 /**
  * Class NotifySender
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
index 0494616b8cefd..be7788783adc7 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/AbstractSenderTest.php
@@ -192,7 +192,9 @@ public function stepIdentityContainerInit($identityMockClassName)
     {
         $this->identityContainerMock = $this->getMockBuilder($identityMockClassName)
             ->disableOriginalConstructor()
-            ->onlyMethods(['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod'])
+            ->onlyMethods(
+                ['getStore', 'isEnabled', 'getConfigValue', 'getTemplateId', 'getGuestTemplateId', 'getCopyMethod']
+            )
             ->getMock();
         $this->identityContainerMock->expects($this->any())
             ->method('getStore')
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
index 9e4e89766dfe1..56d78789d7dda 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/InvoiceCommentSenderTest.php
@@ -31,8 +31,6 @@ protected function setUp(): void
         $this->stepMockSetup();
         $this->paymentHelper = $this->createPartialMock(Data::class, ['getInfoBlockHtml']);
 
-        $this->invoiceResource = $this->createMock(Invoice::class);
-
         $this->stepIdentityContainerInit(InvoiceCommentIdentity::class);
 
         $this->addressRenderer->expects($this->any())->method('format')->willReturn(1);

From d46371a645fa0e62ac37a8c456eff963406119bc Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Mon, 12 Oct 2020 12:10:29 +0300
Subject: [PATCH 490/671] MC-37543: Create automated test for "Add static block
 on a category page"

---
 .../Catalog/Block/Category/ViewTest.php       |  8 +++++-
 .../Category/Save/SaveCategoryTest.php        | 26 ++++++++++++-------
 .../_files/category_with_cms_block.php        |  9 ++++---
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php
index d08af2b85a67b..8ff4e29b46dde 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Category/ViewTest.php
@@ -12,6 +12,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Catalog\Model\GetCategoryByName;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
@@ -39,6 +40,9 @@ class ViewTest extends TestCase
     /** @var LayoutInterface */
     private $layout;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
@@ -51,6 +55,7 @@ protected function setUp(): void
         $this->getCategoryByName = $this->objectManager->get(GetCategoryByName::class);
         $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
         $this->layout = $this->objectManager->get(LayoutInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
     }
 
     /**
@@ -70,8 +75,9 @@ protected function tearDown(): void
      */
     public function testCmsBlockDisplayedOnCategory(): void
     {
+        $storeId = (int)$this->storeManager->getStore('default')->getId();
         $categoryId = $this->getCategoryByName->execute('Category with cms block')->getId();
-        $category = $this->categoryRepository->get($categoryId, 1);
+        $category = $this->categoryRepository->get($categoryId, $storeId);
         $this->registerCategory($category);
         $block = $this->layout->createBlock(View::class)->setTemplate('Magento_Catalog::category/cms.phtml');
         $this->assertStringContainsString('<h1>Fixture Block Title</h1>', $block->toHtml());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
index 155a5f255c15a..adef25f88395c 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
@@ -12,12 +12,13 @@
 use Magento\Catalog\Model\Category;
 use Magento\Cms\Api\GetBlockByIdentifierInterface;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Test cases for save category controller.
  *
  * @magentoAppArea adminhtml
- * @magentoDbIsolation disabled
+ * @magentoDbIsolation enabled
  */
 class SaveCategoryTest extends AbstractSaveCategoryTest
 {
@@ -30,6 +31,9 @@ class SaveCategoryTest extends AbstractSaveCategoryTest
     /** @var string */
     private $createdCategoryId;
 
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
     /**
      * @inheritdoc
      */
@@ -39,6 +43,7 @@ protected function setUp(): void
 
         $this->categoryRepository = $this->_objectManager->get(CategoryRepositoryInterface::class);
         $this->getBlockByIdentifier = $this->_objectManager->get(GetBlockByIdentifierInterface::class);
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
     }
 
     /**
@@ -46,12 +51,14 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
-        try {
-            $this->categoryRepository->deleteByIdentifier($this->createdCategoryId);
-        } catch (NoSuchEntityException $e) {
-            //Category already deleted.
+        if(!empty($this->createdCategoryId)) {
+            try {
+                $this->categoryRepository->deleteByIdentifier($this->createdCategoryId);
+            } catch (NoSuchEntityException $e) {
+                //Category already deleted.
+            }
+            $this->createdCategoryId = null;
         }
-        $this->createdCategoryId = null;
 
         parent::tearDown();
     }
@@ -63,15 +70,16 @@ protected function tearDown(): void
      */
     public function testCreateCategoryWithCmsBlock(): void
     {
-        $blockId = $this->getBlockByIdentifier->execute('fixture_block', 1)->getId();
+        $storeId = (int)$this->storeManager->getStore('default')->getId();
+        $blockId = $this->getBlockByIdentifier->execute('fixture_block', $storeId)->getId();
         $postData = [
             CategoryInterface::KEY_NAME => 'Category with cms block',
             CategoryInterface::KEY_IS_ACTIVE => 1,
             CategoryInterface::KEY_INCLUDE_IN_MENU => 1,
             'display_mode' => Category::DM_MIXED,
             'landing_page' => $blockId,
-            'available_sort_by' => 1,
-            'default_sort_by' => 1,
+            CategoryInterface::KEY_AVAILABLE_SORT_BY => ['position'],
+            'default_sort_by' => 'position',
         ];
         $responseData = $this->performSaveCategoryRequest($postData);
         $this->assertRequestIsSuccessfullyPerformed($responseData);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php
index 03eb767741579..417b791eb376a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/category_with_cms_block.php
@@ -31,7 +31,6 @@
 $getBlockByIdentifier = $objectManager->get(GetBlockByIdentifierInterface::class);
 $block = $getBlockByIdentifier->execute('fixture_block', $currentStoreId);
 
-$storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
 $category = $categoryFactory->create();
 $category->setName('Category with cms block')
     ->setParentId($categoryHelper->getId())
@@ -42,5 +41,9 @@
     ->setPosition(1)
     ->setDisplayMode(Category::DM_MIXED)
     ->setLandingPage($block->getId());
-$categoryRepository->save($category);
-$storeManager->setCurrentStore($currentStoreId);
+try {
+    $storeManager->setCurrentStore(Store::DEFAULT_STORE_ID);
+    $categoryRepository->save($category);
+} finally {
+    $storeManager->setCurrentStore($currentStoreId);
+}

From 4ffbd717b999d3976839cef63f927beefd65976e Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Mon, 12 Oct 2020 14:47:33 +0300
Subject: [PATCH 491/671] MC-37558: Create automated test for "Override
 Category settings on Store View level"

---
 .../Category/Save/UpdateCategoryTest.php      | 114 +++++++++++
 .../Catalog/Model/CategoryRepositoryTest.php  | 180 +++++++++++-------
 2 files changed, 221 insertions(+), 73 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php
new file mode 100644
index 0000000000000..c3d5ed080bcf2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Category\Save;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Test related to update category.
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class UpdateCategoryTest extends AbstractSaveCategoryTest
+{
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->categoryRepository = $this->_objectManager->get(CategoryRepositoryInterface::class);
+        $this->storeManager = $this->_objectManager->get(StoreManagerInterface::class);
+    }
+
+    /**
+     * @dataProvider categoryDataProvider
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     *
+     * @param array $postData
+     * @return void
+     */
+    public function testUpdateCategoryForDefaultStoreView($postData): void
+    {
+        $storeId = (int)$this->storeManager->getStore('default')->getId();
+        $postData = array_merge($postData, ['store_id' => $storeId]);
+        $responseData = $this->performSaveCategoryRequest($postData);
+        $this->assertRequestIsSuccessfullyPerformed($responseData);
+        $category = $this->categoryRepository->get($postData['entity_id'], $postData['store_id']);
+        unset($postData['use_default']);
+        unset($postData['use_config']);
+        foreach ($postData as $key => $value) {
+            $this->assertEquals($value, $category->getData($key));
+        }
+    }
+
+    /**
+     * @return array
+     */
+    public function categoryDataProvider(): array
+    {
+        return [
+            [
+                'post_data' => [
+                    'entity_id' => 333,
+                    CategoryInterface::KEY_IS_ACTIVE => '0',
+                    CategoryInterface::KEY_INCLUDE_IN_MENU => '0',
+                    CategoryInterface::KEY_NAME => 'Category default store',
+                    'description' => 'Description for default store',
+                    'landing_page' => '',
+                    'display_mode' => Category::DM_MIXED,
+                    CategoryInterface::KEY_AVAILABLE_SORT_BY => ['name', 'price'],
+                    'default_sort_by' => 'price',
+                    'filter_price_range' => 5,
+                    'url_key' => 'default-store-category',
+                    'meta_title' => 'meta_title default store',
+                    'meta_keywords' => 'meta_keywords default store',
+                    'meta_description' => 'meta_description default store',
+                    'custom_use_parent_settings' => '0',
+                    'custom_design' => '2',
+                    'page_layout' => '2columns-right',
+                    'custom_apply_to_products' => '1',
+                    'use_default' => [
+                        CategoryInterface::KEY_NAME => '0',
+                        CategoryInterface::KEY_IS_ACTIVE => '0',
+                        CategoryInterface::KEY_INCLUDE_IN_MENU => '0',
+                        'url_key' => '0',
+                        'meta_title' => '0',
+                        'custom_use_parent_settings' => '0',
+                        'custom_apply_to_products' => '0',
+                        'description' => '0',
+                        'landing_page' => '0',
+                        'display_mode' => '0',
+                        'custom_design' => '0',
+                        'page_layout' => '0',
+                        'meta_keywords' => '0',
+                        'meta_description' => '0',
+                        'custom_layout_update' => '0',
+                    ],
+                    'use_config' => [
+                        CategoryInterface::KEY_AVAILABLE_SORT_BY => false,
+                        'default_sort_by' => false,
+                        'filter_price_range' => false,
+                    ],
+                ],
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index 7fd7627c738d6..6469f80ff49b8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -8,93 +8,82 @@
 namespace Magento\Catalog\Model;
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
-use Magento\Catalog\Api\CategoryRepositoryInterfaceFactory;
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Cms\Api\GetBlockByIdentifierInterface;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\StoreManagementInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
 /**
  * Provide tests for CategoryRepository model.
+ *
+ * @magentoDbIsolation enabled
  */
 class CategoryRepositoryTest extends TestCase
 {
-    private const FIXTURE_CATEGORY_ID = 333;
-    private const FIXTURE_TWO_STORES_CATEGORY_ID = 555;
-    private const FIXTURE_SECOND_STORE_CODE = 'fixturestore';
-    private const FIXTURE_FIRST_STORE_CODE = 'default';
+    /** @var ObjectManagerInterface */
+    private $objectManager;
 
-    /**
-     * @var CategoryLayoutUpdateManager
-     */
+    /** @var CategoryLayoutUpdateManager */
     private $layoutManager;
 
-    /**
-     * @var CategoryRepositoryInterfaceFactory
-     */
-    private $repositoryFactory;
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
 
-    /**
-     * @var CollectionFactory
-     */
+    /** @var CollectionFactory */
     private $productCollectionFactory;
 
-    /**
-     * @var CategoryCollectionFactory
-     */
+    /** @var CategoryCollectionFactory */
     private $categoryCollectionFactory;
 
+    /** @var StoreManagementInterface */
+    private $storeManager;
+
+    /** @var GetBlockByIdentifierInterface */
+    private $getBlockByIdentifier;
+
     /**
-     * Sets up common objects.
-     *
-     * @inheritDoc
+     * @inheritdoc
      */
     protected function setUp(): void
     {
-        Bootstrap::getObjectManager()->configure([
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->objectManager->configure([
             'preferences' => [
                 \Magento\Catalog\Model\Category\Attribute\LayoutUpdateManager::class
                 => \Magento\TestFramework\Catalog\Model\CategoryLayoutUpdateManager::class
             ]
         ]);
-        $this->repositoryFactory = Bootstrap::getObjectManager()->get(CategoryRepositoryInterfaceFactory::class);
-        $this->layoutManager = Bootstrap::getObjectManager()->get(CategoryLayoutUpdateManager::class);
-        $this->productCollectionFactory = Bootstrap::getObjectManager()->get(CollectionFactory::class);
-        $this->categoryCollectionFactory = Bootstrap::getObjectManager()->create(CategoryCollectionFactory::class);
-    }
-
-    /**
-     * Create subject object.
-     *
-     * @return CategoryRepositoryInterface
-     */
-    private function createRepo(): CategoryRepositoryInterface
-    {
-        return $this->repositoryFactory->create();
+        $this->layoutManager = $this->objectManager->get(CategoryLayoutUpdateManager::class);
+        $this->productCollectionFactory = $this->objectManager->get(CollectionFactory::class);
+        $this->categoryCollectionFactory = $this->objectManager->get(CategoryCollectionFactory::class);
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->getBlockByIdentifier = $this->objectManager->get(GetBlockByIdentifierInterface::class);
     }
 
     /**
      * Test that custom layout file attribute is saved.
      *
-     * @return void
-     * @throws \Throwable
      * @magentoDataFixture Magento/Catalog/_files/category.php
-     * @magentoDbIsolation enabled
      * @magentoAppIsolation enabled
+     *
+     * @return void
      */
     public function testCustomLayout(): void
     {
-        //New valid value
-        $repo = $this->createRepo();
-        $category = $repo->get(self::FIXTURE_CATEGORY_ID);
+        $category = $this->categoryRepository->get(333);
         $newFile = 'test';
-        $this->layoutManager->setCategoryFakeFiles(self::FIXTURE_CATEGORY_ID, [$newFile]);
+        $this->layoutManager->setCategoryFakeFiles(333, [$newFile]);
         $category->setCustomAttribute('custom_layout_update_file', $newFile);
-        $repo->save($category);
-        $repo = $this->createRepo();
-        $category = $repo->get(self::FIXTURE_CATEGORY_ID);
+        $this->categoryRepository->save($category);
+        $category = $this->categoryRepository->get(333);
         $this->assertEquals($newFile, $category->getCustomAttribute('custom_layout_update_file')->getValue());
 
         //Setting non-existent value
@@ -102,7 +91,7 @@ public function testCustomLayout(): void
         $category->setCustomAttribute('custom_layout_update_file', $newFile);
         $caughtException = false;
         try {
-            $repo->save($category);
+            $this->categoryRepository->save($category);
         } catch (LocalizedException $exception) {
             $caughtException = true;
         }
@@ -112,9 +101,9 @@ public function testCustomLayout(): void
     /**
      * Test removal of categories.
      *
-     * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/Catalog/_files/categories.php
      * @magentoAppArea adminhtml
+     *
      * @return void
      */
     public function testCategoryBehaviourAfterDelete(): void
@@ -122,7 +111,7 @@ public function testCategoryBehaviourAfterDelete(): void
         $productCollection = $this->productCollectionFactory->create();
         $deletedCategories = ['3', '4', '5', '13'];
         $categoryCollectionIds = $this->categoryCollectionFactory->create()->getAllIds();
-        $this->createRepo()->deleteByIdentifier(3);
+        $this->categoryRepository->deleteByIdentifier(3);
         $this->assertEquals(
             0,
             $productCollection->addCategoriesFilter(['in' => $deletedCategories])->getSize(),
@@ -131,42 +120,87 @@ public function testCategoryBehaviourAfterDelete(): void
         $newCategoryCollectionIds = $this->categoryCollectionFactory->create()->getAllIds();
         $difference = array_diff($categoryCollectionIds, $newCategoryCollectionIds);
         sort($difference);
-        $this->assertEquals(
-            $deletedCategories,
-            $difference,
-            'Wrong categories was deleted'
-        );
+        $this->assertEquals($deletedCategories, $difference, 'Wrong categories was deleted');
     }
 
     /**
      * Verifies whether `get()` method `$storeId` attribute works as expected.
      *
-     * @magentoDbIsolation enabled
      * @magentoDataFixture Magento/Store/_files/core_fixturestore.php
      * @magentoDataFixture Magento/Catalog/_files/category_with_two_stores.php
+     *
+     * @return void
      */
-    public function testGetCategoryForProvidedStore()
+    public function testGetCategoryForProvidedStore(): void
     {
-        $categoryRepository = $this->repositoryFactory->create();
-
-        $categoryDefault = $categoryRepository->get(
-            self::FIXTURE_TWO_STORES_CATEGORY_ID
-        );
-
+        $categoryId = 555;
+        $categoryDefault = $this->categoryRepository->get($categoryId);
         $this->assertSame('category-defaultstore', $categoryDefault->getUrlKey());
-
-        $categoryFirstStore = $categoryRepository->get(
-            self::FIXTURE_TWO_STORES_CATEGORY_ID,
-            self::FIXTURE_FIRST_STORE_CODE
-        );
-
+        $defaultStoreId = $this->storeManager->getStore('default')->getId();
+        $categoryFirstStore = $this->categoryRepository->get($categoryId, $defaultStoreId);
         $this->assertSame('category-defaultstore', $categoryFirstStore->getUrlKey());
+        $fixtureStoreId = $this->storeManager->getStore('fixturestore')->getId();
+        $categorySecondStore = $this->categoryRepository->get($categoryId, $fixtureStoreId);
+        $this->assertSame('category-fixturestore', $categorySecondStore->getUrlKey());
+    }
 
-        $categorySecondStore = $categoryRepository->get(
-            self::FIXTURE_TWO_STORES_CATEGORY_ID,
-            self::FIXTURE_SECOND_STORE_CODE
-        );
+    /**
+     * @magentoDataFixture Magento/Store/_files/second_store.php
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @magentoDataFixture Magento/Cms/_files/block.php
+     *
+     * @return void
+     */
+    public function testUpdateCategoryDefaultStoreView(): void
+    {
+        $categoryId = 333;
+        $defaultStoreId = (int)$this->storeManager->getStore('default')->getId();
+        $secondStoreId = (int)$this->storeManager->getStore('fixture_second_store')->getId();
+        $blockId = $this->getBlockByIdentifier->execute('fixture_block', $defaultStoreId)->getId();
+        $origData = $this->categoryRepository->get($categoryId)->getData();
+        unset($origData[CategoryInterface::KEY_UPDATED_AT]);
+        $category = $this->categoryRepository->get($categoryId, $defaultStoreId);
+        $dataForDefaultStore = [
+            CategoryInterface::KEY_IS_ACTIVE => 0,
+            CategoryInterface::KEY_INCLUDE_IN_MENU => 0,
+            CategoryInterface::KEY_NAME => 'Category default store',
+            'image' => 'test.png',
+            'description' => 'Description for default store',
+            'landing_page' => $blockId,
+            'display_mode' => Category::DM_MIXED,
+            CategoryInterface::KEY_AVAILABLE_SORT_BY => ['name', 'price'],
+            'default_sort_by' => 'price',
+            'filter_price_range' => 5,
+            'url_key' => 'default-store-category',
+            'meta_title' => 'meta_title default store',
+            'meta_keywords' => 'meta_keywords default store',
+            'meta_description' => 'meta_description default store',
+            'custom_use_parent_settings' => '0',
+            'custom_design' => '2',
+            'page_layout' => '2columns-right',
+            'custom_apply_to_products' => '1',
+        ];
+        $category->addData($dataForDefaultStore);
+        $updatedCategory = $this->categoryRepository->save($category);
+        $this->assertCategoryData($dataForDefaultStore, $updatedCategory);
+        $categorySecondStore = $this->categoryRepository->get($categoryId, $secondStoreId);
+        $this->assertCategoryData($origData, $categorySecondStore);
+        foreach ($dataForDefaultStore as $key => $value) {
+            $this->assertNotEquals($value, $categorySecondStore->getData($key));
+        }
+    }
 
-        $this->assertSame('category-fixturestore', $categorySecondStore->getUrlKey());
+    /**
+     * Assert category data.
+     *
+     * @param array $expectedData
+     * @param CategoryInterface $category
+     * @return void
+     */
+    private function assertCategoryData(array $expectedData, CategoryInterface $category): void
+    {
+        foreach ($expectedData as $key => $value) {
+            $this->assertEquals($value, $category->getData($key));
+        }
     }
 }

From afe1fc243f2322515abadb0d1d9618324a74b626 Mon Sep 17 00:00:00 2001
From: Viktor Sevch <viktor.sevch@transoftgroup.com>
Date: Mon, 12 Oct 2020 14:49:05 +0300
Subject: [PATCH 492/671] MC-34292: AdminCreateUserRoleWithReportsActionGroup
 needs to be refactored to be based in CE

---
 ...AdminChooseUserRoleResourceActionGroup.xml |  23 ++++
 .../AdminSaveUserRoleActionGroup.xml          |  18 +++
 .../AdminStartCreateUserRoleActionGroup.xml   |  26 +++++
 .../AdminUserSaveRoleActionGroup.xml          |   2 +-
 .../Mftf/Section/AdminCreateRoleSection.xml   |   6 +-
 .../Mftf/Section/AdminEditRoleInfoSection.xml |   2 +-
 .../Section/AdminEditRoleResourcesSection.xml |   2 +
 ...inReviewOrderWithReportsPermissionTest.xml | 109 ++++++++++++++++++
 8 files changed, 183 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminSaveUserRoleActionGroup.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml

diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml
new file mode 100644
index 0000000000000..7072830e2036b
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml
@@ -0,0 +1,23 @@
+<?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="AdminChooseUserRoleResourceActionGroup">
+        <annotations>
+            <description>Check the resource access checkbox. Leave the form open.</description>
+        </annotations>
+        <arguments>
+            <argument name="resourceId" type="string" defaultValue="Magento_Backend::dashboard"/>
+            <argument name="resourceName" type="string" defaultValue="Dashboard"/>
+        </arguments>
+
+        <waitForElementVisible selector="{{AdminEditRoleResourcesSection.resourceCheckboxLink(resourceId, resourceName)}}" stepKey="waitForResourceCheckboxVisible"/>
+        <click selector="{{AdminEditRoleResourcesSection.resourceCheckboxLink(resourceId, resourceName)}}" stepKey="checkResource"/>
+        <seeCheckboxIsChecked selector="{{AdminEditRoleResourcesSection.resourceCheckbox(resourceId)}}" stepKey="seeCheckedResource"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminSaveUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminSaveUserRoleActionGroup.xml
new file mode 100644
index 0000000000000..4a90630161e99
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminSaveUserRoleActionGroup.xml
@@ -0,0 +1,18 @@
+<?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="AdminSaveUserRoleActionGroup">
+        <annotations>
+            <description>Click to Save Role</description>
+        </annotations>
+        <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the role." stepKey="seeSuccessMessageForSavedRole"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml
new file mode 100644
index 0000000000000..2a1dec5b8574e
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml
@@ -0,0 +1,26 @@
+<?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="AdminStartCreateUserRoleActionGroup">
+        <annotations>
+            <description>Open Admin Edit Role page. Fills role, user password, resource access. Leave the form open.</description>
+        </annotations>
+        <arguments>
+            <argument name="roleName" type="string" defaultValue="{{limitedRole.name}}"/>
+            <argument name="userPassword" type="string" defaultValue="123123q"/>
+            <argument name="resourceAccess" type="string" defaultValue="Custom"/>
+        </arguments>
+        <amOnPage url="{{AdminEditRolePage.url}}" stepKey="openNewAdminRolePage"/>
+        <waitForElementVisible  selector="{{AdminCreateRoleSection.name}}" stepKey="waitForName"/>
+        <fillField selector="{{AdminCreateRoleSection.name}}" userInput="{{roleName}}" stepKey="setTheRoleName"/>
+        <fillField selector="{{AdminCreateRoleSection.password}}" userInput="{{userPassword}}" stepKey="setPassword"/>
+        <click selector="{{AdminCreateRoleSection.roleResources}}" stepKey="clickToOpenRoleResources"/>
+        <selectOption selector="{{AdminEditRoleResourcesSection.resourceAccess}}" userInput="{{resourceAccess}}" stepKey="chooseResourceAccess"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml
index 824e9407125f5..e247db64deeab 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml
@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminUserSaveRoleActionGroup">
         <annotations>
-            <description>Click to Save Role</description>
+            <description>Deprecated. Please use AdminSaveUserRoleActionGroup</description>
         </annotations>
         <click selector="{{AdminEditRoleInfoSection.saveButton}}" stepKey="clickSaveRoleButton" />
         <see userInput="You saved the role." stepKey="seeUserRoleSavedMessage"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
index 93acfc2753b61..96aaf879e2054 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminCreateRoleSection.xml
@@ -9,13 +9,13 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminCreateRoleSection">
-        <element name="create" type="button" selector="#add"/>
+        <element name="create" type="button" selector="#add" timeout="30"/>
         <element name="name" type="button" selector="#role_name"/>
         <element name="password" type="input" selector="#current_password"/>
         <element name="resourceAccess" type="select" selector="[data-ui-id='adminhtml-user-editroles-tab-content-account'] [name='all']"/>
         <element name="resourceTree" type="block" selector="[data-ui-id='adminhtml-user-editroles-tab-content-account'] [data-role='resource-tree']"/>
 
-        <element name="roleResources" type="button" selector="#role_info_tabs_account"/>
+        <element name="roleResources" type="button" selector="#role_info_tabs_account" timeout="30"/>
         <element name="roleResource" type="button" selector="#gws_is_all"/>
         <element name="roleResourceNew" type="button" selector="#all"/>
         <element name="resourceValue" type="button" selector="//*[text()='{{arg1}}']" parameterized="true"/>
@@ -24,7 +24,7 @@
         <element name="scopeValue" type="button" selector="//select[@id='all']/*[text()='{{arg2}}']" parameterized="true"/>
         <element name="website" type="checkbox" selector="//*[contains(text(), '{{arg3}}')]" parameterized="true"/>
         <element name="selectWebsite" type="checkbox" selector="//label[contains(text(), '{{websiteName}}')]/preceding-sibling::input" parameterized="true"/>
-        <element name="save" type="button" selector="//button[@title='Save Role']"/>
+        <element name="save" type="button" selector="//button[@title='Save Role']" timeout="30"/>
         <element name="roleNameFilterTextField" type="input" selector="#permissionsUserRolesGrid_filter_role_name"/>
         <element name="searchButton" type="button" selector=".admin__data-grid-header button[title=Search]"/>
         <element name="searchResultFirstRow" type="text" selector=".data-grid>tbody>tr"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
index 57659e1aff075..b8430eb3b7313 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -13,7 +13,7 @@
         <element name="backButton" type="button" selector="button[title='Back']"/>
         <element name="resetButton" type="button" selector="button[title='Reset']"/>
         <element name="deleteButton" type="button" selector="button[title='Delete Role']"/>
-        <element name="saveButton" type="button" selector="button[title='Save Role']"/>
+        <element name="saveButton" type="button" selector="button[title='Save Role']" timeout="30"/>
         <element name="message" type="text" selector=".modal-popup.confirm div.modal-content"/>
         <element name="cancel" type="button" selector=".modal-popup.confirm button.action-dismiss"/>
         <element name="ok" type="button" selector=".modal-popup.confirm button.action-accept" timeout="60"/>
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml
index 48873bd9d152e..2352575257afb 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleResourcesSection.xml
@@ -11,6 +11,8 @@
         <element name="resources" type="checkbox" selector="#role_info_tabs_account"/>
         <element name="storeName" type="checkbox" selector="//label[contains(text(),'{{var1}}')]" parameterized="true"/>
         <element name="reportsCheckbox" type="text" selector="//li[@data-id='Magento_Reports::report']//a[text()='Reports']"/>
+        <element name="resourceCheckboxLink" type="checkbox" selector="//li[@data-id='{{resourceId}}']//a[text()='{{resourceName}}']" timeout="30" parameterized="true"/>
+        <element name="resourceCheckbox" type="checkbox" selector="//li[@data-id='{{resourceId}}']/input" timeout="30" parameterized="true"/>
         <element name="userRoles" type="text" selector="//span[contains(text(), 'User Roles')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml
new file mode 100644
index 0000000000000..8629187fe3ffb
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminReviewOrderWithReportsPermissionTest">
+        <annotations>
+            <features value="User"/>
+            <stories value="Admin with restricted permissions"/>
+            <title value="User should be able to review ordered products with only 'Reports' permission"/>
+            <description value="User should be able to review ordered products with only 'Reports' permission"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-25812"/>
+            <group value="user"/>
+        </annotations>
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
+                <argument name="newWebsiteName" value="{{NewWebSiteData.name}}"/>
+                <argument name="websiteCode" value="{{NewWebSiteData.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateNewStoreGroupActionGroup" stepKey="createNewStore">
+                <argument name="website" value="{{NewWebSiteData.name}}"/>
+                <argument name="storeGroupName" value="{{NewStoreData.name}}"/>
+                <argument name="storeGroupCode" value="{{NewStoreData.code}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="StoreGroup" value="NewStoreData"/>
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+            <actionGroup ref="AdminCreateCustomerWithWebsiteAndStoreViewActionGroup" stepKey="createCustomerWithWebsiteAndStoreView">
+                <argument name="customerData" value="Simple_US_Customer"/>
+                <argument name="address" value="US_Address_NY"/>
+                <argument name="website" value="{{NewWebSiteData.name}}"/>
+                <argument name="storeView" value="{{NewStoreViewData.name}}"/>
+            </actionGroup>
+            <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForProductOnAdmin">
+                <argument name="product" value="$createProduct$"/>
+            </actionGroup>
+            <actionGroup ref="CreatedProductConnectToWebsiteActionGroup" stepKey="productConnectToWebsite">
+                <argument name="website" value="NewWebSiteData"/>
+                <argument name="product" value="$createProduct$"/>
+            </actionGroup>
+            <actionGroup ref="CreateOrderInStoreChoosingPaymentMethodActionGroup" stepKey="createOrder">
+                <argument name="product" value="$createProduct$"/>
+                <argument name="customer" value="Simple_US_Customer"/>
+                <argument name="storeView" value="NewStoreViewData"/>
+            </actionGroup>
+            <actionGroup ref="AdminStartCreateUserRoleActionGroup" stepKey="startCreateUserRole">
+                <argument name="roleName" value="{{limitedRole.name}}"/>
+                <argument name="userPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+                <argument name="resourceAccess" value="Custom"/>
+            </actionGroup>
+            <actionGroup ref="AdminChooseUserRoleResourceActionGroup" stepKey="setResourceAccess">
+                <argument name="resourceId" value="Magento_Reports::report"/>
+                <argument name="resourceName" value="Reports"/>
+            </actionGroup>
+            <actionGroup ref="AdminSaveUserRoleActionGroup" stepKey="saveRole"/>
+            <actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createUser">
+                <argument name="role" value="limitedRole"/>
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdminUser"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminDeleteCreatedUserActionGroup" stepKey="deleteUser">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearAdminUserGridFilters"/>
+            <amOnPage url="{{AdminRolesPage.url}}" stepKey="navigateToUserRoleGrid"/>
+            <actionGroup ref="AdminDeleteRoleActionGroup" stepKey="deleteRole">
+                <argument name="role" value="limitedRole"/>
+            </actionGroup>
+
+            <actionGroup ref="AdminDeleteCustomerActionGroup" stepKey="deleteCustomer">
+                <argument name="customerEmail" value="Simple_US_Customer.email"/>
+            </actionGroup>
+            <actionGroup ref="AdminClearCustomersFiltersActionGroup" stepKey="clearCustomerFilters"/>
+            <actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
+                <argument name="websiteName" value="{{NewWebSiteData.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminClearFiltersActionGroup" stepKey="clearProductFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="logAsNewUser">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminReviewOrderActionGroup" stepKey="reviewOrder">
+            <argument name="productName" value="$createProduct.name$"/>
+        </actionGroup>
+    </test>
+</tests>

From 732dfebe0a1ac65d264480c186984bc4c5259456 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Mon, 12 Oct 2020 14:54:13 +0300
Subject: [PATCH 493/671] MC-37543: Create automated test for "Add static block
 on a category page"

---
 .../Controller/Adminhtml/Category/Save/SaveCategoryTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
index adef25f88395c..dc74a2c2cba7b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/SaveCategoryTest.php
@@ -51,7 +51,7 @@ protected function setUp(): void
      */
     protected function tearDown(): void
     {
-        if(!empty($this->createdCategoryId)) {
+        if (!empty($this->createdCategoryId)) {
             try {
                 $this->categoryRepository->deleteByIdentifier($this->createdCategoryId);
             } catch (NoSuchEntityException $e) {

From 20d7d416e252b8b27141ebdb5e2b768c85d3f84b Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <1408sheva@gmail.com>
Date: Mon, 12 Oct 2020 15:05:42 +0300
Subject: [PATCH 494/671] MC-37546: Create automated test for "Create new
 Category Update"

---
 ...rontCheckPresentSubCategoryActionGroup.xml | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
new file mode 100644
index 0000000000000..7d8113f05518b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
@@ -0,0 +1,23 @@
+<?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="StorefrontCheckPresentSubCategoryActionGroup">
+        <annotations>
+            <description>Checks for a subcategory in topmenu</description>
+        </annotations>
+        <arguments>
+            <argument name="parenCategoryName" type="string"/>
+            <argument name="childCategoryName" type="string"/>
+        </arguments>
+
+        <waitForElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(parenCategoryName)}}" stepKey="waitForTopMenuLoaded"/>
+        <moveMouseOver selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(parenCategoryName)}}" stepKey="moveMouseToParentCategory"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(childCategoryName)}}" stepKey="seeCategoryUpdated"/>
+    </actionGroup>
+</actionGroups>

From a37cf33bc2a02671302f66ededb5085f6e911ea4 Mon Sep 17 00:00:00 2001
From: Your Name <mmdhudasia@gmail.com>
Date: Mon, 12 Oct 2020 17:51:47 +0530
Subject: [PATCH 495/671] fixed spacing issue

---
 .../web/css/source/module/_cart.less                 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index e8f2d1c5eb1ed..405bc1d2af373 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -267,7 +267,7 @@
                     .lib-icon-font-symbol(
                     @_icon-font-content: @icon-trash
                     );
-                    
+
                     &:hover {
                         .lib-css(text-decoration, @link__text-decoration);
                     }
@@ -574,7 +574,7 @@
 
         .widget {
             float: left;
-            
+
             &.block {
                 margin-bottom: @indent__base;
             }
@@ -728,11 +728,11 @@
                 }
             }
             .content {
-              .fieldset {
-                .actions-toolbar {
-                   width: auto;
+                .fieldset {
+                    .actions-toolbar {
+                        width: auto;
+                    }
                 }
-              }
             }
             &.discount {
                 width: auto;

From 372049ac123cfc1055850358adb5e88db67cc6ce Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Mon, 12 Oct 2020 16:55:59 +0300
Subject: [PATCH 496/671] MC-38113: Same shipping address is repeating multiple
 times in storefront checkout when Reordered

---
 ...reFrontCustomerHasNoOtherAddressesActionGroup.xml} |  2 +-
 .../AdminReorderAddressNotSavedInAddressBookTest.xml  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename app/code/Magento/Customer/Test/Mftf/ActionGroup/{AssertCustomerHasNoOtherAddressesActionGroup.xml => AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml} (89%)

diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml
similarity index 89%
rename from app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml
index 58a5069403b7f..2fde4d915c99f 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertCustomerHasNoOtherAddressesActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml
@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertCustomerHasNoOtherAddressesActionGroup">
+    <actionGroup name="AssertStoreFrontCustomerHasNoOtherAddressesActionGroup">
         <annotations>
             <description>Verifies customer no additional address in address book</description>
         </annotations>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
index aca0c4e6a8f8a..2b4bb43ec36cd 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
@@ -22,19 +22,18 @@
             <createData entity="ApiSimpleProduct" stepKey="Product">
                 <requiredEntity createDataKey="Category"/>
             </createData>
+            <createData entity="Simple_Customer_Without_Address" stepKey="Customer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
-            <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountForm">
-                <argument name="customer" value="CustomerEntityOne"/>
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+                <argument name="Customer" value="$Customer$"/>
             </actionGroup>
-            <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
         </before>
         <after>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
-            <actionGroup ref="DeleteCustomerFromAdminActionGroup" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
             <deleteData createDataKey="Product" stepKey="deleteProduct"/>
             <deleteData createDataKey="Category" stepKey="deleteCategory"/>
+            <deleteData createDataKey="Customer" stepKey="deleteCustomer"/>
         </after>
 
         <!-- Create order for registered customer -->
@@ -53,6 +52,6 @@
         <actionGroup ref="AdminReorderActionGroup" stepKey="reorder"/>
 
         <!-- Assert no additional addresses saved -->
-        <actionGroup ref="AssertCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
+        <actionGroup ref="AssertStoreFrontCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
     </test>
 </tests>

From 763b5d303a701e440e7e0f7f700340f42d251865 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Mon, 12 Oct 2020 16:57:23 +0300
Subject: [PATCH 497/671] MC-38026: [SAQ] - Schedule update remove body class
 in category

---
 .../Controller/Adminhtml/CategoryTest.php     | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
index 6245e4e9f8de7..cd58cd2ac3819 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php
@@ -10,6 +10,8 @@
 use Magento\Framework\Acl\Builder;
 use Magento\Backend\App\Area\FrontNameResolver;
 use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Framework\App\ProductMetadata;
+use Magento\Framework\App\ProductMetadataInterface;
 use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Registry;
@@ -270,7 +272,7 @@ public function testSuggestCategoriesActionNoSuggestions(): void
      */
     public function saveActionDataProvider(): array
     {
-        return [
+        $result = [
             'default values' => [
                 [
                     'id' => '2',
@@ -390,6 +392,20 @@ public function saveActionDataProvider(): array
                 ],
             ],
         ];
+
+        $productMetadataInterface = Bootstrap::getObjectManager()->get(ProductMetadataInterface::class);
+        if ($productMetadataInterface->getEdition() !== ProductMetadata::EDITION_NAME) {
+            /**
+             * Skip save custom_design_from and custom_design_to attributes,
+             * because this logic is rewritten on EE by Catalog Schedule
+             */
+            foreach (array_keys($result['custom values']) as $index) {
+                unset($result['custom values'][$index]['custom_design_from']);
+                unset($result['custom values'][$index]['custom_design_to']);
+            }
+        }
+
+        return $result;
     }
 
     /**
@@ -398,6 +414,11 @@ public function saveActionDataProvider(): array
      */
     public function testIncorrectDateFrom(): void
     {
+        $productMetadataInterface = Bootstrap::getObjectManager()->get(ProductMetadataInterface::class);
+        if ($productMetadataInterface->getEdition() !== ProductMetadata::EDITION_NAME) {
+            $this->markTestSkipped('Skipped, because this logic is rewritten on EE by Catalog Schedule');
+        }
+
         $data = [
             'name' => 'Test Category',
             'attribute_set_id' => '3',

From a8743bbf0121d2e5cceb2f1df37524031501c5ed Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Mon, 12 Oct 2020 17:27:59 +0300
Subject: [PATCH 498/671] MC-37070: Create automated test for "Import products
 with shared images"

---
 .../Product/Gallery/UpdateHandlerTest.php     | 102 +++++++-
 .../Import/ImportWithSharedImagesTest.php     | 236 ++++++++++++++++++
 ...talog_import_products_with_same_images.csv |   3 +
 .../_files/magento_image.jpg                  | Bin 0 -> 13353 bytes
 4 files changed, 339 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_with_same_images.csv
 create mode 100644 dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/magento_image.jpg

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index 7ee2c62453df5..ce36b27d51e7d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -8,6 +8,7 @@
 
 namespace Magento\Catalog\Model\Product\Gallery;
 
+use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
@@ -351,6 +352,23 @@ public function testExecuteWithTwoImagesOnStoreView(): void
         }
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_with_image.php
+     * @magentoDataFixture Magento/Catalog/_files/second_product_simple.php
+     *
+     * @return void
+     */
+    public function testDeleteSharedImage(): void
+    {
+        $product = $this->getProduct(null, 'simple');
+        $this->duplicateMediaGalleryForProduct('/m/a/magento_image.jpg', 'simple2');
+        $secondProduct = $this->getProduct(null, 'simple2');
+        $this->updateHandler->execute($this->prepareRemoveImage($product), []);
+        $product = $this->getProduct(null, 'simple');
+        $this->assertEmpty($product->getMediaGalleryImages()->getItems());
+        $this->checkProductImageExist($secondProduct, '/m/a/magento_image.jpg');
+    }
+
     /**
      * @inheritdoc
      */
@@ -371,11 +389,13 @@ protected function tearDown(): void
      * Returns current product.
      *
      * @param int|null $storeId
+     * @param string|null $sku
      * @return ProductInterface|Product
      */
-    private function getProduct(?int $storeId = null): ProductInterface
+    private function getProduct(?int $storeId = null, ?string $sku = null): ProductInterface
     {
-        return $this->productRepository->get('simple', false, $storeId, true);
+        $sku = $sku ?: 'simple';
+        return $this->productRepository->get($sku, false, $storeId, true);
     }
 
     /**
@@ -464,6 +484,84 @@ public function testDeleteWithMultiWebsites(): void
         $this->assertArrayNotHasKey($secondStoreId, $imageRolesPerStore);
     }
 
+    /**
+     * Check product image link and product image exist
+     *
+     * @param ProductInterface $product
+     * @param string $imagePath
+     * @return void
+     */
+    private function checkProductImageExist(ProductInterface $product, string $imagePath): void
+    {
+        $productImageItem = $product->getMediaGalleryImages()->getFirstItem();
+        $this->assertEquals($imagePath, $productImageItem->getFile());
+        $productImageFile = $productImageItem->getPath();
+        $this->assertNotEmpty($productImageFile);
+        $this->assertTrue($this->mediaDirectory->getDriver()->isExists($productImageFile));
+        $this->fileName = $productImageFile;
+    }
+
+    /**
+     * Prepare the product to remove image
+     *
+     * @param ProductInterface $product
+     * @return ProductInterface
+     */
+    private function prepareRemoveImage(ProductInterface $product): ProductInterface
+    {
+        $item = $product->getMediaGalleryImages()->getFirstItem();
+        $item->setRemoved('1');
+        $galleryData = [
+            'images' => [
+                (int)$item->getValueId() => $item->getData(),
+            ]
+        ];
+        $product->setData(ProductInterface::MEDIA_GALLERY, $galleryData);
+        $product->setStoreId(0);
+
+        return $product;
+    }
+
+    /**
+     * Duplicate media gallery entries for a product
+     *
+     * @param string $imagePath
+     * @param string $productSku
+     * @return void
+     */
+    private function duplicateMediaGalleryForProduct(string $imagePath, string $productSku): void
+    {
+        $product = $this->getProduct(null, $productSku);
+        $connect = $this->galleryResource->getConnection();
+        $select = $connect->select()->from($this->galleryResource->getMainTable())->where('value = ?', $imagePath);
+        $res = $connect->fetchRow($select);
+        $value_id = $res['value_id'];
+        unset($res['value_id']);
+        $rows = [
+            'attribute_id' => $res['attribute_id'],
+            'value' => $res['value'],
+            ProductAttributeMediaGalleryEntryInterface::MEDIA_TYPE => $res['media_type'],
+            ProductAttributeMediaGalleryEntryInterface::DISABLED => $res['disabled'],
+        ];
+        $connect->insert($this->galleryResource->getMainTable(), $rows);
+        $select = $connect->select()
+            ->from($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE))
+            ->where('value_id = ?', $value_id);
+        $res = $connect->fetchRow($select);
+        $newValueId = (int)$value_id + 1;
+        $rows = [
+            'value_id' => $newValueId,
+            'store_id' => $res['store_id'],
+            ProductAttributeMediaGalleryEntryInterface::LABEL => $res['label'],
+            ProductAttributeMediaGalleryEntryInterface::POSITION => $res['position'],
+            ProductAttributeMediaGalleryEntryInterface::DISABLED => $res['disabled'],
+            'row_id' => $product->getRowId(),
+        ];
+        $connect->insert($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE), $rows);
+        $rows = ['value_id' => $newValueId, 'row_id' => $product->getRowId()];
+        $connect->insert($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE), $rows);
+    }
+
     /**
      * @param Product $product
      * @param array $roles
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php
new file mode 100644
index 0000000000000..4c04e5a8814e5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Import;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product as ProductEntity;
+use Magento\Catalog\Model\Product\Media\ConfigInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\ImportExport\Model\Import;
+use Magento\ImportExport\Model\Import\Source\Csv;
+use Magento\ImportExport\Model\Import\Source\CsvFactory;
+use Magento\ImportExport\Model\ResourceModel\Import\Data;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Checks that product import with same images can be successfully done
+ *
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ImportWithSharedImagesTest extends TestCase
+{
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var Filesystem */
+    private $fileSystem;
+
+    /** @var ProductRepositoryInterface */
+    private $productRepository;
+
+    /** @var File */
+    private $fileDriver;
+
+    /** @var Import */
+    private $import;
+
+    /** @var ConfigInterface */
+    private $mediaConfig;
+
+    /** @var array */
+    private $appParams;
+
+    /** @var array */
+    private $createdProductsSkus = [];
+
+    /** @var array */
+    private $filesToRemove = [];
+
+    /** @var CsvFactory */
+    private $csvFactory;
+
+    /** @var Data */
+    private $importDataResource;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->fileSystem = $this->objectManager->get(Filesystem::class);
+        $this->fileDriver = $this->objectManager->get(File::class);
+        $this->mediaConfig = $this->objectManager->get(ConfigInterface::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->import = $this->objectManager->get(ProductFactory::class)->create();
+        $this->csvFactory = $this->objectManager->get(CsvFactory::class);
+        $this->importDataResource = $this->objectManager->get(Data::class);
+        $this->appParams = Bootstrap::getInstance()->getBootstrap()->getApplication()
+            ->getInitParams()[\Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->removeFiles();
+        $this->removeProducts();
+        $this->importDataResource->cleanBunches();
+
+        parent::tearDown();
+    }
+
+    /**
+     * @return void
+     */
+    public function testImportProductsWithSameImages(): void
+    {
+        $this->moveImages('magento_image.jpg');
+        $source = $this->prepareFile('catalog_import_products_with_same_images.csv');
+        $this->updateUploader();
+        $errors = $this->import->setParameters([
+            'behavior' => Import::BEHAVIOR_ADD_UPDATE,
+            'entity' => ProductEntity::ENTITY,
+        ])
+            ->setSource($source)->validateData();
+        $this->assertEmpty($errors->getAllErrors());
+        $this->import->importData();
+        $this->createdProductsSkus = ['SimpleProductForTest1', 'SimpleProductForTest2'];
+        $this->checkProductsImages('/m/a/magento_image.jpg', $this->createdProductsSkus);
+    }
+
+    /**
+     * Check product images
+     *
+     * @param string $expectedImagePath
+     * @param array $productSkus
+     * @return void
+     */
+    private function checkProductsImages(string $expectedImagePath, array $productSkus): void
+    {
+        foreach ($productSkus as $productSku) {
+            $product = $this->productRepository->get($productSku);
+            $productImageItem = $product->getMediaGalleryImages()->getFirstItem();
+            $productImageFile = $productImageItem->getFile();
+            $productImagePath = $productImageItem->getPath();
+            $this->filesToRemove[] = $productImagePath;
+            $this->assertEquals($expectedImagePath, $productImageFile);
+            $this->assertNotEmpty($productImagePath);
+            $this->assertTrue($this->fileDriver->isExists($productImagePath));
+        }
+    }
+
+    /**
+     * Remove created files
+     *
+     * @return void
+     */
+    private function removeFiles(): void
+    {
+        foreach ($this->filesToRemove as $file) {
+            if ($this->fileDriver->isExists($file)) {
+                $this->fileDriver->deleteFile($file);
+            }
+        }
+    }
+
+    /**
+     * Remove created products
+     *
+     * @return void
+     */
+    private function removeProducts(): void
+    {
+        foreach ($this->createdProductsSkus as $sku) {
+            try {
+                $this->productRepository->deleteById($sku);
+            } catch (NoSuchEntityException $e) {
+                //already removed
+            }
+        }
+    }
+
+    /**
+     * Prepare file
+     *
+     * @param string $fileName
+     * @return Csv
+     */
+    private function prepareFile(string $fileName): Csv
+    {
+        $tmpDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+        $fixtureDir = realpath(__DIR__ . '/../../_files');
+        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $this->filesToRemove[] = $filePath;
+        $tmpDirectory->getDriver()->copy($fixtureDir . DIRECTORY_SEPARATOR . $fileName, $filePath);
+        $source = $this->csvFactory->create(
+            [
+                'file' => $fileName,
+                'directory' => $tmpDirectory
+            ]
+        );
+
+        return $source;
+    }
+
+    /**
+     * Update upload to use sandbox folders
+     *
+     * @return void
+     */
+    private function updateUploader(): void
+    {
+        $uploader = $this->import->getUploader();
+        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
+        $destDir = $rootDirectory->getRelativePath(
+            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
+            . DS . $this->mediaConfig->getBaseMediaPath()
+        );
+        $tmpDir = $rootDirectory->getRelativePath(
+            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
+        );
+        $rootDirectory->create($destDir);
+        $rootDirectory->create($tmpDir);
+        $uploader->setDestDir($destDir);
+        $uploader->setTmpDir($tmpDir);
+    }
+
+    /**
+     * Move images to appropriate folder
+     *
+     * @param string $fileName
+     * @return void
+     */
+    private function moveImages(string $fileName): void
+    {
+        $rootDirectory = $this->fileSystem->getDirectoryWrite(DirectoryList::ROOT);
+        $tmpDir = $rootDirectory->getRelativePath(
+            $this->appParams[DirectoryList::MEDIA][DirectoryList::PATH]
+        );
+        $fixtureDir = realpath(__DIR__ . '/../../_files');
+        $tmpFilePath = $rootDirectory->getAbsolutePath($tmpDir . DS . $fileName);
+        $this->fileDriver->createDirectory($tmpDir);
+        $rootDirectory->getDriver()->copy(
+            $fixtureDir . DIRECTORY_SEPARATOR . $fileName,
+            $tmpFilePath
+        );
+        $this->filesToRemove[] = $tmpFilePath;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_with_same_images.csv b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_with_same_images.csv
new file mode 100644
index 0000000000000..7761ed7ac2360
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_with_same_images.csv
@@ -0,0 +1,3 @@
+sku,store_view_code,attribute_set_code,product_type,categories,product_websites,name,description,short_description,weight,product_online,tax_class_name,visibility,price,special_price,special_price_from_date,special_price_to_date,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,swatch_image,swatch_image_label,created_at,updated_at,new_from_date,new_to_date,display_product_options_in,map_price,msrp_price,map_enabled,gift_message_available,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_display_actual_price_type,country_of_manufacture,additional_attributes,qty,out_of_stock_qty,use_config_min_qty,is_qty_decimal,allow_backorders,use_config_backorders,min_cart_qty,use_config_min_sale_qty,max_cart_qty,use_config_max_sale_qty,is_in_stock,notify_on_stock_below,use_config_notify_stock_qty,manage_stock,use_config_manage_stock,use_config_qty_increments,qty_increments,use_config_enable_qty_inc,enable_qty_increments,is_decimal_divided,website_id,related_skus,related_position,crosssell_skus,crosssell_position,upsell_skus,upsell_position,additional_images,additional_image_labels,hide_from_product_page,custom_options,bundle_price_type,bundle_sku_type,bundle_price_view,bundle_weight_type,bundle_values,bundle_shipment_type,configurable_variations,configurable_variation_labels,associated_skus
+SimpleProductForTest1,,Default,simple,Default,base,SimpleProductAfterImport1,,,1,1,Taxable Goods,"Catalog, Search",250,,,,simple-product-for-test-1,,,,magento_image.jpg,BASE magento_image.jpg,magento_image.jpg,SMALL blueshirt,magento_image.jpg,Thumb Image,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,Block after Info Column,,,,,,,,,,,Use config,,,100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,,,,,,,,,,,,,,,,,,,
+SimpleProductForTest2,,Default,simple,Default,base,SimpleProductAfterImport2,,,1,1,Taxable Goods,"Catalog, Search",300,,,,simple-product-for-test-2,,,,magento_image.jpg,BASE magento_image.jpg,magento_image.jpg,SMALL blueshirt,magento_image.jpg,Thumb Image,,,"3/4/19, 5:53 AM","3/4/19, 4:47 PM",,,Block after Info Column,,,,,,,,,,,Use config,,,100,0,1,0,0,1,1,1,0,1,1,,1,0,1,1,0,1,0,0,0,,,,,,,,,,,,,,,,,,,
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/magento_image.jpg b/dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/magento_image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3b825a41b2101a758ee9c45b9304a6d08a90c729
GIT binary patch
literal 13353
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
A%K!iX

literal 0
HcmV?d00001


From 2070e582f54d43e09f2b1471666d0fd746995bbd Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Mon, 12 Oct 2020 09:53:20 -0500
Subject: [PATCH 499/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Model/Indexer/Product/Price/AbstractAction.php     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index f3a4b322e29df..b8896dd128f6b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -387,12 +387,9 @@ protected function _reindexRows($changedIds = [])
         $parentProductsTypes = $this->getParentProductsTypes($changedIds);
 
         $changedIds = array_unique(array_merge($changedIds, ...array_values($parentProductsTypes)));
+        $pendingDeleteIds = $changedIds;
         $productsTypes = array_merge_recursive($productsTypes, $parentProductsTypes);
 
-        if ($changedIds) {
-            $this->deleteIndexData($changedIds);
-        }
-
         $typeIndexers = $this->getTypeIndexers();
         foreach ($typeIndexers as $productType => $indexer) {
             $entityIds = $productsTypes[$productType] ?? [];
@@ -419,6 +416,11 @@ protected function _reindexRows($changedIds = [])
                 $indexer->reindexEntity($entityIds);
                 $this->_syncData($entityIds);
             }
+            $pendingDeleteIds = array_diff($pendingDeleteIds, $entityIds);
+        }
+
+        if (!empty($pendingDeleteIds)) {
+            $this->deleteIndexData($pendingDeleteIds);
         }
 
         return $changedIds;

From df5ae12ecc26edee6bdb2c01cf5e0c6c3198f9f4 Mon Sep 17 00:00:00 2001
From: TuNa <ladiesman9x@gmail.com>
Date: Mon, 12 Oct 2020 22:13:19 +0700
Subject: [PATCH 500/671] Remove incorrect use important in swatches option
 text

up
---
 .../Magento_Swatches/web/css/source/_module.less      | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
index 07317e1670a0b..ce1b009c24d42 100644
--- a/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
+++ b/app/design/frontend/Magento/blank/Magento_Swatches/web/css/source/_module.less
@@ -65,7 +65,6 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
-
     .swatch {
         &-attribute {
             &-label {
@@ -155,7 +154,7 @@
                 padding: 4px 8px;
 
                 &.selected {
-                    .lib-css(background-color, @swatch-option-text__selected__background-color) !important;
+                    .lib-css(background-color, @swatch-option-text__selected__background-color);
                 }
             }
 
@@ -201,6 +200,7 @@
                     top: 0;
                 }
             }
+
             &-disabled {
                 border: 0;
                 cursor: default;
@@ -208,6 +208,7 @@
 
                 &:after {
                     .lib-rotate(-30deg);
+                    .lib-css(background, @swatch-option__disabled__background);
                     content: '';
                     height: 2px;
                     left: -4px;
@@ -215,7 +216,6 @@
                     top: 10px;
                     width: 42px;
                     z-index: 995;
-                    .lib-css(background, @swatch-option__disabled__background);
                 }
             }
 
@@ -226,6 +226,7 @@
             &-tooltip {
                 .lib-css(border, @swatch-option-tooltip__border);
                 .lib-css(color, @swatch-option-tooltip__color);
+                .lib-css(background, @swatch-option-tooltip__background);
                 display: none;
                 max-height: 100%;
                 min-height: 20px;
@@ -234,7 +235,6 @@
                 position: absolute;
                 text-align: center;
                 z-index: 999;
-                .lib-css(background, @swatch-option-tooltip__background);
 
                 &,
                 &-layered {
@@ -278,9 +278,9 @@
                 }
 
                 &-layered {
+                    .lib-css(background, @swatch-option-tooltip-layered__background);
                     .lib-css(border, @swatch-option-tooltip-layered__border);
                     .lib-css(color, @swatch-option-tooltip-layered__color);
-                    .lib-css(background, @swatch-option-tooltip-layered__background);
                     display: none;
                     left: -47px;
                     position: absolute;
@@ -326,7 +326,6 @@
             margin: 2px 0;
             padding: 2px;
             position: static;
-            z-index: 1;
         }
 
         &-visual-tooltip-layered {

From daf0dc67926bde5de6e05f956ff0b09756ed0123 Mon Sep 17 00:00:00 2001
From: niravkrish <niravpatel5393@gmail.com>
Date: Mon, 12 Oct 2020 22:08:35 +0530
Subject: [PATCH 501/671] removed unneccesary css to resolve the issue

---
 lib/web/css/source/components/_modals.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
index 58c9c0674b6ad..8513db545f1ec 100644
--- a/lib/web/css/source/components/_modals.less
+++ b/lib/web/css/source/components/_modals.less
@@ -103,10 +103,6 @@
     &.confirm {
         .modal-inner-wrap {
             .lib-css(max-width, @modal-popup-confirm__width);
-
-            .modal-content {
-                padding-right: 7rem;
-            }
         }
     }
 

From 8c8b9cf5220db0a8ffdc2ec16f1a092efcbe4fbd Mon Sep 17 00:00:00 2001
From: Bartosz Kubicki <bartosz.kubicki@lizardmedia.pl>
Date: Mon, 12 Oct 2020 12:59:50 +0200
Subject: [PATCH 502/671] Possible fix for integration test

---
 .../Framework/MessageQueue/TopologyTest.php   | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
index 5c85d6ddb7c70..cbe48c99da020 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/MessageQueue/TopologyTest.php
@@ -3,16 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Framework\MessageQueue;
 
+use Magento\TestFramework\Helper\Amqp;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\TestFramework\MessageQueue\PreconditionFailedException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfiguration
  * @see dev/tests/integration/_files/Magento/TestModuleMessageQueueConfigOverride
  */
-class TopologyTest extends \PHPUnit\Framework\TestCase
+class TopologyTest extends TestCase
 {
     /**
      * List of declared exchanges.
@@ -22,13 +26,16 @@ class TopologyTest extends \PHPUnit\Framework\TestCase
     private $declaredExchanges;
 
     /**
-     * @var \Magento\TestFramework\Helper\Amqp
+     * @var Amqp
      */
     private $helper;
 
+    /**
+     * @return void
+     */
     protected function setUp(): void
     {
-        $this->helper = Bootstrap::getObjectManager()->create(\Magento\TestFramework\Helper\Amqp::class);
+        $this->helper = Bootstrap::getObjectManager()->create(Amqp::class);
 
         if (!$this->helper->isAvailable()) {
             $this->fail('This test relies on RabbitMQ Management Plugin.');
@@ -42,24 +49,28 @@ protected function setUp(): void
      * @param array $expectedConfig
      * @param array $bindingConfig
      */
-    public function testTopologyInstallation(array $expectedConfig, array $bindingConfig)
+    public function testTopologyInstallation(array $expectedConfig, array $bindingConfig): void
     {
         $name = $expectedConfig['name'];
         $this->assertArrayHasKey($name, $this->declaredExchanges);
-        unset($this->declaredExchanges[$name]['message_stats']);
-        unset($this->declaredExchanges[$name]['user_who_performed_action']);
-        $this->assertSame(
+        unset(
+            $this->declaredExchanges[$name]['message_stats'],
+            $this->declaredExchanges[$name]['user_who_performed_action']
+        );
+
+        $this->assertEquals(
             $expectedConfig,
             $this->declaredExchanges[$name],
             'Invalid exchange configuration: ' . $name
         );
 
         $bindings = $this->helper->getExchangeBindings($name);
-        $bindings = array_map(function ($value) {
+        $bindings = array_map(static function ($value) {
             unset($value['properties_key']);
             return $value;
         }, $bindings);
-        $this->assertSame(
+
+        $this->assertEquals(
             $bindingConfig,
             $bindings,
             'Invalid exchange bindings configuration: ' . $name
@@ -70,7 +81,7 @@ public function testTopologyInstallation(array $expectedConfig, array $bindingCo
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function exchangeDataProvider()
+    public function exchangeDataProvider(): array
     {
         return [
             'magento-topic-based-exchange1' => [

From f19ea1f4b11cec03a19a4c4c4bff379aaa2c4a01 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Mon, 12 Oct 2020 13:59:31 -0500
Subject: [PATCH 503/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index 578e3099a2fde..6d7e7293f9e9d 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -778,7 +778,7 @@ protected function _movePriceDataToIndexTable($entityIds = null)
             $select->where('entity_id in (?)', count($entityIds) > 0 ? $entityIds : 0, \Zend_Db::INT_TYPE);
         }
 
-        $query = $select->insertFromSelect($this->getIdxTable(), [], false);
+        $query = $select->insertFromSelect($this->getIdxTable(), [], true);
         $connection->query($query);
 
         $connection->delete($table);

From d2d6c607bece5c137b1a5a8119974fc24571e6e3 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Mon, 12 Oct 2020 22:50:39 +0300
Subject: [PATCH 504/671] MC-30631: Database sessions pile up

---
 lib/internal/Magento/Framework/Session/Config.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/Session/Config.php b/lib/internal/Magento/Framework/Session/Config.php
index 3bb30d0f6ec3e..1791ab09156fd 100644
--- a/lib/internal/Magento/Framework/Session/Config.php
+++ b/lib/internal/Magento/Framework/Session/Config.php
@@ -29,16 +29,16 @@ class Config implements ConfigInterface
     const PARAM_SESSION_CACHE_LIMITER = 'session/cache_limiter';
 
     /** Configuration path for session garbage collection probability */
-    const PARAM_SESSION_GC_PROBABILITY = 'session/gc_probability';
+    private const PARAM_SESSION_GC_PROBABILITY = 'session/gc_probability';
 
     /** Configuration path for session garbage collection divisor */
-    const PARAM_SESSION_GC_DIVISOR = 'session/gc_divisor';
+    private const PARAM_SESSION_GC_DIVISOR = 'session/gc_divisor';
 
     /**
      * Configuration path for session garbage collection max lifetime.
      * The number of seconds after which data will be seen as 'garbage'.
      */
-    const PARAM_SESSION_GC_MAXLIFETIME = 'session/gc_maxlifetime';
+    private const PARAM_SESSION_GC_MAXLIFETIME = 'session/gc_maxlifetime';
 
     /** Configuration path for cookie domain */
     const XML_PATH_COOKIE_DOMAIN = 'web/cookie/cookie_domain';

From 7037dec973f500bb9b5e3468413a105ec313131b Mon Sep 17 00:00:00 2001
From: magento packaging service <magento-comops@adobe.com>
Date: Mon, 12 Oct 2020 20:30:22 +0000
Subject: [PATCH 505/671] Updating composer versions for version-setter for
 2.4.1

---
 app/code/Magento/AdminAnalytics/composer.json | 22 +++---
 .../Magento/AdminNotification/composer.json   | 24 ++++---
 .../AdvancedPricingImportExport/composer.json | 28 ++++----
 app/code/Magento/AdvancedSearch/composer.json | 28 ++++----
 app/code/Magento/Amqp/composer.json           | 18 ++---
 app/code/Magento/AmqpStore/composer.json      | 22 +++---
 app/code/Magento/Analytics/composer.json      | 18 ++---
 .../AsynchronousOperations/composer.json      | 26 +++----
 app/code/Magento/Authorization/composer.json  | 16 +++--
 app/code/Magento/Backend/composer.json        | 48 +++++++------
 app/code/Magento/Backup/composer.json         | 20 +++---
 app/code/Magento/Bundle/composer.json         | 50 ++++++-------
 app/code/Magento/BundleGraphQl/composer.json  | 26 +++----
 .../Magento/BundleImportExport/composer.json  | 26 +++----
 .../Magento/CacheInvalidate/composer.json     | 16 +++--
 app/code/Magento/Captcha/composer.json        | 24 ++++---
 .../Magento/CardinalCommerce/composer.json    | 20 +++---
 app/code/Magento/Catalog/composer.json        | 70 ++++++++++---------
 .../Magento/CatalogAnalytics/composer.json    | 14 ++--
 .../Magento/CatalogCmsGraphQl/composer.json   | 22 +++---
 .../CatalogCustomerGraphQl/composer.json      | 18 ++---
 app/code/Magento/CatalogGraphQl/composer.json | 32 +++++----
 .../Magento/CatalogImportExport/composer.json | 34 ++++-----
 .../Magento/CatalogInventory/composer.json    | 28 ++++----
 .../CatalogInventoryGraphQl/composer.json     | 16 +++--
 app/code/Magento/CatalogRule/composer.json    | 32 +++++----
 .../CatalogRuleConfigurable/composer.json     | 22 +++---
 .../Magento/CatalogRuleGraphQl/composer.json  | 14 ++--
 app/code/Magento/CatalogSearch/composer.json  | 38 +++++-----
 .../Magento/CatalogUrlRewrite/composer.json   | 32 +++++----
 .../CatalogUrlRewriteGraphQl/composer.json    | 22 +++---
 app/code/Magento/CatalogWidget/composer.json  | 32 +++++----
 app/code/Magento/Checkout/composer.json       | 54 +++++++-------
 .../Magento/CheckoutAgreements/composer.json  | 22 +++---
 .../CheckoutAgreementsGraphQl/composer.json   | 18 ++---
 app/code/Magento/Cms/composer.json            | 34 ++++-----
 app/code/Magento/CmsGraphQl/composer.json     | 24 ++++---
 app/code/Magento/CmsUrlRewrite/composer.json  | 20 +++---
 .../CmsUrlRewriteGraphQl/composer.json        | 22 +++---
 app/code/Magento/Config/composer.json         | 28 ++++----
 .../ConfigurableImportExport/composer.json    | 26 +++----
 .../Magento/ConfigurableProduct/composer.json | 50 ++++++-------
 .../ConfigurableProductGraphQl/composer.json  | 22 +++---
 .../ConfigurableProductSales/composer.json    | 22 +++---
 app/code/Magento/Contact/composer.json        | 22 +++---
 app/code/Magento/Cookie/composer.json         | 18 ++---
 app/code/Magento/Cron/composer.json           | 18 ++---
 app/code/Magento/Csp/composer.json            | 16 +++--
 app/code/Magento/CurrencySymbol/composer.json | 24 ++++---
 app/code/Magento/Customer/composer.json       | 54 +++++++-------
 .../Magento/CustomerAnalytics/composer.json   | 14 ++--
 .../CustomerDownloadableGraphQl/composer.json | 18 ++---
 .../Magento/CustomerGraphQl/composer.json     | 26 +++----
 .../CustomerImportExport/composer.json        | 26 +++----
 app/code/Magento/Deploy/composer.json         | 22 +++---
 app/code/Magento/Developer/composer.json      | 18 ++---
 app/code/Magento/Dhl/composer.json            | 34 ++++-----
 app/code/Magento/Directory/composer.json      | 20 +++---
 .../Magento/DirectoryGraphQl/composer.json    | 16 +++--
 app/code/Magento/Downloadable/composer.json   | 48 +++++++------
 .../Magento/DownloadableGraphQl/composer.json | 28 ++++----
 .../DownloadableImportExport/composer.json    | 26 +++----
 app/code/Magento/Eav/composer.json            | 24 ++++---
 app/code/Magento/EavGraphQl/composer.json     | 16 +++--
 app/code/Magento/Elasticsearch/composer.json  | 32 +++++----
 app/code/Magento/Elasticsearch6/composer.json | 24 ++++---
 app/code/Magento/Elasticsearch7/composer.json | 24 ++++---
 app/code/Magento/Email/composer.json          | 34 ++++-----
 app/code/Magento/EncryptionKey/composer.json  | 18 ++---
 app/code/Magento/Fedex/composer.json          | 30 ++++----
 app/code/Magento/GiftMessage/composer.json    | 34 ++++-----
 .../Magento/GiftMessageGraphQl/composer.json  | 16 +++--
 app/code/Magento/GoogleAdwords/composer.json  | 18 ++---
 .../Magento/GoogleAnalytics/composer.json     | 22 +++---
 .../Magento/GoogleOptimizer/composer.json     | 26 +++----
 app/code/Magento/GraphQl/composer.json        | 18 ++---
 app/code/Magento/GraphQlCache/composer.json   | 14 ++--
 .../GroupedCatalogInventory/composer.json     | 20 +++---
 .../Magento/GroupedImportExport/composer.json | 24 ++++---
 app/code/Magento/GroupedProduct/composer.json | 42 +++++------
 .../GroupedProductGraphQl/composer.json       | 16 +++--
 app/code/Magento/ImportExport/composer.json   | 26 +++----
 app/code/Magento/Indexer/composer.json        | 16 +++--
 .../Magento/InstantPurchase/composer.json     | 18 ++---
 app/code/Magento/Integration/composer.json    | 28 ++++----
 .../Magento/LayeredNavigation/composer.json   | 18 ++---
 .../Magento/LoginAsCustomer/composer.json     | 26 ++++---
 .../LoginAsCustomerAdminUi/composer.json      | 33 +++++----
 .../Magento/LoginAsCustomerApi/composer.json  | 14 ++--
 .../LoginAsCustomerAssistance/composer.json   | 31 ++++----
 .../LoginAsCustomerFrontendUi/composer.json   | 21 +++---
 .../Magento/LoginAsCustomerLog/composer.json  | 31 ++++----
 .../LoginAsCustomerPageCache/composer.json    | 25 ++++---
 .../LoginAsCustomerQuote/composer.json        | 23 +++---
 .../LoginAsCustomerSales/composer.json        | 23 +++---
 app/code/Magento/Marketplace/composer.json    | 16 +++--
 app/code/Magento/MediaContent/composer.json   | 14 ++--
 .../Magento/MediaContentApi/composer.json     | 12 ++--
 .../Magento/MediaContentCatalog/composer.json | 18 ++---
 .../Magento/MediaContentCms/composer.json     | 14 ++--
 .../MediaContentSynchronization/composer.json | 22 +++---
 .../composer.json                             | 10 +--
 .../composer.json                             | 16 +++--
 .../composer.json                             | 16 +++--
 app/code/Magento/MediaGallery/composer.json   | 14 ++--
 .../Magento/MediaGalleryApi/composer.json     | 10 +--
 .../Magento/MediaGalleryCatalog/composer.json | 14 ++--
 .../composer.json                             | 24 ++++---
 .../MediaGalleryCatalogUi/composer.json       | 20 +++---
 .../Magento/MediaGalleryCmsUi/composer.json   | 14 ++--
 .../MediaGalleryIntegration/composer.json     | 32 +++++----
 .../MediaGalleryMetadata/composer.json        | 12 ++--
 .../MediaGalleryMetadataApi/composer.json     | 10 +--
 .../MediaGallerySynchronization/composer.json | 16 +++--
 .../composer.json                             | 12 ++--
 .../composer.json                             | 16 +++--
 app/code/Magento/MediaGalleryUi/composer.json | 28 ++++----
 .../Magento/MediaGalleryUiApi/composer.json   | 10 +--
 app/code/Magento/MediaStorage/composer.json   | 30 ++++----
 app/code/Magento/MessageQueue/composer.json   | 16 +++--
 app/code/Magento/Msrp/composer.json           | 28 ++++----
 .../MsrpConfigurableProduct/composer.json     | 20 +++---
 .../Magento/MsrpGroupedProduct/composer.json  | 20 +++---
 app/code/Magento/Multishipping/composer.json  | 34 ++++-----
 app/code/Magento/MysqlMq/composer.json        | 18 ++---
 .../Magento/NewRelicReporting/composer.json   | 26 +++----
 app/code/Magento/Newsletter/composer.json     | 32 +++++----
 .../Magento/NewsletterGraphQl/composer.json   | 22 +++---
 .../Magento/OfflinePayments/composer.json     | 20 +++---
 .../Magento/OfflineShipping/composer.json     | 36 +++++-----
 app/code/Magento/PageCache/composer.json      | 20 +++---
 app/code/Magento/Payment/composer.json        | 28 ++++----
 app/code/Magento/Paypal/composer.json         | 48 +++++++------
 app/code/Magento/PaypalCaptcha/composer.json  | 22 +++---
 app/code/Magento/PaypalGraphQl/composer.json  | 34 ++++-----
 app/code/Magento/Persistent/composer.json     | 26 +++----
 app/code/Magento/ProductAlert/composer.json   | 26 +++----
 app/code/Magento/ProductVideo/composer.json   | 28 ++++----
 app/code/Magento/Quote/composer.json          | 44 ++++++------
 app/code/Magento/QuoteAnalytics/composer.json | 14 ++--
 .../Magento/QuoteBundleOptions/composer.json  | 12 ++--
 .../QuoteConfigurableOptions/composer.json    | 12 ++--
 .../QuoteDownloadableLinks/composer.json      | 12 ++--
 app/code/Magento/QuoteGraphQl/composer.json   | 34 ++++-----
 .../RelatedProductGraphQl/composer.json       | 18 ++---
 .../Magento/ReleaseNotification/composer.json | 22 +++---
 app/code/Magento/Reports/composer.json        | 46 ++++++------
 app/code/Magento/RequireJs/composer.json      | 14 ++--
 app/code/Magento/Review/composer.json         | 34 ++++-----
 .../Magento/ReviewAnalytics/composer.json     | 14 ++--
 app/code/Magento/ReviewGraphQl/composer.json  | 22 +++---
 app/code/Magento/Robots/composer.json         | 18 ++---
 app/code/Magento/Rss/composer.json            | 20 +++---
 app/code/Magento/Rule/composer.json           | 22 +++---
 app/code/Magento/Sales/composer.json          | 64 +++++++++--------
 app/code/Magento/SalesAnalytics/composer.json | 14 ++--
 app/code/Magento/SalesGraphQl/composer.json   | 24 ++++---
 app/code/Magento/SalesInventory/composer.json | 22 +++---
 app/code/Magento/SalesRule/composer.json      | 54 +++++++-------
 app/code/Magento/SalesSequence/composer.json  | 14 ++--
 app/code/Magento/SampleData/composer.json     | 16 +++--
 app/code/Magento/Search/composer.json         | 24 ++++---
 app/code/Magento/Security/composer.json       | 22 +++---
 app/code/Magento/SendFriend/composer.json     | 26 +++----
 .../Magento/SendFriendGraphQl/composer.json   | 16 +++--
 app/code/Magento/Shipping/composer.json       | 46 ++++++------
 app/code/Magento/Sitemap/composer.json        | 34 ++++-----
 app/code/Magento/Store/composer.json          | 32 +++++----
 app/code/Magento/StoreGraphQl/composer.json   | 14 ++--
 app/code/Magento/Swagger/composer.json        | 14 ++--
 app/code/Magento/SwaggerWebapi/composer.json  | 16 +++--
 .../Magento/SwaggerWebapiAsync/composer.json  | 18 ++---
 app/code/Magento/Swatches/composer.json       | 38 +++++-----
 .../Magento/SwatchesGraphQl/composer.json     | 16 +++--
 .../SwatchesLayeredNavigation/composer.json   | 14 ++--
 app/code/Magento/Tax/composer.json            | 44 ++++++------
 app/code/Magento/TaxGraphQl/composer.json     | 16 +++--
 .../Magento/TaxImportExport/composer.json     | 24 ++++---
 app/code/Magento/Theme/composer.json          | 40 ++++++-----
 app/code/Magento/ThemeGraphQl/composer.json   | 14 ++--
 app/code/Magento/Tinymce3/composer.json       | 24 ++++---
 app/code/Magento/Translation/composer.json    | 24 ++++---
 app/code/Magento/Ui/composer.json             | 26 +++----
 app/code/Magento/Ups/composer.json            | 30 ++++----
 app/code/Magento/UrlRewrite/composer.json     | 28 ++++----
 .../Magento/UrlRewriteGraphQl/composer.json   | 16 +++--
 app/code/Magento/User/composer.json           | 28 ++++----
 app/code/Magento/Usps/composer.json           | 30 ++++----
 app/code/Magento/Variable/composer.json       | 22 +++---
 app/code/Magento/Vault/composer.json          | 29 ++++----
 app/code/Magento/VaultGraphQl/composer.json   | 14 ++--
 app/code/Magento/Version/composer.json        | 14 ++--
 app/code/Magento/Webapi/composer.json         | 26 +++----
 app/code/Magento/WebapiAsync/composer.json    | 24 ++++---
 app/code/Magento/WebapiSecurity/composer.json | 16 +++--
 app/code/Magento/Weee/composer.json           | 40 ++++++-----
 app/code/Magento/WeeeGraphQl/composer.json    | 20 +++---
 app/code/Magento/Widget/composer.json         | 30 ++++----
 app/code/Magento/Wishlist/composer.json       | 48 +++++++------
 .../Magento/WishlistAnalytics/composer.json   | 14 ++--
 .../Magento/WishlistGraphQl/composer.json     | 16 +++--
 .../adminhtml/Magento/backend/composer.json   | 14 ++--
 .../frontend/Magento/blank/composer.json      | 14 ++--
 .../frontend/Magento/luma/composer.json       | 16 +++--
 app/i18n/Magento/de_DE/composer.json          |  6 +-
 app/i18n/Magento/en_US/composer.json          |  6 +-
 app/i18n/Magento/es_ES/composer.json          |  6 +-
 app/i18n/Magento/fr_FR/composer.json          |  6 +-
 app/i18n/Magento/nl_NL/composer.json          |  6 +-
 app/i18n/Magento/pt_BR/composer.json          |  6 +-
 app/i18n/Magento/zh_Hans_CN/composer.json     |  6 +-
 .../Magento/Framework/Amqp/composer.json      | 18 ++---
 .../Magento/Framework/Bulk/composer.json      | 18 ++---
 .../Framework/MessageQueue/composer.json      | 18 ++---
 lib/internal/Magento/Framework/composer.json  | 10 +--
 215 files changed, 2738 insertions(+), 2302 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
index cf60b1d88ae55..69a1a44212a2c 100644
--- a/app/code/Magento/AdminAnalytics/composer.json
+++ b/app/code/Magento/AdminAnalytics/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-admin-analytics",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-config": "*",
-        "magento/module-ui": "*",
-        "magento/module-release-notification": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-release-notification": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index d421fc869621b..3b3251458449e 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-admin-notification",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-config": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index ea6a39fba2c3d..d5124bdd0953d 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-import-export": "101.1.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
index 720309b619e43..9da312cc176de 100644
--- a/app/code/Magento/AdvancedSearch/composer.json
+++ b/app/code/Magento/AdvancedSearch/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-advanced-search",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-search": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-search": "*",
-        "magento/module-store": "*",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-search": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-search": "101.1.*",
+        "magento/module-store": "101.1.*",
         "php": "~7.3.0||~7.4.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
index 9e7a035112b04..8faeaa24be85c 100644
--- a/app/code/Magento/Amqp/composer.json
+++ b/app/code/Magento/Amqp/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-amqp",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*",
-        "magento/framework-amqp": "*",
-        "magento/framework-message-queue": "*",
+        "magento/framework": "103.0.*",
+        "magento/framework-amqp": "100.4.*",
+        "magento/framework-message-queue": "100.4.*",
         "php": "~7.3.0||~7.4.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/AmqpStore/composer.json b/app/code/Magento/AmqpStore/composer.json
index 70a10810ece21..f886ad8cd9217 100644
--- a/app/code/Magento/AmqpStore/composer.json
+++ b/app/code/Magento/AmqpStore/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-amqp-store",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*",
-        "magento/framework-amqp": "*",
-        "magento/module-store": "*",
+        "magento/framework": "103.0.*",
+        "magento/framework-amqp": "100.4.*",
+        "magento/module-store": "101.1.*",
         "php": "~7.3.0||~7.4.0"
     },
     "suggest": {
-        "magento/module-asynchronous-operations": "*",
-        "magento/framework-message-queue": "*"
+        "magento/module-asynchronous-operations": "100.4.*",
+        "magento/framework-message-queue": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index 84f8af066bf11..5f635c21979ed 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-backend": "*",
-        "magento/module-config": "*",
-        "magento/module-integration": "*",
-        "magento/module-store": "*",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-integration": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
index b5de631418e72..a70ead26df02c 100644
--- a/app/code/Magento/AsynchronousOperations/composer.json
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-asynchronous-operations",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
-        "magento/framework": "*",
-        "magento/framework-message-queue": "*",
-        "magento/framework-bulk": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-ui": "*",
+        "magento/framework": "103.0.*",
+        "magento/framework-message-queue": "100.4.*",
+        "magento/framework-bulk": "101.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-ui": "101.2.*",
         "php": "~7.3.0||~7.4.0"
     },
     "suggest": {
-        "magento/module-admin-notification": "*",
+        "magento/module-admin-notification": "100.4.*",
         "magento/module-logging": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 401444404ca3e..3da4582ee5071 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index ee5491057d861..fc3b62d645bfc 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -1,37 +1,38 @@
 {
     "name": "magento/module-backend",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "102.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backup": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-developer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-quote": "*",
-        "magento/module-reports": "*",
-        "magento/module-require-js": "*",
-        "magento/module-sales": "*",
-        "magento/module-security": "*",
-        "magento/module-store": "*",
-        "magento/module-translation": "*",
-        "magento/module-ui": "*",
-        "magento/module-user": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backup": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-developer": "100.4.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-reports": "100.4.*",
+        "magento/module-require-js": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-security": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-translation": "100.4.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-user": "101.2.*"
     },
     "suggest": {
-        "magento/module-theme": "*"
+        "magento/module-theme": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -41,3 +42,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 9a5904beda550..18949cdb04456 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-backup",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-cron": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-cron": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index 1b5ca24ee098c..1d584dc896dec 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -1,38 +1,39 @@
 {
     "name": "magento/module-bundle",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-catalog-rule": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-gift-message": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-catalog-rule": "101.2.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-gift-message": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-webapi": "*",
-        "magento/module-bundle-sample-data": "*",
-        "magento/module-sales-rule": "*"
+        "magento/module-webapi": "100.4.*",
+        "magento/module-bundle-sample-data": "Sample Data version: 100.4.*",
+        "magento/module-sales-rule": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,3 +43,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
index e3c54719f4d0e..1d0cca1b02786 100644
--- a/app/code/Magento/BundleGraphQl/composer.json
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -2,22 +2,23 @@
     "name": "magento/module-bundle-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "*",
-        "magento/module-bundle": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-quote": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/module-store": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-graph-ql": "*",
-        "magento/framework": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-bundle": "101.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-quote-graph-ql": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-sales-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index faca3eac9a721..a1134382212ab 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-bundle-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-bundle": "*",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-bundle": "101.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-import-export": "101.1.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 7801554c890e1..385683d208b10 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-cache-invalidate",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-page-cache": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-page-cache": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 3c3aa58c3fe2f..5f9c0d31d7fbf 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -1,26 +1,27 @@
 {
     "name": "magento/module-captcha",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*",
-        "magento/module-authorization": "*",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-authorization": "100.4.*",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-db": "^2.8.2",
         "laminas/laminas-session": "^2.7.3"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
index 8b2989ef915e1..0c560942989fa 100644
--- a/app/code/Magento/CardinalCommerce/composer.json
+++ b/app/code/Magento/CardinalCommerce/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-cardinal-commerce",
     "description": "Provides a possibility to enable 3-D Secure 2.0 support for payment methods.",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-payment": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 6dde1d76e5e81..42e7ad2c1d5e8 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -1,48 +1,49 @@
 {
     "name": "magento/module-catalog",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "104.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-asynchronous-operations": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-catalog-rule": "*",
-        "magento/module-catalog-url-rewrite": "*",
-        "magento/module-checkout": "*",
-        "magento/module-cms": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-indexer": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-msrp": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-product-alert": "*",
-        "magento/module-quote": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-url-rewrite": "*",
-        "magento/module-widget": "*",
-        "magento/module-wishlist": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-asynchronous-operations": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-catalog-rule": "101.2.*",
+        "magento/module-catalog-url-rewrite": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-indexer": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-msrp": "100.4.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-product-alert": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-url-rewrite": "102.0.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-wishlist": "101.2.*"
     },
     "suggest": {
-        "magento/module-cookie": "*",
-        "magento/module-sales": "*",
-        "magento/module-catalog-sample-data": "*"
+        "magento/module-cookie": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-catalog-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -52,3 +53,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 43fb4c8a6f433..0efaa58bede19 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-catalog-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-analytics": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-analytics": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogCmsGraphQl/composer.json b/app/code/Magento/CatalogCmsGraphQl/composer.json
index aa7a742f2f315..38c79b614b63e 100644
--- a/app/code/Magento/CatalogCmsGraphQl/composer.json
+++ b/app/code/Magento/CatalogCmsGraphQl/composer.json
@@ -2,21 +2,22 @@
     "name": "magento/module-catalog-cms-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-cms-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-cms-graph-ql": "100.4.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*",
-        "magento/module-cms": "*",
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogCustomerGraphQl/composer.json b/app/code/Magento/CatalogCustomerGraphQl/composer.json
index a7c887af0379b..ebb5040875c2a 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/composer.json
+++ b/app/code/Magento/CatalogCustomerGraphQl/composer.json
@@ -2,18 +2,19 @@
     "name": "magento/module-catalog-customer-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-store": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-store": "101.1.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index 46d7454a6d7e2..50757cd357a86 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -2,26 +2,27 @@
     "name": "magento/module-catalog-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-eav": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-search": "*",
-        "magento/module-store": "*",
-        "magento/module-eav-graph-ql": "*",
-        "magento/module-catalog-search": "*",
-        "magento/framework": "*",
-        "magento/module-graph-ql": "*"
+        "magento/module-eav": "102.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-search": "101.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-eav-graph-ql": "100.4.*",
+        "magento/module-catalog-search": "102.0.*",
+        "magento/framework": "103.0.*",
+        "magento/module-graph-ql": "100.4.*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "*",
-        "magento/module-store-graph-ql": "*"
+        "magento/module-graph-ql-cache": "100.4.*",
+        "magento/module-store-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 92a6620827990..9a8ab5adde9fd 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -1,29 +1,30 @@
 {
     "name": "magento/module-catalog-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-ctype": "*",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-catalog-url-rewrite": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-authorization": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-catalog-url-rewrite": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-authorization": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,3 +34,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index b810e6613aebb..e55114501b28a 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-catalog-inventory",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-quote": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
     },
     "abandoned": "magento/inventory-composer-metapackage"
 }
+
diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
index d6d5b01091341..9138144e82c8f 100644
--- a/app/code/Magento/CatalogInventoryGraphQl/composer.json
+++ b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-catalog-inventory-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 7c40ca8a9a33a..e1d4f361ef731 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -1,29 +1,30 @@
 {
     "name": "magento/module-catalog-rule",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-rule": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-rule": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-import-export": "*",
-        "magento/module-catalog-rule-sample-data": "*"
+        "magento/module-import-export": "101.0.*",
+        "magento/module-catalog-rule-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,3 +34,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index 19274fbae146f..95bd798a6f507 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-catalog-rule-configurable",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "magento/magento-composer-installer": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-rule": "*",
-        "magento/module-configurable-product": "*"
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-rule": "101.2.*",
+        "magento/module-configurable-product": "100.4.*"
     },
     "suggest": {
-        "magento/module-catalog-rule": "*"
+        "magento/module-catalog-rule": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogRuleGraphQl/composer.json b/app/code/Magento/CatalogRuleGraphQl/composer.json
index c82d9bb20ddab..aed9eef07394e 100644
--- a/app/code/Magento/CatalogRuleGraphQl/composer.json
+++ b/app/code/Magento/CatalogRuleGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-catalog-rule-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-catalog-rule": "*"
+        "magento/module-catalog-rule": "101.2.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 1efece402fd84..201447c73a031 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -1,32 +1,33 @@
 {
     "name": "magento/module-catalog-search",
     "description": "Catalog search",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "102.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-indexer": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-search": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-indexer": "100.4.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-search": "101.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -36,3 +37,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index fe489bcf0a3a0..16f804631b29b 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -1,29 +1,30 @@
 {
     "name": "magento/module-catalog-url-rewrite",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-url-rewrite": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-import-export": "101.1.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-url-rewrite": "102.0.*"
     },
     "suggest": {
-        "magento/module-webapi": "*"
+        "magento/module-webapi": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,3 +34,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
index 3b64d51b85568..20012a583e2ef 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -2,21 +2,22 @@
     "name": "magento/module-catalog-url-rewrite-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/framework": "*"
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-catalog-url-rewrite": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-url-rewrite-graph-ql": "*"
+        "magento/module-catalog-url-rewrite": "100.4.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-url-rewrite-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 305fb3ec47ad6..0ddbd5d7201dc 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-catalog-widget",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-rule": "*",
-        "magento/module-store": "*",
-        "magento/module-widget": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-theme": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-rule": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-wishlist": "101.2.*",
+        "magento/module-theme": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 5f7b5425667e5..9474d0942726a 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -1,40 +1,41 @@
 {
     "name": "magento/module-checkout",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-msrp": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-rule": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-captcha": "*",
-        "magento/module-authorization": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-msrp": "100.4.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-sales-rule": "101.2.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-captcha": "100.4.*",
+        "magento/module-authorization": "100.4.*"
     },
     "suggest": {
-        "magento/module-cookie": "*"
+        "magento/module-cookie": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -44,3 +45,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index 1741de53e8637..b9e1011bc7172 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-checkout-agreements",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-checkout": "*",
-        "magento/module-quote": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
index 26b80a4457b4a..ab59af7c0746f 100644
--- a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
+++ b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
@@ -2,19 +2,20 @@
     "name": "magento/module-checkout-agreements-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-checkout-agreements": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-checkout-agreements": "100.4.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 8d69320102b5e..600ea98cceb16 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -1,30 +1,31 @@
 {
     "name": "magento/module-cms",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "104.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-email": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-variable": "*",
-        "magento/module-widget": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-email": "101.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-variable": "100.4.*",
+        "magento/module-widget": "101.2.*"
     },
     "suggest": {
-        "magento/module-cms-sample-data": "*"
+        "magento/module-cms-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,3 +35,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
index 0e4c849fe8344..e98d8501711c6 100644
--- a/app/code/Magento/CmsGraphQl/composer.json
+++ b/app/code/Magento/CmsGraphQl/composer.json
@@ -2,22 +2,23 @@
     "name": "magento/module-cms-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-widget": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*",
-        "magento/module-graph-ql-cache": "*",
-        "magento/module-store-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-graph-ql-cache": "100.4.*",
+        "magento/module-store-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 80e150771975f..e4c1baef35c36 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-cms-url-rewrite",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-store": "*",
-        "magento/module-url-rewrite": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-url-rewrite": "102.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
index d8fbbb4c2e6fd..5a0f1c6d393ab 100644
--- a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
@@ -2,21 +2,22 @@
     "name": "magento/module-cms-url-rewrite-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-store": "*",
-        "magento/module-url-rewrite-graph-ql": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-url-rewrite-graph-ql": "100.4.*"
     },
     "suggest": {
-        "magento/module-cms-url-rewrite": "*",
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-cms-url-rewrite": "100.4.*",
+        "magento/module-catalog-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 63eca42a6ac48..95611a0acecfb 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-config",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-cron": "*",
-        "magento/module-deploy": "*",
-        "magento/module-directory": "*",
-        "magento/module-email": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-cron": "100.4.*",
+        "magento/module-deploy": "100.4.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-email": "101.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index e27510166a421..7da2c2c3b886c 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-configurable-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-configurable-product": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-import-export": "101.1.*",
+        "magento/module-configurable-product": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 7b1b1a18416f5..0e8afa3bbb2f8 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -1,38 +1,39 @@
 {
     "name": "magento/module-configurable-product",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-quote": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-msrp": "*",
-        "magento/module-webapi": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-rule": "*",
-        "magento/module-product-video": "*",
-        "magento/module-configurable-sample-data": "*",
-        "magento/module-product-links-sample-data": "*",
-        "magento/module-tax": "*"
+        "magento/module-msrp": "100.4.*",
+        "magento/module-webapi": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-sales-rule": "101.2.*",
+        "magento/module-product-video": "100.4.*",
+        "magento/module-configurable-sample-data": "Sample Data version: 100.4.*",
+        "magento/module-product-links-sample-data": "Sample Data version: 100.4.*",
+        "magento/module-tax": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,3 +43,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index 295efb65b1978..c2b06b3a8f9e0 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -2,20 +2,21 @@
     "name": "magento/module-configurable-product-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "*",
-        "magento/module-configurable-product": "*",
-        "magento/module-graph-ql": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-quote": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/framework": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-configurable-product": "100.4.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-quote-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index edac2b7782dcc..8b8d2467c58cf 100644
--- a/app/code/Magento/ConfigurableProductSales/composer.json
+++ b/app/code/Magento/ConfigurableProductSales/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-configurable-product-sales",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-configurable-product": "*"
+        "magento/module-configurable-product": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 1600c1e0c2543..1eb955166e5e8 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-contact",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 5a47a5c7993bf..2a47b375d35d9 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-cookie",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-backend": "*"
+        "magento/module-backend": "102.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index 00da35140744b..a40fd986bee27 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-cron",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Csp/composer.json b/app/code/Magento/Csp/composer.json
index 352735712b1b0..af4759029168b 100644
--- a/app/code/Magento/Csp/composer.json
+++ b/app/code/Magento/Csp/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-csp",
     "description": "CSP module enables Content Security Policies for Magento",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 746cfa0ed033d..8a5536844630f 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-currency-symbol",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index db3108a78e9aa..51a533c1eda19 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -1,40 +1,41 @@
 {
     "name": "magento/module-customer",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "103.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-integration": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-newsletter": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-wishlist": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-integration": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-newsletter": "100.4.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-wishlist": "101.2.*"
     },
     "suggest": {
-        "magento/module-cookie": "*",
-        "magento/module-customer-sample-data": "*"
+        "magento/module-cookie": "100.4.*",
+        "magento/module-customer-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -44,3 +45,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index abd9e93d89583..56bca0fb02456 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-customer-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-customer": "*",
-        "magento/module-analytics": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-analytics": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CustomerDownloadableGraphQl/composer.json b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
index f7cdbb0dc86d6..5518f0cb68f6b 100644
--- a/app/code/Magento/CustomerDownloadableGraphQl/composer.json
+++ b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
@@ -2,19 +2,20 @@
     "name": "magento/module-customer-downloadable-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-downloadable-graph-ql": "*",
-        "magento/module-graph-ql": "*",
-        "magento/framework": "*"
+        "magento/module-downloadable-graph-ql": "100.4.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-catalog-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
index 2ec396ca8ee92..82c85db4ce6fa 100644
--- a/app/code/Magento/CustomerGraphQl/composer.json
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -2,22 +2,23 @@
     "name": "magento/module-customer-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-authorization": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-graph-ql": "*",
-        "magento/module-newsletter": "*",
-        "magento/module-integration": "*",
-        "magento/module-store": "*",
-        "magento/framework": "*",
-        "magento/module-directory": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-newsletter": "100.4.*",
+        "magento/module-integration": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/framework": "103.0.*",
+        "magento/module-directory": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 8104ea01875a6..2773a9295f239 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-customer-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index d8668dbb84874..752b7551777f2 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-deploy",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-config": "*",
-        "magento/module-require-js": "*",
-        "magento/module-store": "*",
-        "magento/module-user": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-require-js": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-user": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "cli_commands.php",
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index c5c949ec45f62..14c1fb91706a9 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-developer",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-config": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index d81ae0d7b4969..4f359ba46f25d 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -1,31 +1,32 @@
 {
     "name": "magento/module-dhl",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-checkout": "*"
+        "magento/module-checkout": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,3 +36,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index e3646d38fe64d..d9c54914a790a 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-directory",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-config": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/DirectoryGraphQl/composer.json b/app/code/Magento/DirectoryGraphQl/composer.json
index ef473e1c43b94..3c74e1d497969 100644
--- a/app/code/Magento/DirectoryGraphQl/composer.json
+++ b/app/code/Magento/DirectoryGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-directory-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-directory": "*",
-        "magento/module-store": "*",
-        "magento/module-graph-ql": "*",
-        "magento/framework": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-directory": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 992bdbd1e263c..045bfdd234ffa 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -1,37 +1,38 @@
 {
     "name": "magento/module-downloadable",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-gift-message": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-gift-message": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-downloadable-sample-data": "*"
+        "magento/module-downloadable-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -41,3 +42,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index d03a5953506e5..8eba317d8b413 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -2,24 +2,25 @@
     "name": "magento/module-downloadable-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/framework": "*"
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-downloadable": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-quote-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-sales-graph-ql": "*"
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-sales-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index 6dd7043fc02a9..230c4a04b17ad 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-downloadable-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-eav": "*",
-        "magento/module-import-export": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-import-export": "101.1.*",
+        "magento/module-downloadable": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-import-export": "101.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 5636b0d05841c..b94035e5b518f 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-eav",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "102.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json
index ba4138f67cf62..962768a55d178 100644
--- a/app/code/Magento/EavGraphQl/composer.json
+++ b/app/code/Magento/EavGraphQl/composer.json
@@ -2,18 +2,19 @@
     "name": "magento/module-eav-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-eav": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-eav": "102.1.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index b79ae7bc5cc47..ade8dbeb3429f 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-elasticsearch",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-advanced-search": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-search": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-search": "*",
-        "magento/module-store": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/framework": "*",
+        "magento/module-advanced-search": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-search": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-search": "101.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/framework": "103.0.*",
         "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index 1ee92c0b0a3b3..f68744be48139 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-elasticsearch-6",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-advanced-search": "*",
-        "magento/module-catalog-search": "*",
-        "magento/module-search": "*",
-        "magento/module-elasticsearch": "*",
+        "magento/framework": "103.0.*",
+        "magento/module-advanced-search": "100.4.*",
+        "magento/module-catalog-search": "102.0.*",
+        "magento/module-search": "101.1.*",
+        "magento/module-elasticsearch": "101.0.*",
         "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Elasticsearch7/composer.json b/app/code/Magento/Elasticsearch7/composer.json
index 1e59ceaebaf84..ab2c52a2b9b32 100644
--- a/app/code/Magento/Elasticsearch7/composer.json
+++ b/app/code/Magento/Elasticsearch7/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-elasticsearch-7",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-elasticsearch": "*",
+        "magento/framework": "103.0.*",
+        "magento/module-elasticsearch": "101.0.*",
         "elasticsearch/elasticsearch": "~7.7.0",
-        "magento/module-advanced-search": "*",
-        "magento/module-catalog-search": "*"
+        "magento/module-advanced-search": "100.4.*",
+        "magento/module-catalog-search": "102.0.*"
     },
     "suggest": {
-        "magento/module-config": "*",
-        "magento/module-search": "*"
+        "magento/module-config": "101.2.*",
+        "magento/module-search": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 334bbcf9d4617..c5cee1c6610fd 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -1,30 +1,31 @@
 {
     "name": "magento/module-email",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-cms": "*",
-        "magento/module-config": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*",
-        "magento/module-require-js": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-variable": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-require-js": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-variable": "100.4.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-theme": "*"
+        "magento/module-theme": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,3 +35,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 6677a5b181f83..9efe0d770e7c3 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-encryption-key",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-config": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 575311e148457..46835867dde94 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-fedex",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index cdf0533c3270d..389964813fa57 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -1,30 +1,31 @@
 {
     "name": "magento/module-gift-message",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-eav": "*",
-        "magento/module-multishipping": "*"
+        "magento/module-eav": "102.1.*",
+        "magento/module-multishipping": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,3 +35,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GiftMessageGraphQl/composer.json b/app/code/Magento/GiftMessageGraphQl/composer.json
index 48088f2a48a32..ba8f9ebd37db1 100644
--- a/app/code/Magento/GiftMessageGraphQl/composer.json
+++ b/app/code/Magento/GiftMessageGraphQl/composer.json
@@ -2,18 +2,19 @@
     "name": "magento/module-gift-message-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-gift-message": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-gift-message": "100.4.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index a37470115584f..8043d7eba9488 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-google-adwords",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index 64d210c4f4811..3f068a0f8361d 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-google-analytics",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cookie": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-cookie": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 426526a922ec8..2f496d75f9042 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-google-optimizer",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-cms": "*",
-        "magento/module-google-analytics": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-google-analytics": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
index 401e77a787acf..ffb6c0fbc7d94 100644
--- a/app/code/Magento/GraphQl/composer.json
+++ b/app/code/Magento/GraphQl/composer.json
@@ -2,19 +2,20 @@
     "name": "magento/module-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-eav": "*",
-        "magento/framework": "*",
-        "magento/module-webapi": "*"
+        "magento/module-eav": "102.1.*",
+        "magento/framework": "103.0.*",
+        "magento/module-webapi": "100.4.*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "*"
+        "magento/module-graph-ql-cache": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GraphQlCache/composer.json b/app/code/Magento/GraphQlCache/composer.json
index 4cfdd0c4f660a..57b470cb512b9 100644
--- a/app/code/Magento/GraphQlCache/composer.json
+++ b/app/code/Magento/GraphQlCache/composer.json
@@ -2,16 +2,17 @@
     "name": "magento/module-graph-ql-cache",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-graph-ql": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-graph-ql": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
index 0d91d939494a8..668bf4428e4ff 100644
--- a/app/code/Magento/GroupedCatalogInventory/composer.json
+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-grouped-catalog-inventory",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-grouped-product": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-grouped-product": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 8806058c2bfc8..90c595a9e531e 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-grouped-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-eav": "*",
-        "magento/module-grouped-product": "*",
-        "magento/module-import-export": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-import-export": "101.1.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-grouped-product": "100.4.*",
+        "magento/module-import-export": "101.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 554b0c239c8fb..2d0958c694875 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -1,34 +1,35 @@
 {
     "name": "magento/module-grouped-product",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-msrp": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-wishlist": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-msrp": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-wishlist": "101.2.*"
     },
     "suggest": {
-        "magento/module-grouped-product-sample-data": "*"
+        "magento/module-grouped-product-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -38,3 +39,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json
index 5784acb5f5d04..e3dd433f606e5 100644
--- a/app/code/Magento/GroupedProductGraphQl/composer.json
+++ b/app/code/Magento/GroupedProductGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-grouped-product-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-grouped-product": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/framework": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-grouped-product": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 3be5c03dc2828..251a477cab76f 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-ctype": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-eav": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 07d652e9fa2b5..9451b257e8a01 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-indexer",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 0807926b755a0..89623cc92d2fe 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -6,16 +6,17 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-quote": "*",
-        "magento/module-vault": "*",
-        "magento/framework": "*"
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-vault": "101.2.*",
+        "magento/framework": "103.0.*"
     },
     "autoload": {
         "files": [
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index c85e84284b43f..34a2e17f4f087 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-integration",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-security": "*",
-        "magento/module-store": "*",
-        "magento/module-user": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-security": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-user": "101.2.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index fa3c90dbbd774..1c8cd342d071e 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-layered-navigation",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
index e58ec90e8f8bb..09f2957e8ab29 100755
--- a/app/code/Magento/LoginAsCustomer/composer.json
+++ b/app/code/Magento/LoginAsCustomer/composer.json
@@ -1,25 +1,29 @@
 {
     "name": "magento/module-login-as-customer",
     "description": "Allow for admin to enter a customer account",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-login-as-customer-api": "*"
-    },
-    "suggest": {
-        "magento/module-backend": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-login-as-customer-api": "100.4.*"
+    },
+    "suggest": {
+        "magento/module-backend": "102.0.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomer\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/composer.json b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
index b6291226827a8..90694eeb1d1d0 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
@@ -1,28 +1,31 @@
 {
     "name": "magento/module-login-as-customer-admin-ui",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-login-as-customer-frontend-ui": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*"
-    },
-    "suggest": {
-        "magento/module-login-as-customer": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-login-as-customer-api": "100.4.*",
+        "magento/module-login-as-customer-frontend-ui": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*"
+    },
+    "suggest": {
+        "magento/module-login-as-customer": "100.4.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerAdminUi\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerApi/composer.json b/app/code/Magento/LoginAsCustomerApi/composer.json
index b48319b61398f..ba88a33748821 100644
--- a/app/code/Magento/LoginAsCustomerApi/composer.json
+++ b/app/code/Magento/LoginAsCustomerApi/composer.json
@@ -1,19 +1,23 @@
 {
     "name": "magento/module-login-as-customer-api",
     "description": "Allow for admin to enter a customer account",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerApi\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index a02852533b950..9c6ac755ed809 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -1,27 +1,30 @@
 {
     "name": "magento/module-login-as-customer-assistance",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*",
-        "magento/module-login-as-customer": "*",
-        "magento/module-login-as-customer-api": "*"
-    },
-    "suggest": {
-        "magento/module-login-as-customer-admin-ui": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-login-as-customer": "100.4.*",
+        "magento/module-login-as-customer-api": "100.4.*"
+    },
+    "suggest": {
+        "magento/module-login-as-customer-admin-ui": "100.4.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerAssistance\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
index 279d8ae3ec79e..a4d772dd2f0e2 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
@@ -1,22 +1,25 @@
 {
     "name": "magento/module-login-as-customer-frontend-ui",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-login-as-customer-api": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerFrontendUi\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerLog/composer.json b/app/code/Magento/LoginAsCustomerLog/composer.json
index cf888f8cb1a59..85cd7de469078 100644
--- a/app/code/Magento/LoginAsCustomerLog/composer.json
+++ b/app/code/Magento/LoginAsCustomerLog/composer.json
@@ -1,27 +1,30 @@
 {
     "name": "magento/module-login-as-customer-log",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-ui": "*",
-        "magento/module-user": "*"
-    },
-    "suggest": {
-        "magento/module-login-as-customer": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-login-as-customer-api": "100.4.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-user": "101.2.*"
+    },
+    "suggest": {
+        "magento/module-login-as-customer": "100.4.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerLog\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
index 84d7f2e2a6730..d16bb45538b09 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/composer.json
+++ b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -1,24 +1,27 @@
 {
     "name": "magento/module-login-as-customer-page-cache",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-login-as-customer-api": "*"
-    },
-    "suggest": {
-        "magento/module-page-cache": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-login-as-customer-api": "100.4.*"
+    },
+    "suggest": {
+        "magento/module-page-cache": "100.4.*"
+    },
     "autoload": {
-        "files": [ "registration.php" ],
+        "files": [
+            "registration.php"
+        ],
         "psr-4": {
             "Magento\\LoginAsCustomerPageCache\\": ""
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerQuote/composer.json b/app/code/Magento/LoginAsCustomerQuote/composer.json
index 556ffc0d3be43..089cc8d2f2eb0 100644
--- a/app/code/Magento/LoginAsCustomerQuote/composer.json
+++ b/app/code/Magento/LoginAsCustomerQuote/composer.json
@@ -1,21 +1,21 @@
 {
     "name": "magento/module-login-as-customer-quote",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-quote": "*"
-    },
-    "suggest": {
-        "magento/module-login-as-customer-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-quote": "101.2.*"
+    },
+    "suggest": {
+        "magento/module-login-as-customer-api": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
index 3891504e54092..63295a7cebb8f 100644
--- a/app/code/Magento/LoginAsCustomerSales/composer.json
+++ b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -1,21 +1,21 @@
 {
     "name": "magento/module-login-as-customer-sales",
-    "description": "",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-user": "*",
-        "magento/module-login-as-customer-api": "*"
-    },
-    "suggest": {
-        "magento/module-sales": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-user": "101.2.*",
+        "magento/module-login-as-customer-api": "100.4.*"
+    },
+    "suggest": {
+        "magento/module-sales": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 42bbcf151a17b..442825c378948 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-marketplace",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContent/composer.json b/app/code/Magento/MediaContent/composer.json
index 4dc2b3eba0f68..22655d67ab269 100644
--- a/app/code/Magento/MediaContent/composer.json
+++ b/app/code/Magento/MediaContent/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-media-content",
     "description": "Magento module provides the implementation for managing relations between content and media files used in that content",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-content-api": "*",
-        "magento/module-media-gallery-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-media-gallery-api": "101.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentApi/composer.json b/app/code/Magento/MediaContentApi/composer.json
index fd1f2f9a0f265..a89c7e1a56c58 100644
--- a/app/code/Magento/MediaContentApi/composer.json
+++ b/app/code/Magento/MediaContentApi/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-media-content-api",
     "description": "Magento module provides the API interfaces for managing relations between content and media files used in that content",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-media-gallery-api": "*",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
index 2b19bc95f6ed3..c8c82ce54e609 100644
--- a/app/code/Magento/MediaContentCatalog/composer.json
+++ b/app/code/Magento/MediaContentCatalog/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-media-content-catalog",
     "description": "Magento module provides the implementation of MediaContent functionality for Magento_Catalog module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-media-content-api": "*",
-        "magento/module-catalog": "*",
-        "magento/module-eav": "*",
-        "magento/module-store": "*",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
index ea32fdd7a49fa..5ab23bff4aa6e 100644
--- a/app/code/Magento/MediaContentCms/composer.json
+++ b/app/code/Magento/MediaContentCms/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-media-content-cms",
     "description": "Magento module provides the implementation of MediaContent functionality for Magento_Cms module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-media-content-api": "*",
-        "magento/module-cms": "*",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentSynchronization/composer.json b/app/code/Magento/MediaContentSynchronization/composer.json
index 3be5f535487ec..224bd97ecb763 100644
--- a/app/code/Magento/MediaContentSynchronization/composer.json
+++ b/app/code/Magento/MediaContentSynchronization/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-media-content-synchronization",
     "description": "Magento module provides implementation of the media content data synchronization.",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-content-synchronization-api": "*",
-        "magento/framework-message-queue": "*",
-        "magento/module-media-content-api": "*"
-    },
-    "suggest": {
-        "magento/module-media-gallery-synchronization": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-content-synchronization-api": "100.4.*",
+        "magento/framework-message-queue": "100.4.*",
+        "magento/module-media-content-api": "100.4.*"
+    },
+    "suggest": {
+        "magento/module-media-gallery-synchronization": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentSynchronizationApi/composer.json b/app/code/Magento/MediaContentSynchronizationApi/composer.json
index 1f1e5e4b51c5b..37bb04c7ce195 100644
--- a/app/code/Magento/MediaContentSynchronizationApi/composer.json
+++ b/app/code/Magento/MediaContentSynchronizationApi/composer.json
@@ -1,15 +1,16 @@
 {
     "name": "magento/module-media-content-synchronization-api",
     "description": "Magento module responsible for the media content synchronization implementation API",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/composer.json b/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
index 733f29d3a42c2..b4746f335a654 100644
--- a/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-media-content-synchronization-catalog",
     "description": "Magento module provides the implementation of MediaContentSynchronization functionality for Magento_Catalog module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-content-synchronization-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-media-content-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-content-synchronization-api": "100.4.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*",
+        "magento/module-media-content-api": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaContentSynchronizationCms/composer.json b/app/code/Magento/MediaContentSynchronizationCms/composer.json
index 9028b9dacd0a2..1e83d61ae1b8c 100644
--- a/app/code/Magento/MediaContentSynchronizationCms/composer.json
+++ b/app/code/Magento/MediaContentSynchronizationCms/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-media-content-synchronization-cms",
     "description": "Magento module provides the implementation of MediaContentSynchronization functionality for Magento_Cms module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-content-synchronization-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-media-content-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-content-synchronization-api": "100.4.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*",
+        "magento/module-media-content-api": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGallery/composer.json b/app/code/Magento/MediaGallery/composer.json
index d430a174a9738..ff098785c27c6 100644
--- a/app/code/Magento/MediaGallery/composer.json
+++ b/app/code/Magento/MediaGallery/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-media-gallery",
     "description": "Magento module responsible for media handling",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-cms": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-cms": "104.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryApi/composer.json b/app/code/Magento/MediaGalleryApi/composer.json
index 8bea8ee95b55a..d2b6985699c72 100644
--- a/app/code/Magento/MediaGalleryApi/composer.json
+++ b/app/code/Magento/MediaGalleryApi/composer.json
@@ -1,15 +1,16 @@
 {
     "name": "magento/module-media-gallery-api",
     "description": "Magento module responsible for media gallery asset attributes storage and management",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "101.0.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryCatalog/composer.json b/app/code/Magento/MediaGalleryCatalog/composer.json
index 192d86684aa76..c77e76985cc89 100644
--- a/app/code/Magento/MediaGalleryCatalog/composer.json
+++ b/app/code/Magento/MediaGalleryCatalog/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-media-gallery-catalog",
     "description": "Magento module responsible for catalog gallery processor delete operation handling",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-catalog": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-catalog": "104.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/composer.json b/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
index efabb70da9f39..80e8d398a0086 100644
--- a/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-media-gallery-catalog-integration",
     "description": "Magento module responsible for extending catalog image uploader functionality",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-media-gallery-ui-api": "*"
-    },
-    "suggest": {
-        "magento/module-catalog": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*",
+        "magento/module-media-gallery-ui-api": "100.4.*"
+    },
+    "suggest": {
+        "magento/module-catalog": "104.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryCatalogUi/composer.json b/app/code/Magento/MediaGalleryCatalogUi/composer.json
index 985d581beff25..2299ec3079b35 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/composer.json
+++ b/app/code/Magento/MediaGalleryCatalogUi/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-media-gallery-catalog-ui",
     "description": "Magento module that implement category grid for media gallery.",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryCmsUi/composer.json b/app/code/Magento/MediaGalleryCmsUi/composer.json
index 1ecfb9a3c8855..f45a802a86e00 100644
--- a/app/code/Magento/MediaGalleryCmsUi/composer.json
+++ b/app/code/Magento/MediaGalleryCmsUi/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-media-gallery-cms-ui",
     "description": "Cms related UI elements in the magento media gallery",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-cms": "*",
-        "magento/module-backend": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-backend": "102.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryIntegration/composer.json b/app/code/Magento/MediaGalleryIntegration/composer.json
index a9709da81222e..61db48751bd94 100644
--- a/app/code/Magento/MediaGalleryIntegration/composer.json
+++ b/app/code/Magento/MediaGalleryIntegration/composer.json
@@ -1,26 +1,24 @@
 {
     "name": "magento/module-media-gallery-integration",
     "description": "Magento module responsible for integration of enhanced media gallery",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-ui-api": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-ui": "*"
-    },
-    "require-dev": {
-        "magento/module-cms": "*"
-    },
-    "suggest": {
-        "magento/module-catalog": "*",
-        "magento/module-cms": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-ui-api": "100.4.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*",
+        "magento/module-ui": "101.2.*"
+    },
+    "suggest": {
+        "magento/module-catalog": "104.0.*",
+        "magento/module-cms": "104.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -28,5 +26,9 @@
         "psr-4": {
             "Magento\\MediaGalleryIntegration\\": ""
         }
+    },
+    "require-dev": {
+        "magento/module-cms": "*"
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryMetadata/composer.json b/app/code/Magento/MediaGalleryMetadata/composer.json
index c2ce66ce64c36..0c085040ed450 100644
--- a/app/code/Magento/MediaGalleryMetadata/composer.json
+++ b/app/code/Magento/MediaGalleryMetadata/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-media-gallery-metadata",
     "description": "Magento module responsible for images metadata processing",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-metadata-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-metadata-api": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryMetadataApi/composer.json b/app/code/Magento/MediaGalleryMetadataApi/composer.json
index f8673884b050c..9ad2057bf30d9 100644
--- a/app/code/Magento/MediaGalleryMetadataApi/composer.json
+++ b/app/code/Magento/MediaGalleryMetadataApi/composer.json
@@ -1,15 +1,16 @@
 {
     "name": "magento/module-media-gallery-metadata-api",
     "description": "Magento module responsible for media gallery metadata implementation API",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGallerySynchronization/composer.json b/app/code/Magento/MediaGallerySynchronization/composer.json
index f9d642dd02568..cd07f2b07e396 100644
--- a/app/code/Magento/MediaGallerySynchronization/composer.json
+++ b/app/code/Magento/MediaGallerySynchronization/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-media-gallery-synchronization",
     "description": "Magento module provides implementation of the media gallery data synchronization.",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/framework-message-queue": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*",
+        "magento/framework-message-queue": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/composer.json b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
index 19bab75dd5f42..7c07b904301df 100644
--- a/app/code/Magento/MediaGallerySynchronizationApi/composer.json
+++ b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-media-gallery-synchronization-api",
     "description": "Magento module responsible for the media gallery synchronization implementation API",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json b/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
index 0674014026b24..c037034b9f216 100644
--- a/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-media-gallery-synchronization-metadata",
     "description": "Magento module responsible for images metadata synchronization",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-metadata-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-media-gallery-metadata-api": "100.4.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryUi/composer.json b/app/code/Magento/MediaGalleryUi/composer.json
index f4701306eb369..a2257294ac44c 100644
--- a/app/code/Magento/MediaGalleryUi/composer.json
+++ b/app/code/Magento/MediaGalleryUi/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-media-gallery-ui",
     "description": "Magento module responsible for the media gallery UI implementation",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-ui": "*",
-        "magento/module-store": "*",
-        "magento/module-media-gallery-ui-api": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-metadata-api": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-media-content-api": "*",
-        "magento/module-cms": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-media-gallery-ui-api": "100.4.*",
+        "magento/module-media-gallery-api": "101.0.*",
+        "magento/module-media-gallery-metadata-api": "100.4.*",
+        "magento/module-media-gallery-synchronization-api": "100.4.*",
+        "magento/module-media-content-api": "100.4.*",
+        "magento/module-cms": "104.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaGalleryUiApi/composer.json b/app/code/Magento/MediaGalleryUiApi/composer.json
index f8d5ef11058c1..3d35e4e8adf2c 100644
--- a/app/code/Magento/MediaGalleryUiApi/composer.json
+++ b/app/code/Magento/MediaGalleryUiApi/composer.json
@@ -1,15 +1,16 @@
 {
     "name": "magento/module-media-gallery-ui-api",
     "description": "Magento module responsible for the media gallery UI implementation API",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -19,3 +20,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index cb1057febb23e..f82969d6a90d3 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -1,26 +1,27 @@
 {
     "name": "magento/module-media-storage",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/framework-bulk": "*",
-        "magento/module-backend": "*",
-        "magento/module-config": "*",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-theme": "*",
-        "magento/module-asynchronous-operations": "*",
-        "magento/module-authorization": "*"
+        "magento/framework": "103.0.*",
+        "magento/framework-bulk": "101.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-asynchronous-operations": "100.4.*",
+        "magento/module-authorization": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
index 57603f0a73acc..994288c14f5c9 100644
--- a/app/code/Magento/MessageQueue/composer.json
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -1,20 +1,21 @@
 {
     "name": "magento/module-message-queue",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
-        "magento/framework": "*",
-        "magento/framework-message-queue": "*",
+        "magento/framework": "103.0.*",
+        "magento/framework-message-queue": "100.4.*",
         "magento/magento-composer-installer": "*",
         "php": "~7.3.0||~7.4.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 5c9d2e4cf58fa..29f328a219ac1 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-msrp",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-eav": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-downloadable": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*"
     },
     "suggest": {
-        "magento/module-bundle": "*",
-        "magento/module-msrp-sample-data": "*"
+        "magento/module-bundle": "101.0.*",
+        "magento/module-msrp-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
index 53d274a3c4006..352971f7772dc 100644
--- a/app/code/Magento/MsrpConfigurableProduct/composer.json
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-msrp-configurable-product",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-msrp": "*",
-        "magento/module-configurable-product": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-msrp": "100.4.*",
+        "magento/module-configurable-product": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
index 5c426b5910ad7..b77c21b583595 100644
--- a/app/code/Magento/MsrpGroupedProduct/composer.json
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-msrp-grouped-product",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-msrp": "*",
-        "magento/module-grouped-product": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-msrp": "100.4.*",
+        "magento/module-grouped-product": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 8834603562332..77ff7f8fdec33 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -1,28 +1,29 @@
 {
     "name": "magento/module-multishipping",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-captcha": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-captcha": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,3 +33,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
index 225b3a091a462..508adbcf69acc 100644
--- a/app/code/Magento/MysqlMq/composer.json
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-mysql-mq",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*",
-        "magento/framework-message-queue": "*",
+        "magento/framework": "103.0.*",
+        "magento/framework-message-queue": "100.4.*",
         "magento/magento-composer-installer": "*",
-        "magento/module-store": "*",
+        "magento/module-store": "101.1.*",
         "php": "~7.3.0||~7.4.0"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index ca4c72d5a3aad..c098476a0af20 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-new-relic-reporting",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "magento/magento-composer-installer": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-configurable-product": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-configurable-product": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 790370c328644..3ef7c63be0459 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-newsletter",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-cms": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-email": "*",
-        "magento/module-require-js": "*",
-        "magento/module-store": "*",
-        "magento/module-widget": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-email": "101.1.*",
+        "magento/module-require-js": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/NewsletterGraphQl/composer.json b/app/code/Magento/NewsletterGraphQl/composer.json
index 92352a8a9adfe..e55f7915448bb 100644
--- a/app/code/Magento/NewsletterGraphQl/composer.json
+++ b/app/code/Magento/NewsletterGraphQl/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-newsletter-graph-ql",
     "description": "Provides GraphQl functionality for the newsletter subscriptions.",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
-    "type": "magento2-module",
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-customer": "*",
-        "magento/module-newsletter": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-newsletter": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 56c7eb2778c48..3b88c1161e932 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-offline-payments",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-payment": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-payment": "100.4.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 7cd6f05f8ad1c..00e5e2deedc31 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -1,31 +1,32 @@
 {
     "name": "magento/module-offline-shipping",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-rule": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-sales-rule": "101.2.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-checkout": "*",
-        "magento/module-offline-shipping-sample-data": "*"
+        "magento/module-checkout": "100.4.*",
+        "magento/module-offline-shipping-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,3 +36,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 506fd54886d92..991f2967e0fc9 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-page-cache",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-config": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 72246c5698f80..37df1e5c84606 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-payment",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 1b35fae2de1bc..e71f4eee3450c 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -1,38 +1,39 @@
 {
     "name": "magento/module-paypal",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-instant-purchase": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-vault": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-instant-purchase": "100.4.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-vault": "101.2.*"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "*"
+        "magento/module-checkout-agreements": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,3 +43,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
index b88eb2f1a552e..bedfad57a4090 100644
--- a/app/code/Magento/PaypalCaptcha/composer.json
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-paypal-captcha",
     "description": "Provides CAPTCHA validation for PayPal Payflow Pro",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-captcha": "*",
-        "magento/module-checkout": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-captcha": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-paypal": "*"
+        "magento/module-paypal": "101.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 285217da64d72..00d549a1f86ee 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -1,30 +1,31 @@
 {
     "name": "magento/module-paypal-graph-ql",
     "description": "GraphQl support for Paypal",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*",
-        "magento/module-checkout": "*",
-        "magento/module-paypal": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/module-sales": "*",
-        "magento/module-payment": "*",
-        "magento/module-store": "*",
-        "magento/module-vault": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-paypal": "101.0.*",
+        "magento/module-quote-graph-ql": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-vault": "101.2.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*",
-        "magento/module-store-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-store-graph-ql": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,3 +35,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 68fe5cb47c00e..5a260afc1947e 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-persistent",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-cron": "*",
-        "magento/module-customer": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-quote": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-cron": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index bfe2a43b373ce..69753d3edaf70 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -1,26 +1,27 @@
 {
     "name": "magento/module-product-alert",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index b7268338398a7..38c1e2aa09fc0 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -1,28 +1,29 @@
 {
     "name": "magento/module-product-video",
     "description": "Add Video to Products",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "magento/magento-composer-installer": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-eav": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*"
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-customer": "*",
-        "magento/module-config": "*"
+        "magento/module-customer": "103.0.*",
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,3 +33,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index 31312fae26e78..fa7f2430f1c2e 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -1,35 +1,36 @@
 {
     "name": "magento/module-quote",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-payment": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-sequence": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-sales-sequence": "100.4.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*"
     },
     "suggest": {
-        "magento/module-webapi": "*"
+        "magento/module-webapi": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -39,3 +40,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 4bfb7172c4c83..19e70e0326d57 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-quote-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*",
-        "magento/module-analytics": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-analytics": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/QuoteBundleOptions/composer.json b/app/code/Magento/QuoteBundleOptions/composer.json
index a2651272018a8..2d6cd95f82761 100644
--- a/app/code/Magento/QuoteBundleOptions/composer.json
+++ b/app/code/Magento/QuoteBundleOptions/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-quote-bundle-options",
     "description": "Magento module provides data provider for creating buy request for bundle products",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/QuoteConfigurableOptions/composer.json b/app/code/Magento/QuoteConfigurableOptions/composer.json
index 51d6933d5c6d6..0411ce38850c3 100644
--- a/app/code/Magento/QuoteConfigurableOptions/composer.json
+++ b/app/code/Magento/QuoteConfigurableOptions/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-quote-configurable-options",
     "description": "Magento module provides data provider for creating buy request for configurable products",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/QuoteDownloadableLinks/composer.json b/app/code/Magento/QuoteDownloadableLinks/composer.json
index ad120dea96263..a098f1c196fd1 100644
--- a/app/code/Magento/QuoteDownloadableLinks/composer.json
+++ b/app/code/Magento/QuoteDownloadableLinks/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-quote-downloadable-links",
     "description": "Magento module provides data provider for creating buy request for links of downloadable products",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 25f089cf75a62..9327504d78941 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -2,27 +2,28 @@
     "name": "magento/module-quote-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-quote": "*",
-        "magento/module-checkout": "*",
-        "magento/module-catalog": "*",
-        "magento/module-store": "*",
-        "magento/module-customer": "*",
-        "magento/module-customer-graph-ql": "*",
-        "magento/module-sales": "*",
-        "magento/module-directory": "*",
-        "magento/module-graph-ql": "*",
-        "magento/module-gift-message": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-customer-graph-ql": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-gift-message": "100.4.*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "*"
+        "magento/module-graph-ql-cache": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,3 +33,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/RelatedProductGraphQl/composer.json b/app/code/Magento/RelatedProductGraphQl/composer.json
index 2cb851d56e58e..5b2fa809ef789 100644
--- a/app/code/Magento/RelatedProductGraphQl/composer.json
+++ b/app/code/Magento/RelatedProductGraphQl/composer.json
@@ -2,19 +2,20 @@
     "name": "magento/module-related-product-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/framework": "*"
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,3 +25,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index c2e347bc66ef0..d59f25a07b456 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-release-notification",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-user": "*",
-        "magento/module-backend": "*",
-        "magento/module-ui": "*",
-        "magento/framework": "*"
-    },
-    "suggest": {
-        "magento/module-config": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-user": "101.2.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-ui": "101.2.*",
+        "magento/framework": "103.0.*"
+    },
+    "suggest": {
+        "magento/module-config": "101.2.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index f1fe6c1e2c83a..1560ed99b6971 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -1,34 +1,35 @@
 {
     "name": "magento/module-reports",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-cms": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-eav": "*",
-        "magento/module-quote": "*",
-        "magento/module-review": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-rule": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-widget": "*",
-        "magento/module-wishlist": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-downloadable": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-review": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-sales-rule": "101.2.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-wishlist": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -38,3 +39,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 9c3b84e88df53..9835ed7a6d9d9 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-require-js",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 5a428ae15fd67..530828348fe3d 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -1,30 +1,31 @@
 {
     "name": "magento/module-review",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-newsletter": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-newsletter": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-cookie": "*",
-        "magento/module-review-sample-data": "*"
+        "magento/module-cookie": "100.4.*",
+        "magento/module-review-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,3 +35,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index d18ec43a93ac1..04f8f7b96deb4 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-review-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-review": "*",
-        "magento/module-analytics": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-review": "100.4.*",
+        "magento/module-analytics": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ReviewGraphQl/composer.json b/app/code/Magento/ReviewGraphQl/composer.json
index 819ddefd76213..9bb3d32aa62b5 100644
--- a/app/code/Magento/ReviewGraphQl/composer.json
+++ b/app/code/Magento/ReviewGraphQl/composer.json
@@ -2,21 +2,22 @@
     "name": "magento/module-review-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "*",
-        "magento/module-review": "*",
-        "magento/module-store": "*",
-        "magento/framework": "*"
+        "magento/module-catalog": "104.0.*",
+        "magento/module-review": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*",
-        "magento/module-graph-ql-cache": "*"
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-graph-ql-cache": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index 2035010b0ce8b..486a817d02118 100644
--- a/app/code/Magento/Robots/composer.json
+++ b/app/code/Magento/Robots/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-robots",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.1.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-theme": "*"
+        "magento/module-theme": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index bd845acc12f9a..26493fdcd774d 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-rss",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 0ab2b6780dcad..882c7a7660bda 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-rule",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-eav": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index 411ad3739d560..12f4188747357 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -1,45 +1,46 @@
 {
     "name": "magento/module-sales",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "103.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-bundle": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-gift-message": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-reports": "*",
-        "magento/module-sales-rule": "*",
-        "magento/module-sales-sequence": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-widget": "*",
-        "magento/module-wishlist": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-bundle": "101.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-gift-message": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-reports": "100.4.*",
+        "magento/module-sales-rule": "101.2.*",
+        "magento/module-sales-sequence": "100.4.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-wishlist": "101.2.*"
     },
     "suggest": {
-        "magento/module-sales-sample-data": "*"
+        "magento/module-sales-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -49,3 +50,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index ca7926f2d8b5a..5e57e330c1c5f 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-sales-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-sales": "*",
-        "magento/module-analytics": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-analytics": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index b85d8c0f852da..1d7cf3da05685 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -2,21 +2,22 @@
     "name": "magento/module-sales-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-catalog": "*",
-        "magento/module-tax": "*",
-        "magento/module-quote": "*",
-        "magento/module-graph-ql": "*",
-        "magento/module-shipping": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-graph-ql": "100.4.*",
+        "magento/module-shipping": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index 6a91b04a7c0d9..fbf4820f4d110 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-sales-inventory",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 572e191093275..65fd55a2b3806 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -1,40 +1,41 @@
 {
     "name": "magento/module-sales-rule",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-rule": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-reports": "*",
-        "magento/module-rule": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-widget": "*",
-        "magento/module-captcha": "*",
-        "magento/module-checkout": "*",
-        "magento/module-authorization": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-rule": "101.2.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-reports": "100.4.*",
+        "magento/module-rule": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-captcha": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-authorization": "100.4.*"
     },
     "suggest": {
-        "magento/module-sales-rule-sample-data": "*"
+        "magento/module-sales-rule-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -44,3 +45,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index a0f9cb45cafc8..a39c350628c8a 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-sales-sequence",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 30efc94bc9274..baa802aa8753c 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-sample-data",
     "description": "Sample Data fixtures",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/sample-data-media": "*"
+        "magento/sample-data-media": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "cli_commands.php",
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 3df1dc5935ad8..945a016262d2b 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-search",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog-search": "*",
-        "magento/module-reports": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog-search": "102.0.*",
+        "magento/module-reports": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index 4978f0c628f96..6b3ac2c37ef29 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-security",
     "description": "Security management module",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-store": "*",
-        "magento/module-user": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-user": "101.2.*"
     },
     "suggest": {
-        "magento/module-customer": "*"
+        "magento/module-customer": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index 17c908ab33e3e..cf8ef2f923eb3 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -1,24 +1,25 @@
 {
     "name": "magento/module-send-friend",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-customer": "*",
-        "magento/module-store": "*",
-        "magento/module-captcha": "*",
-        "magento/module-authorization": "*",
-        "magento/module-theme": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-captcha": "100.4.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-theme": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SendFriendGraphQl/composer.json b/app/code/Magento/SendFriendGraphQl/composer.json
index 456780c1c1841..b0ce37458b1c5 100644
--- a/app/code/Magento/SendFriendGraphQl/composer.json
+++ b/app/code/Magento/SendFriendGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-send-friend-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-send-friend": "*",
-        "magento/module-graph-ql": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-send-friend": "100.4.*",
+        "magento/module-graph-ql": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 5ea8430226ad8..ca9c0486b25df 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -1,37 +1,38 @@
 {
     "name": "magento/module-shipping",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-gd": "*",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-contact": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-ui": "*",
-        "magento/module-user": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-contact": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-user": "101.2.*"
     },
     "suggest": {
-        "magento/module-fedex": "*",
-        "magento/module-ups": "*",
-        "magento/module-config": "*"
+        "magento/module-fedex": "100.4.*",
+        "magento/module-ups": "100.4.*",
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -41,3 +42,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 6a9f20ac8bddf..64ab7b60e17ab 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -1,30 +1,31 @@
 {
     "name": "magento/module-sitemap",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-url-rewrite": "*",
-        "magento/module-cms": "*",
-        "magento/module-config": "*",
-        "magento/module-eav": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-robots": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-url-rewrite": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-robots": "101.1.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,3 +35,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index e6f7f0d5ac274..870a77578672b 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -1,29 +1,30 @@
 {
     "name": "magento/module-store",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-ui": "*",
-        "magento/module-customer": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*"
     },
     "suggest": {
-        "magento/module-deploy": "*"
+        "magento/module-deploy": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,3 +34,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
index a7cab5851a9ee..42023b2403e91 100644
--- a/app/code/Magento/StoreGraphQl/composer.json
+++ b/app/code/Magento/StoreGraphQl/composer.json
@@ -2,16 +2,17 @@
     "name": "magento/module-store-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-graph-ql": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-graph-ql": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index 759e72350b0a6..2cffb5d716d54 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-swagger",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
index 78021f7cb4ec5..09c078448232d 100644
--- a/app/code/Magento/SwaggerWebapi/composer.json
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-swagger-webapi",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-swagger": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-swagger": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json
index 283b2fe1f1758..d42e387499e8a 100644
--- a/app/code/Magento/SwaggerWebapiAsync/composer.json
+++ b/app/code/Magento/SwaggerWebapiAsync/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-swagger-webapi-async",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-swagger": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-swagger": "100.4.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 2c9b7a03ba011..4198e66b8f06a 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -1,32 +1,33 @@
 {
     "name": "magento/module-swatches",
     "description": "Add Swatches to Products",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-config": "*",
-        "magento/module-configurable-product": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-configurable-product": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*"
     },
     "suggest": {
-        "magento/module-layered-navigation": "*",
-        "magento/module-swatches-sample-data": "*"
+        "magento/module-layered-navigation": "100.4.*",
+        "magento/module-swatches-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -36,3 +37,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json
index 1b98b4044a2ff..87d6ff61e5fe2 100644
--- a/app/code/Magento/SwatchesGraphQl/composer.json
+++ b/app/code/Magento/SwatchesGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-swatches-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-swatches": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-graph-ql": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-swatches": "100.4.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index 3b987f8096f18..f0f794db094f2 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-swatches-layered-navigation",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "magento/magento-composer-installer": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 2fe0597c85a63..1b43e4c5ac6fd 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -1,35 +1,36 @@
 {
     "name": "magento/module-tax",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-checkout": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-quote": "*",
-        "magento/module-reports": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-reports": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-tax-sample-data": "*"
+        "magento/module-tax-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -39,3 +40,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/TaxGraphQl/composer.json b/app/code/Magento/TaxGraphQl/composer.json
index b97e414cacb67..0b4805fe24493 100644
--- a/app/code/Magento/TaxGraphQl/composer.json
+++ b/app/code/Magento/TaxGraphQl/composer.json
@@ -2,18 +2,19 @@
     "name": "magento/module-tax-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-tax": "*",
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-tax": "100.4.*",
+        "magento/module-catalog-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 01c069b4299c1..0d4ea14db838f 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -1,23 +1,24 @@
 {
     "name": "magento/module-tax-import-export",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-directory": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,3 +28,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 63779c6f9bf5d..97e1664ed563e 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -1,33 +1,34 @@
 {
     "name": "magento/module-theme",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-cms": "*",
-        "magento/module-config": "*",
-        "magento/module-customer": "*",
-        "magento/module-eav": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-require-js": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*",
-        "magento/module-widget": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-media-storage": "100.4.*",
+        "magento/module-require-js": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-widget": "101.2.*"
     },
     "suggest": {
-        "magento/module-theme-sample-data": "*",
-        "magento/module-deploy": "*",
-        "magento/module-directory": "*"
+        "magento/module-theme-sample-data": "Sample Data version: 100.4.*",
+        "magento/module-deploy": "100.4.*",
+        "magento/module-directory": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -37,3 +38,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/ThemeGraphQl/composer.json b/app/code/Magento/ThemeGraphQl/composer.json
index cee740d449b37..d2308d43f1670 100644
--- a/app/code/Magento/ThemeGraphQl/composer.json
+++ b/app/code/Magento/ThemeGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-theme-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
     "suggest": {
-        "magento/module-store-graph-ql": "*"
+        "magento/module-store-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json
index 0b8cf6824295e..b5ab9f5d6b680 100644
--- a/app/code/Magento/Tinymce3/composer.json
+++ b/app/code/Magento/Tinymce3/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-tinymce-3",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-ui": "*",
-        "magento/module-variable": "*",
-        "magento/module-widget": "*"
-    },
-    "suggest": {
-        "magento/module-cms": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-variable": "100.4.*",
+        "magento/module-widget": "101.2.*"
+    },
+    "suggest": {
+        "magento/module-cms": "104.0.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 7f67749fa88f4..7813065f14141 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-translation",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-developer": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-developer": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*"
     },
     "suggest": {
-        "magento/module-deploy": "*"
+        "magento/module-deploy": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index b4aeda0fc1e6a..b856a805b1010 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -1,26 +1,27 @@
 {
     "name": "magento/module-ui",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-eav": "*",
-        "magento/module-store": "*",
-        "magento/module-user": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-user": "101.2.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index fa8962f0af592..1115802f21fa6 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -1,28 +1,29 @@
 {
     "name": "magento/module-ups",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-directory": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-config": "*"
+        "magento/module-config": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,3 +33,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 44ca51e8bcbe2..9e1146fa7fe44 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-url-rewrite",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "102.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-url-rewrite": "*",
-        "magento/module-cms": "*",
-        "magento/module-cms-url-rewrite": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-url-rewrite": "100.4.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-cms-url-rewrite": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json
index 766ad3ab46ebd..15b97a44941cb 100644
--- a/app/code/Magento/UrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/UrlRewriteGraphQl/composer.json
@@ -2,18 +2,19 @@
     "name": "magento/module-url-rewrite-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-url-rewrite": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-url-rewrite": "102.0.*"
     },
     "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 6ba4be749cc7c..9242b5461d5df 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-user",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-email": "*",
-        "magento/module-integration": "*",
-        "magento/module-security": "*",
-        "magento/module-store": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-email": "101.1.*",
+        "magento/module-integration": "100.4.*",
+        "magento/module-security": "100.4.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 3d5c0669c679d..8648000e4b08e 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -1,27 +1,28 @@
 {
     "name": "magento/module-usps",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-config": "*",
-        "magento/module-directory": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-shipping": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-shipping": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,3 +32,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index e6eed40a814db..52231c86a49ca 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -1,22 +1,23 @@
 {
     "name": "magento/module-variable",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-store": "*",
-        "magento/module-config": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-ui": "101.2.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,3 +27,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index 31d5ceb906246..7dacdfe0d6e26 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -1,25 +1,25 @@
 {
     "name": "magento/module-vault",
-    "description": "",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-payment": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-payment": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +29,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/VaultGraphQl/composer.json b/app/code/Magento/VaultGraphQl/composer.json
index aff9a700fbcad..9e7832c8ee184 100644
--- a/app/code/Magento/VaultGraphQl/composer.json
+++ b/app/code/Magento/VaultGraphQl/composer.json
@@ -2,16 +2,17 @@
     "name": "magento/module-vault-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-vault": "*",
-        "magento/module-graph-ql": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-vault": "101.2.*",
+        "magento/module-graph-ql": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index d2b2127446c21..d1a9f535b7c2d 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -1,18 +1,19 @@
 {
     "name": "magento/module-version",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 11382cc318554..0313c903d367a 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -1,26 +1,27 @@
 {
     "name": "magento/module-webapi",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-authorization": "*",
-        "magento/module-backend": "*",
-        "magento/module-integration": "*",
-        "magento/module-store": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-authorization": "100.4.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-integration": "100.4.*",
+        "magento/module-store": "101.1.*"
     },
     "suggest": {
-        "magento/module-user": "*",
-        "magento/module-customer": "*"
+        "magento/module-user": "101.2.*",
+        "magento/module-customer": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,3 +31,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/WebapiAsync/composer.json b/app/code/Magento/WebapiAsync/composer.json
index e0c6a96f1ffe6..715dd1e0be707 100644
--- a/app/code/Magento/WebapiAsync/composer.json
+++ b/app/code/Magento/WebapiAsync/composer.json
@@ -1,25 +1,26 @@
 {
     "name": "magento/module-webapi-async",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/framework-message-queue": "*",
-        "magento/module-webapi": "*",
-        "magento/module-asynchronous-operations": "*"
+        "magento/framework": "103.0.*",
+        "magento/framework-message-queue": "100.4.*",
+        "magento/module-webapi": "100.4.*",
+        "magento/module-asynchronous-operations": "100.4.*"
     },
     "suggest": {
-        "magento/module-user": "*",
-        "magento/module-customer": "*"
+        "magento/module-user": "101.2.*",
+        "magento/module-customer": "103.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,3 +30,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index 5b48ed8644709..adcbf01fe212b 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -1,19 +1,20 @@
 {
     "name": "magento/module-webapi-security",
     "description": "WebapiSecurity module provides option to loosen security on some webapi resources.",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-webapi": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-webapi": "100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,3 +24,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index 7024de0f595c7..f7da07b15fe74 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -1,33 +1,34 @@
 {
     "name": "magento/module-weee",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-directory": "*",
-        "magento/module-eav": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-quote": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-page-cache": "100.4.*",
+        "magento/module-quote": "101.2.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-bundle": "*"
+        "magento/module-bundle": "101.0.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -37,3 +38,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/WeeeGraphQl/composer.json b/app/code/Magento/WeeeGraphQl/composer.json
index be7e50ab2fca1..9355b5a196ae7 100644
--- a/app/code/Magento/WeeeGraphQl/composer.json
+++ b/app/code/Magento/WeeeGraphQl/composer.json
@@ -2,20 +2,21 @@
     "name": "magento/module-weee-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-store": "*",
-        "magento/module-tax": "*",
-        "magento/module-weee": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-tax": "100.4.*",
+        "magento/module-weee": "100.4.*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "*"
+        "magento/module-catalog-graph-ql": "100.4.*"
     },
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 2cf8429095ce7..9785dcb9099f8 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -1,28 +1,29 @@
 {
     "name": "magento/module-widget",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-cms": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*",
-        "magento/module-variable": "*",
-        "magento/module-ui": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-variable": "100.4.*",
+        "magento/module-ui": "101.2.*"
     },
     "suggest": {
-        "magento/module-widget-sample-data": "*"
+        "magento/module-widget-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,3 +33,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index b426ffe01cecc..c08de372b366f 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -1,37 +1,38 @@
 {
     "name": "magento/module-wishlist",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-backend": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-checkout": "*",
-        "magento/module-customer": "*",
-        "magento/module-rss": "*",
-        "magento/module-sales": "*",
-        "magento/module-store": "*",
-        "magento/module-theme": "*",
-        "magento/module-ui": "*",
-        "magento/module-captcha": "*"
+        "magento/framework": "103.0.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-checkout": "100.4.*",
+        "magento/module-customer": "103.0.*",
+        "magento/module-rss": "100.4.*",
+        "magento/module-sales": "103.0.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-captcha": "100.4.*"
     },
     "suggest": {
-        "magento/module-configurable-product": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-bundle": "*",
-        "magento/module-cookie": "*",
-        "magento/module-grouped-product": "*",
-        "magento/module-wishlist-sample-data": "*"
+        "magento/module-configurable-product": "100.4.*",
+        "magento/module-downloadable": "100.4.*",
+        "magento/module-bundle": "101.0.*",
+        "magento/module-cookie": "100.4.*",
+        "magento/module-grouped-product": "100.4.*",
+        "magento/module-wishlist-sample-data": "Sample Data version: 100.4.*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -41,3 +42,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 309257f857ed2..91ad9baeecb37 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -1,17 +1,18 @@
 {
     "name": "magento/module-wishlist-analytics",
     "description": "N/A",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-analytics": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.0",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-wishlist": "101.2.*",
+        "magento/module-analytics": "100.4.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,3 +22,4 @@
         }
     }
 }
+
diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
index 7a3fca599a4b3..85cac3bb4b0a1 100644
--- a/app/code/Magento/WishlistGraphQl/composer.json
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -2,17 +2,18 @@
     "name": "magento/module-wishlist-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-store": "*"
-    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "100.4.1",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "103.0.*",
+        "magento/module-catalog-graph-ql": "100.4.*",
+        "magento/module-wishlist": "101.2.*",
+        "magento/module-store": "101.1.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,3 +23,4 @@
         }
     }
 }
+
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index 249441be1753e..daeffa56c2a62 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -1,21 +1,23 @@
 {
     "name": "magento/theme-adminhtml-backend",
     "description": "N/A",
+    "type": "magento2-theme",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-theme",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 066d0cd1cc9f2..2e39bcf46a49c 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -1,21 +1,23 @@
 {
     "name": "magento/theme-frontend-blank",
     "description": "N/A",
+    "type": "magento2-theme",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-theme",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index 16bed43fe8cbf..e3c39dd579604 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -1,22 +1,24 @@
 {
     "name": "magento/theme-frontend-luma",
     "description": "N/A",
+    "type": "magento2-theme",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/theme-frontend-blank": "*"
+        "magento/framework": "103.0.*",
+        "magento/theme-frontend-blank": "100.4.*"
     },
-    "type": "magento2-theme",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/de_DE/composer.json b/app/i18n/Magento/de_DE/composer.json
index 5a488a3e32c2b..fd23d037ba459 100644
--- a/app/i18n/Magento/de_DE/composer.json
+++ b/app/i18n/Magento/de_DE/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-de_de",
     "description": "German (Germany) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/en_US/composer.json b/app/i18n/Magento/en_US/composer.json
index 1108c70de28a6..194854d58bbe2 100644
--- a/app/i18n/Magento/en_US/composer.json
+++ b/app/i18n/Magento/en_US/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-en_us",
     "description": "English (United States) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/es_ES/composer.json b/app/i18n/Magento/es_ES/composer.json
index 5bc3cb5730adf..0b49475587d54 100644
--- a/app/i18n/Magento/es_ES/composer.json
+++ b/app/i18n/Magento/es_ES/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-es_es",
     "description": "Spanish (Spain) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/fr_FR/composer.json b/app/i18n/Magento/fr_FR/composer.json
index 50c541308673b..ada414e6a7a32 100644
--- a/app/i18n/Magento/fr_FR/composer.json
+++ b/app/i18n/Magento/fr_FR/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-fr_fr",
     "description": "French (France) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/nl_NL/composer.json b/app/i18n/Magento/nl_NL/composer.json
index a182e179d4103..a881eed112ea0 100644
--- a/app/i18n/Magento/nl_NL/composer.json
+++ b/app/i18n/Magento/nl_NL/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-nl_nl",
     "description": "Dutch (Netherlands) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/pt_BR/composer.json b/app/i18n/Magento/pt_BR/composer.json
index 46734cc09b363..6e10bc16f6a79 100644
--- a/app/i18n/Magento/pt_BR/composer.json
+++ b/app/i18n/Magento/pt_BR/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-pt_br",
     "description": "Portuguese (Brazil) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/app/i18n/Magento/zh_Hans_CN/composer.json b/app/i18n/Magento/zh_Hans_CN/composer.json
index ce214ce649f56..8491eced1389f 100644
--- a/app/i18n/Magento/zh_Hans_CN/composer.json
+++ b/app/i18n/Magento/zh_Hans_CN/composer.json
@@ -1,6 +1,7 @@
 {
     "name": "magento/language-zh_hans_cn",
     "description": "Chinese (China) language",
+    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -8,13 +9,14 @@
     "config": {
         "sort-packages": true
     },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*"
+        "magento/framework": "103.0.*"
     },
-    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
+
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
index fc65e37d12ecf..c1a34426fe87e 100644
--- a/lib/internal/Magento/Framework/Amqp/composer.json
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -1,25 +1,27 @@
 {
     "name": "magento/framework-amqp",
     "description": "N/A",
-    "config": {
-        "sort-packages": true
-    },
     "type": "magento2-library",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "config": {
+        "sort-packages": true
+    },
+    "version": "100.4.0",
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~7.3.0||~7.4.0",
         "php-amqplib/php-amqplib": "~2.7.0||~2.10.0"
     },
     "autoload": {
-        "psr-4": {
-            "Magento\\Framework\\Amqp\\": ""
-        },
         "files": [
             "registration.php"
-        ]
+        ],
+        "psr-4": {
+            "Magento\\Framework\\Amqp\\": ""
+        }
     }
 }
+
diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json
index b8e0992182169..aa9dad9589657 100644
--- a/lib/internal/Magento/Framework/Bulk/composer.json
+++ b/lib/internal/Magento/Framework/Bulk/composer.json
@@ -1,24 +1,26 @@
 {
     "name": "magento/framework-bulk",
     "description": "N/A",
-    "config": {
-        "sort-packages": true
-    },
     "type": "magento2-library",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "config": {
+        "sort-packages": true
+    },
+    "version": "101.0.0",
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
-        "psr-4": {
-            "Magento\\Framework\\Bulk\\": ""
-        },
         "files": [
             "registration.php"
-        ]
+        ],
+        "psr-4": {
+            "Magento\\Framework\\Bulk\\": ""
+        }
     }
 }
+
diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json
index 056f1d40c39cf..86119b13adb37 100644
--- a/lib/internal/Magento/Framework/MessageQueue/composer.json
+++ b/lib/internal/Magento/Framework/MessageQueue/composer.json
@@ -1,24 +1,26 @@
 {
     "name": "magento/framework-message-queue",
     "description": "N/A",
-    "config": {
-        "sort-packages": true
-    },
     "type": "magento2-library",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "config": {
+        "sort-packages": true
+    },
+    "version": "100.4.1",
     "require": {
-        "magento/framework": "*",
+        "magento/framework": "103.0.*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
-        "psr-4": {
-            "Magento\\Framework\\MessageQueue\\": ""
-        },
         "files": [
             "registration.php"
-        ]
+        ],
+        "psr-4": {
+            "Magento\\Framework\\MessageQueue\\": ""
+        }
     }
 }
+
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index dfc81189bf544..e33ba5fdfd6b1 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -9,6 +9,7 @@
     "config": {
         "sort-packages": true
     },
+    "version": "103.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-bcmath": "*",
@@ -53,11 +54,12 @@
         "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
     },
     "autoload": {
-        "psr-4": {
-            "Magento\\Framework\\": ""
-        },
         "files": [
             "registration.php"
-        ]
+        ],
+        "psr-4": {
+            "Magento\\Framework\\": ""
+        }
     }
 }
+

From 445b0f1a3d6a91b5da32d311077c2112ef0b1503 Mon Sep 17 00:00:00 2001
From: magento packaging service <magento-comops@adobe.com>
Date: Mon, 12 Oct 2020 20:38:24 +0000
Subject: [PATCH 506/671] Updating root composer files for publication service
 for 2.4.1

---
 composer.json | 514 +++++++++++++++++++++++++-------------------------
 1 file changed, 258 insertions(+), 256 deletions(-)

diff --git a/composer.json b/composer.json
index 1af86e438882c..c90159dd0e380 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,7 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
+    "version": "2.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-bcmath": "*",
@@ -82,6 +83,31 @@
         "webonyx/graphql-php": "^0.13.8",
         "wikimedia/less.php": "~1.8.0"
     },
+    "suggest": {
+        "ext-pcntl": "Need for run processes in parallel mode"
+    },
+    "autoload": {
+        "exclude-from-classmap": [
+            "**/dev/**",
+            "**/update/**",
+            "**/Test/**"
+        ],
+        "files": [
+            "app/etc/NonComposerComponentRegistration.php"
+        ],
+        "psr-0": {
+            "": [
+                "app/code/",
+                "generated/code/"
+            ]
+        },
+        "psr-4": {
+            "Magento\\": "app/code/Magento/",
+            "Magento\\Framework\\": "lib/internal/Magento/Framework/",
+            "Magento\\Setup\\": "setup/src/Magento/Setup/",
+            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
+        }
+    },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
@@ -97,284 +123,260 @@
         "sebastian/phpcpd": "~5.0.0",
         "squizlabs/php_codesniffer": "~3.5.4"
     },
-    "suggest": {
-        "ext-pcntl": "Need for run processes in parallel mode"
+    "conflict": {
+        "gene/bluefoot": "*"
     },
     "replace": {
-        "magento/module-marketplace": "*",
-        "magento/module-admin-analytics": "*",
-        "magento/module-admin-notification": "*",
-        "magento/module-advanced-pricing-import-export": "*",
-        "magento/module-amqp": "*",
-        "magento/module-amqp-store": "*",
-        "magento/module-analytics": "*",
-        "magento/module-asynchronous-operations": "*",
-        "magento/module-authorization": "*",
-        "magento/module-advanced-search": "*",
-        "magento/module-backend": "*",
-        "magento/module-backup": "*",
-        "magento/module-bundle": "*",
-        "magento/module-bundle-graph-ql": "*",
-        "magento/module-bundle-import-export": "*",
-        "magento/module-cache-invalidate": "*",
-        "magento/module-captcha": "*",
-        "magento/module-cardinal-commerce": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-customer-graph-ql": "*",
-        "magento/module-catalog-analytics": "*",
-        "magento/module-catalog-import-export": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-catalog-inventory-graph-ql": "*",
-        "magento/module-catalog-rule": "*",
-        "magento/module-catalog-rule-graph-ql": "*",
-        "magento/module-catalog-rule-configurable": "*",
-        "magento/module-catalog-search": "*",
-        "magento/module-catalog-url-rewrite": "*",
-        "magento/module-catalog-widget": "*",
-        "magento/module-checkout": "*",
-        "magento/module-checkout-agreements": "*",
-        "magento/module-checkout-agreements-graph-ql": "*",
-        "magento/module-cms": "*",
-        "magento/module-cms-url-rewrite": "*",
-        "magento/module-config": "*",
-        "magento/module-configurable-import-export": "*",
-        "magento/module-configurable-product": "*",
-        "magento/module-configurable-product-sales": "*",
-        "magento/module-contact": "*",
-        "magento/module-cookie": "*",
-        "magento/module-cron": "*",
-        "magento/module-currency-symbol": "*",
-        "magento/module-customer": "*",
-        "magento/module-customer-analytics": "*",
-        "magento/module-customer-downloadable-graph-ql": "*",
-        "magento/module-customer-import-export": "*",
-        "magento/module-deploy": "*",
-        "magento/module-developer": "*",
-        "magento/module-dhl": "*",
-        "magento/module-directory": "*",
-        "magento/module-directory-graph-ql": "*",
-        "magento/module-downloadable": "*",
-        "magento/module-downloadable-graph-ql": "*",
-        "magento/module-downloadable-import-export": "*",
-        "magento/module-eav": "*",
-        "magento/module-elasticsearch": "*",
-        "magento/module-elasticsearch-6": "*",
-        "magento/module-elasticsearch-7": "*",
-        "magento/module-email": "*",
-        "magento/module-encryption-key": "*",
-        "magento/module-fedex": "*",
-        "magento/module-gift-message": "*",
-        "magento/module-gift-message-graph-ql": "*",
-        "magento/module-google-adwords": "*",
-        "magento/module-google-analytics": "*",
-        "magento/module-google-optimizer": "*",
-        "magento/module-graph-ql": "*",
-        "magento/module-graph-ql-cache": "*",
-        "magento/module-catalog-graph-ql": "*",
-        "magento/module-catalog-cms-graph-ql": "*",
-        "magento/module-catalog-url-rewrite-graph-ql": "*",
-        "magento/module-configurable-product-graph-ql": "*",
-        "magento/module-customer-graph-ql": "*",
-        "magento/module-eav-graph-ql": "*",
-        "magento/module-swatches-graph-ql": "*",
-        "magento/module-tax-graph-ql": "*",
-        "magento/module-url-rewrite-graph-ql": "*",
-        "magento/module-cms-url-rewrite-graph-ql": "*",
-        "magento/module-weee-graph-ql": "*",
-        "magento/module-cms-graph-ql": "*",
-        "magento/module-grouped-import-export": "*",
-        "magento/module-grouped-product": "*",
-        "magento/module-grouped-catalog-inventory": "*",
-        "magento/module-grouped-product-graph-ql": "*",
-        "magento/module-import-export": "*",
-        "magento/module-indexer": "*",
-        "magento/module-instant-purchase": "*",
-        "magento/module-integration": "*",
-        "magento/module-layered-navigation": "*",
-        "magento/module-login-as-customer": "*",
-        "magento/module-login-as-customer-admin-ui": "*",
-        "magento/module-login-as-customer-api": "*",
-        "magento/module-login-as-customer-assistance": "*",
-        "magento/module-login-as-customer-frontend-ui": "*",
-        "magento/module-login-as-customer-log": "*",
-        "magento/module-login-as-customer-quote": "*",
-        "magento/module-login-as-customer-page-cache": "*",
-        "magento/module-login-as-customer-sales": "*",
-        "magento/module-media-content": "*",
-        "magento/module-media-content-api": "*",
-        "magento/module-media-content-catalog": "*",
-        "magento/module-media-content-cms": "*",
-        "magento/module-media-gallery": "*",
-        "magento/module-media-gallery-api": "*",
-        "magento/module-media-gallery-ui": "*",
-        "magento/module-media-gallery-ui-api": "*",
-        "magento/module-media-gallery-integration": "*",
-        "magento/module-media-gallery-synchronization": "*",
-        "magento/module-media-gallery-synchronization-api": "*",
-        "magento/module-media-content-synchronization": "*",
-        "magento/module-media-content-synchronization-api": "*",
-        "magento/module-media-content-synchronization-catalog": "*",
-        "magento/module-media-content-synchronization-cms": "*",
-        "magento/module-media-gallery-synchronization-metadata": "*",
-        "magento/module-media-gallery-metadata": "*",
-        "magento/module-media-gallery-metadata-api": "*",
-        "magento/module-media-gallery-catalog-ui": "*",
-        "magento/module-media-gallery-cms-ui": "*",
-        "magento/module-media-gallery-catalog-integration": "*",
-        "magento/module-media-gallery-catalog": "*",
-        "magento/module-media-storage": "*",
-        "magento/module-message-queue": "*",
-        "magento/module-msrp": "*",
-        "magento/module-msrp-configurable-product": "*",
-        "magento/module-msrp-grouped-product": "*",
-        "magento/module-multishipping": "*",
-        "magento/module-mysql-mq": "*",
-        "magento/module-new-relic-reporting": "*",
-        "magento/module-newsletter": "*",
-        "magento/module-newsletter-graph-ql": "*",
-        "magento/module-offline-payments": "*",
-        "magento/module-offline-shipping": "*",
-        "magento/module-page-cache": "*",
-        "magento/module-payment": "*",
-        "magento/module-paypal": "*",
-        "magento/module-paypal-captcha": "*",
-        "magento/module-paypal-graph-ql": "*",
-        "magento/module-persistent": "*",
-        "magento/module-product-alert": "*",
-        "magento/module-product-video": "*",
-        "magento/module-quote": "*",
-        "magento/module-quote-analytics": "*",
-        "magento/module-quote-bundle-options": "*",
-        "magento/module-quote-configurable-options": "*",
-        "magento/module-quote-downloadable-links": "*",
-        "magento/module-quote-graph-ql": "*",
-        "magento/module-related-product-graph-ql": "*",
-        "magento/module-release-notification": "*",
-        "magento/module-reports": "*",
-        "magento/module-require-js": "*",
-        "magento/module-review": "*",
-        "magento/module-review-graph-ql": "*",
-        "magento/module-review-analytics": "*",
-        "magento/module-robots": "*",
-        "magento/module-rss": "*",
-        "magento/module-rule": "*",
-        "magento/module-sales": "*",
-        "magento/module-sales-analytics": "*",
-        "magento/module-sales-graph-ql": "*",
-        "magento/module-sales-inventory": "*",
-        "magento/module-sales-rule": "*",
-        "magento/module-sales-sequence": "*",
-        "magento/module-sample-data": "*",
-        "magento/module-search": "*",
-        "magento/module-security": "*",
-        "magento/module-send-friend": "*",
-        "magento/module-send-friend-graph-ql": "*",
-        "magento/module-shipping": "*",
-        "magento/module-sitemap": "*",
-        "magento/module-store": "*",
-        "magento/module-store-graph-ql": "*",
-        "magento/module-swagger": "*",
-        "magento/module-swagger-webapi": "*",
-        "magento/module-swagger-webapi-async": "*",
-        "magento/module-swatches": "*",
-        "magento/module-swatches-layered-navigation": "*",
-        "magento/module-tax": "*",
-        "magento/module-tax-import-export": "*",
-        "magento/module-theme": "*",
-        "magento/module-theme-graph-ql": "*",
-        "magento/module-translation": "*",
-        "magento/module-ui": "*",
-        "magento/module-ups": "*",
-        "magento/module-url-rewrite": "*",
-        "magento/module-user": "*",
-        "magento/module-usps": "*",
-        "magento/module-variable": "*",
-        "magento/module-vault": "*",
-        "magento/module-vault-graph-ql": "*",
-        "magento/module-version": "*",
-        "magento/module-webapi": "*",
-        "magento/module-webapi-async": "*",
-        "magento/module-webapi-security": "*",
-        "magento/module-weee": "*",
-        "magento/module-widget": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-wishlist-graph-ql": "*",
-        "magento/module-wishlist-analytics": "*",
-        "magento/theme-adminhtml-backend": "*",
-        "magento/theme-frontend-blank": "*",
-        "magento/theme-frontend-luma": "*",
-        "magento/language-de_de": "*",
-        "magento/language-en_us": "*",
-        "magento/language-es_es": "*",
-        "magento/language-fr_fr": "*",
-        "magento/language-nl_nl": "*",
-        "magento/language-pt_br": "*",
-        "magento/language-zh_hans_cn": "*",
-        "magento/framework": "*",
-        "magento/framework-amqp": "*",
-        "magento/framework-bulk": "*",
-        "magento/framework-message-queue": "*",
+        "magento/module-marketplace": "100.4.0",
+        "magento/module-admin-analytics": "100.4.1",
+        "magento/module-admin-notification": "100.4.0",
+        "magento/module-advanced-pricing-import-export": "100.4.1",
+        "magento/module-amqp": "100.4.0",
+        "magento/module-amqp-store": "100.4.0",
+        "magento/module-analytics": "100.4.1",
+        "magento/module-asynchronous-operations": "100.4.1",
+        "magento/module-authorization": "100.4.1",
+        "magento/module-advanced-search": "100.4.0",
+        "magento/module-backend": "102.0.1",
+        "magento/module-backup": "100.4.1",
+        "magento/module-bundle": "101.0.1",
+        "magento/module-bundle-graph-ql": "100.4.1",
+        "magento/module-bundle-import-export": "100.4.0",
+        "magento/module-cache-invalidate": "100.4.0",
+        "magento/module-captcha": "100.4.1",
+        "magento/module-cardinal-commerce": "100.4.0",
+        "magento/module-catalog": "104.0.1",
+        "magento/module-catalog-customer-graph-ql": "100.4.1",
+        "magento/module-catalog-analytics": "100.4.0",
+        "magento/module-catalog-import-export": "101.1.1",
+        "magento/module-catalog-inventory": "100.4.1",
+        "magento/module-catalog-inventory-graph-ql": "100.4.0",
+        "magento/module-catalog-rule": "101.2.1",
+        "magento/module-catalog-rule-graph-ql": "100.4.0",
+        "magento/module-catalog-rule-configurable": "100.4.0",
+        "magento/module-catalog-search": "102.0.1",
+        "magento/module-catalog-url-rewrite": "100.4.1",
+        "magento/module-catalog-widget": "100.4.1",
+        "magento/module-checkout": "100.4.1",
+        "magento/module-checkout-agreements": "100.4.0",
+        "magento/module-checkout-agreements-graph-ql": "100.4.0",
+        "magento/module-cms": "104.0.1",
+        "magento/module-cms-url-rewrite": "100.4.1",
+        "magento/module-config": "101.2.1",
+        "magento/module-configurable-import-export": "100.4.0",
+        "magento/module-configurable-product": "100.4.1",
+        "magento/module-configurable-product-sales": "100.4.0",
+        "magento/module-contact": "100.4.1",
+        "magento/module-cookie": "100.4.1",
+        "magento/module-cron": "100.4.1",
+        "magento/module-currency-symbol": "100.4.0",
+        "magento/module-customer": "103.0.1",
+        "magento/module-customer-analytics": "100.4.0",
+        "magento/module-customer-downloadable-graph-ql": "100.4.0",
+        "magento/module-customer-import-export": "100.4.1",
+        "magento/module-deploy": "100.4.1",
+        "magento/module-developer": "100.4.1",
+        "magento/module-dhl": "100.4.0",
+        "magento/module-directory": "100.4.1",
+        "magento/module-directory-graph-ql": "100.4.0",
+        "magento/module-downloadable": "100.4.1",
+        "magento/module-downloadable-graph-ql": "100.4.1",
+        "magento/module-downloadable-import-export": "100.4.0",
+        "magento/module-eav": "102.1.1",
+        "magento/module-elasticsearch": "101.0.1",
+        "magento/module-elasticsearch-6": "100.4.1",
+        "magento/module-elasticsearch-7": "100.4.1",
+        "magento/module-email": "101.1.1",
+        "magento/module-encryption-key": "100.4.0",
+        "magento/module-fedex": "100.4.1",
+        "magento/module-gift-message": "100.4.0",
+        "magento/module-gift-message-graph-ql": "100.4.0",
+        "magento/module-google-adwords": "100.4.0",
+        "magento/module-google-analytics": "100.4.0",
+        "magento/module-google-optimizer": "100.4.1",
+        "magento/module-graph-ql": "100.4.1",
+        "magento/module-graph-ql-cache": "100.4.0",
+        "magento/module-catalog-graph-ql": "100.4.1",
+        "magento/module-catalog-cms-graph-ql": "100.4.0",
+        "magento/module-catalog-url-rewrite-graph-ql": "100.4.0",
+        "magento/module-configurable-product-graph-ql": "100.4.1",
+        "magento/module-customer-graph-ql": "100.4.1",
+        "magento/module-eav-graph-ql": "100.4.0",
+        "magento/module-swatches-graph-ql": "100.4.1",
+        "magento/module-tax-graph-ql": "100.4.0",
+        "magento/module-url-rewrite-graph-ql": "100.4.0",
+        "magento/module-cms-url-rewrite-graph-ql": "100.4.0",
+        "magento/module-weee-graph-ql": "100.4.0",
+        "magento/module-cms-graph-ql": "100.4.0",
+        "magento/module-grouped-import-export": "100.4.0",
+        "magento/module-grouped-product": "100.4.1",
+        "magento/module-grouped-catalog-inventory": "100.4.0",
+        "magento/module-grouped-product-graph-ql": "100.4.1",
+        "magento/module-import-export": "101.0.1",
+        "magento/module-indexer": "100.4.1",
+        "magento/module-instant-purchase": "100.4.0",
+        "magento/module-integration": "100.4.1",
+        "magento/module-layered-navigation": "100.4.1",
+        "magento/module-login-as-customer": "100.4.1",
+        "magento/module-login-as-customer-admin-ui": "100.4.1",
+        "magento/module-login-as-customer-api": "100.4.1",
+        "magento/module-login-as-customer-assistance": "100.4.0",
+        "magento/module-login-as-customer-frontend-ui": "100.4.1",
+        "magento/module-login-as-customer-log": "100.4.0",
+        "magento/module-login-as-customer-quote": "100.4.0",
+        "magento/module-login-as-customer-page-cache": "100.4.1",
+        "magento/module-login-as-customer-sales": "100.4.1",
+        "magento/module-media-content": "100.4.1",
+        "magento/module-media-content-api": "100.4.1",
+        "magento/module-media-content-catalog": "100.4.1",
+        "magento/module-media-content-cms": "100.4.1",
+        "magento/module-media-gallery": "100.4.1",
+        "magento/module-media-gallery-api": "101.0.1",
+        "magento/module-media-gallery-ui": "100.4.0",
+        "magento/module-media-gallery-ui-api": "100.4.0",
+        "magento/module-media-gallery-integration": "100.4.0",
+        "magento/module-media-gallery-synchronization": "100.4.0",
+        "magento/module-media-gallery-synchronization-api": "100.4.0",
+        "magento/module-media-content-synchronization": "100.4.0",
+        "magento/module-media-content-synchronization-api": "100.4.0",
+        "magento/module-media-content-synchronization-catalog": "100.4.0",
+        "magento/module-media-content-synchronization-cms": "100.4.0",
+        "magento/module-media-gallery-synchronization-metadata": "100.4.0",
+        "magento/module-media-gallery-metadata": "100.4.0",
+        "magento/module-media-gallery-metadata-api": "100.4.0",
+        "magento/module-media-gallery-catalog-ui": "100.4.0",
+        "magento/module-media-gallery-cms-ui": "100.4.0",
+        "magento/module-media-gallery-catalog-integration": "100.4.0",
+        "magento/module-media-gallery-catalog": "100.4.0",
+        "magento/module-media-storage": "100.4.0",
+        "magento/module-message-queue": "100.4.1",
+        "magento/module-msrp": "100.4.0",
+        "magento/module-msrp-configurable-product": "100.4.0",
+        "magento/module-msrp-grouped-product": "100.4.0",
+        "magento/module-multishipping": "100.4.1",
+        "magento/module-mysql-mq": "100.4.0",
+        "magento/module-new-relic-reporting": "100.4.0",
+        "magento/module-newsletter": "100.4.1",
+        "magento/module-newsletter-graph-ql": "100.4.0",
+        "magento/module-offline-payments": "100.4.0",
+        "magento/module-offline-shipping": "100.4.0",
+        "magento/module-page-cache": "100.4.1",
+        "magento/module-payment": "100.4.1",
+        "magento/module-paypal": "101.0.1",
+        "magento/module-paypal-captcha": "100.4.0",
+        "magento/module-paypal-graph-ql": "100.4.1",
+        "magento/module-persistent": "100.4.1",
+        "magento/module-product-alert": "100.4.1",
+        "magento/module-product-video": "100.4.1",
+        "magento/module-quote": "101.2.1",
+        "magento/module-quote-analytics": "100.4.1",
+        "magento/module-quote-bundle-options": "100.4.0",
+        "magento/module-quote-configurable-options": "100.4.0",
+        "magento/module-quote-downloadable-links": "100.4.0",
+        "magento/module-quote-graph-ql": "100.4.1",
+        "magento/module-related-product-graph-ql": "100.4.0",
+        "magento/module-release-notification": "100.4.0",
+        "magento/module-reports": "100.4.1",
+        "magento/module-require-js": "100.4.0",
+        "magento/module-review": "100.4.1",
+        "magento/module-review-graph-ql": "100.4.0",
+        "magento/module-review-analytics": "100.4.0",
+        "magento/module-robots": "101.1.0",
+        "magento/module-rss": "100.4.0",
+        "magento/module-rule": "100.4.0",
+        "magento/module-sales": "103.0.1",
+        "magento/module-sales-analytics": "100.4.0",
+        "magento/module-sales-graph-ql": "100.4.1",
+        "magento/module-sales-inventory": "100.4.0",
+        "magento/module-sales-rule": "101.2.1",
+        "magento/module-sales-sequence": "100.4.1",
+        "magento/module-sample-data": "100.4.1",
+        "magento/module-search": "101.1.1",
+        "magento/module-security": "100.4.1",
+        "magento/module-send-friend": "100.4.0",
+        "magento/module-send-friend-graph-ql": "100.4.0",
+        "magento/module-shipping": "100.4.1",
+        "magento/module-sitemap": "100.4.1",
+        "magento/module-store": "101.1.1",
+        "magento/module-store-graph-ql": "100.4.1",
+        "magento/module-swagger": "100.4.0",
+        "magento/module-swagger-webapi": "100.4.0",
+        "magento/module-swagger-webapi-async": "100.4.0",
+        "magento/module-swatches": "100.4.1",
+        "magento/module-swatches-layered-navigation": "100.4.0",
+        "magento/module-tax": "100.4.1",
+        "magento/module-tax-import-export": "100.4.1",
+        "magento/module-theme": "101.1.1",
+        "magento/module-theme-graph-ql": "100.4.0",
+        "magento/module-translation": "100.4.1",
+        "magento/module-ui": "101.2.1",
+        "magento/module-ups": "100.4.1",
+        "magento/module-url-rewrite": "102.0.1",
+        "magento/module-user": "101.2.1",
+        "magento/module-usps": "100.4.0",
+        "magento/module-variable": "100.4.0",
+        "magento/module-vault": "101.2.1",
+        "magento/module-vault-graph-ql": "100.4.0",
+        "magento/module-version": "100.4.0",
+        "magento/module-webapi": "100.4.0",
+        "magento/module-webapi-async": "100.4.0",
+        "magento/module-webapi-security": "100.4.0",
+        "magento/module-weee": "100.4.1",
+        "magento/module-widget": "101.2.1",
+        "magento/module-wishlist": "101.2.1",
+        "magento/module-wishlist-graph-ql": "100.4.1",
+        "magento/module-wishlist-analytics": "100.4.0",
+        "magento/theme-adminhtml-backend": "100.4.1",
+        "magento/theme-frontend-blank": "100.4.1",
+        "magento/theme-frontend-luma": "100.4.1",
+        "magento/language-de_de": "100.4.0",
+        "magento/language-en_us": "100.4.0",
+        "magento/language-es_es": "100.4.0",
+        "magento/language-fr_fr": "100.4.0",
+        "magento/language-nl_nl": "100.4.0",
+        "magento/language-pt_br": "100.4.0",
+        "magento/language-zh_hans_cn": "100.4.0",
+        "magento/framework": "103.0.1",
+        "magento/framework-amqp": "100.4.0",
+        "magento/framework-bulk": "101.0.0",
+        "magento/framework-message-queue": "100.4.1",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",
         "components/jqueryui": "1.10.4",
         "twbs/bootstrap": "3.1.0",
         "tinymce/tinymce": "3.4.7",
-        "magento/module-tinymce-3": "*",
-        "magento/module-csp": "*"
+        "magento/module-tinymce-3": "100.4.1",
+        "magento/module-csp": "100.4.0"
     },
-    "conflict": {
-        "gene/bluefoot": "*"
+    "autoload-dev": {
+        "psr-4": {
+            "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/",
+            "Magento\\Sniffs\\": "dev/tests/static/framework/Magento/Sniffs/",
+            "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
+            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
+            "Magento\\Tools\\": "dev/tools/Magento/Tools/",
+            "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/"
+        }
     },
+    "prefer-stable": true,
     "extra": {
         "component_paths": {
-            "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
+            "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
             "components/jquery": [
                 "lib/web/jquery.js",
                 "lib/web/jquery/jquery.min.js",
                 "lib/web/jquery/jquery-migrate.js"
             ],
-            "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
             "components/jqueryui": [
                 "lib/web/jquery/jquery-ui.js"
             ],
+            "tinymce/tinymce": "lib/web/tiny_mce_4",
+            "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
             "twbs/bootstrap": [
                 "lib/web/jquery/jquery.tabs.js"
-            ],
-            "tinymce/tinymce": "lib/web/tiny_mce_4"
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "Magento\\Framework\\": "lib/internal/Magento/Framework/",
-            "Magento\\Setup\\": "setup/src/Magento/Setup/",
-            "Magento\\": "app/code/Magento/",
-            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
-        },
-        "psr-0": {
-            "": [
-                "app/code/",
-                "generated/code/"
             ]
-        },
-        "files": [
-            "app/etc/NonComposerComponentRegistration.php"
-        ],
-        "exclude-from-classmap": [
-            "**/dev/**",
-            "**/update/**",
-            "**/Test/**"
-        ]
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Magento\\Sniffs\\": "dev/tests/static/framework/Magento/Sniffs/",
-            "Magento\\Tools\\": "dev/tools/Magento/Tools/",
-            "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/",
-            "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
-            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
-            "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
         }
-    },
-    "prefer-stable": true
+    }
 }
+

From 38715a87322c5066b2654ae7ddf69b61defa6450 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Mon, 12 Oct 2020 16:23:49 -0500
Subject: [PATCH 507/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Indexer/Product/Price/AbstractAction.php  | 12 +--
 .../Indexer/Product/Price/Action/Rows.php     | 96 ++++++++++++++++++-
 2 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index b8896dd128f6b..fdbfad201954c 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -387,9 +387,12 @@ protected function _reindexRows($changedIds = [])
         $parentProductsTypes = $this->getParentProductsTypes($changedIds);
 
         $changedIds = array_unique(array_merge($changedIds, ...array_values($parentProductsTypes)));
-        $pendingDeleteIds = $changedIds;
         $productsTypes = array_merge_recursive($productsTypes, $parentProductsTypes);
 
+        if (!empty($changedIds)) {
+            $this->deleteIndexData($changedIds);
+        }
+
         $typeIndexers = $this->getTypeIndexers();
         foreach ($typeIndexers as $productType => $indexer) {
             $entityIds = $productsTypes[$productType] ?? [];
@@ -416,11 +419,6 @@ protected function _reindexRows($changedIds = [])
                 $indexer->reindexEntity($entityIds);
                 $this->_syncData($entityIds);
             }
-            $pendingDeleteIds = array_diff($pendingDeleteIds, $entityIds);
-        }
-
-        if (!empty($pendingDeleteIds)) {
-            $this->deleteIndexData($pendingDeleteIds);
         }
 
         return $changedIds;
@@ -472,9 +470,7 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
         if (!empty($excludeIds)) {
             $select->where('child_id NOT IN(?)', $excludeIds);
         }
-
         $children = $this->getConnection()->fetchCol($select);
-
         if ($children) {
             foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
                 $select = $this->getConnection()->select()->from(
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
index 27b50eea883b0..ce2f1ff75adbe 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
@@ -5,12 +5,82 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Price\Action;
 
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Class Rows reindex action for mass actions
  *
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
 {
+    /**
+     * Default batch size
+     */
+    private const BATCH_SIZE = 100;
+
+    /**
+     * @var int
+     */
+    private $batchSize;
+
+    /**
+     * @param ScopeConfigInterface $config
+     * @param StoreManagerInterface $storeManager
+     * @param CurrencyFactory $currencyFactory
+     * @param TimezoneInterface $localeDate
+     * @param DateTime $dateTime
+     * @param Type $catalogProductType
+     * @param Factory $indexerPriceFactory
+     * @param DefaultPrice $defaultIndexerResource
+     * @param TierPrice|null $tierPriceIndexResource
+     * @param DimensionCollectionFactory|null $dimensionCollectionFactory
+     * @param TableMaintainer|null $tableMaintainer
+     * @param int|null $batchSize
+     * @SuppressWarnings(PHPMD.NPathComplexity) Added to backward compatibility with abstract class
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity) Added to backward compatibility with abstract class
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList) Added to backward compatibility with abstract class
+     */
+    public function __construct(
+        ScopeConfigInterface $config,
+        StoreManagerInterface $storeManager,
+        CurrencyFactory $currencyFactory,
+        TimezoneInterface $localeDate,
+        DateTime $dateTime,
+        Type $catalogProductType,
+        Factory $indexerPriceFactory,
+        DefaultPrice $defaultIndexerResource,
+        TierPrice $tierPriceIndexResource = null,
+        DimensionCollectionFactory $dimensionCollectionFactory = null,
+        TableMaintainer $tableMaintainer = null,
+        ?int $batchSize = null
+    ) {
+        parent::__construct(
+            $config,
+            $storeManager,
+            $currencyFactory,
+            $localeDate,
+            $dateTime,
+            $catalogProductType,
+            $indexerPriceFactory,
+            $defaultIndexerResource,
+            $tierPriceIndexResource,
+            $dimensionCollectionFactory,
+            $tableMaintainer
+        );
+        $this->batchSize = $batchSize ?? self::BATCH_SIZE;
+    }
+
     /**
      * Execute Rows reindex
      *
@@ -24,10 +94,28 @@ public function execute($ids)
         if (empty($ids)) {
             throw new \Magento\Framework\Exception\InputException(__('Bad value was supplied.'));
         }
-        try {
-            $this->_reindexRows($ids);
-        } catch (\Exception $e) {
-            throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+        $currentBatch = [];
+        $i = 0;
+
+        foreach ($ids as $id) {
+            $currentBatch[] = $id;
+            if (++$i === $this->batchSize) {
+                try {
+                    $this->_reindexRows($currentBatch);
+                } catch (\Exception $e) {
+                    throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+                }
+                $i = 0;
+                $currentBatch = [];
+            }
+        }
+
+        if (!empty($currentBatch)) {
+            try {
+                $this->_reindexRows($currentBatch);
+            } catch (\Exception $e) {
+                throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);
+            }
         }
     }
 }

From 1c829a7233944b7ef7b05e53478f471cccb10c0f Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Mon, 12 Oct 2020 16:29:08 -0500
Subject: [PATCH 508/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Catalog/Model/Indexer/Product/Price/AbstractAction.php    | 4 +++-
 .../ResourceModel/Product/Indexer/Price/DefaultPrice.php      | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index fdbfad201954c..f3a4b322e29df 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -389,7 +389,7 @@ protected function _reindexRows($changedIds = [])
         $changedIds = array_unique(array_merge($changedIds, ...array_values($parentProductsTypes)));
         $productsTypes = array_merge_recursive($productsTypes, $parentProductsTypes);
 
-        if (!empty($changedIds)) {
+        if ($changedIds) {
             $this->deleteIndexData($changedIds);
         }
 
@@ -470,7 +470,9 @@ protected function _copyRelationIndexData($parentIds, $excludeIds = null)
         if (!empty($excludeIds)) {
             $select->where('child_id NOT IN(?)', $excludeIds);
         }
+
         $children = $this->getConnection()->fetchCol($select);
+
         if ($children) {
             foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
                 $select = $this->getConnection()->select()->from(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
index 6d7e7293f9e9d..578e3099a2fde 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php
@@ -778,7 +778,7 @@ protected function _movePriceDataToIndexTable($entityIds = null)
             $select->where('entity_id in (?)', count($entityIds) > 0 ? $entityIds : 0, \Zend_Db::INT_TYPE);
         }
 
-        $query = $select->insertFromSelect($this->getIdxTable(), [], true);
+        $query = $select->insertFromSelect($this->getIdxTable(), [], false);
         $connection->query($query);
 
         $connection->delete($table);

From 8090eb0eafdabd3462a28f7fe47554fc9ff57a1c Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 13 Oct 2020 10:13:15 +0300
Subject: [PATCH 509/671] MC-38074: Report - Products in Carts not following
 user roles scope

---
 .../Reports/Model/Product/DataRetriever.php   | 106 ++++++++++++++++++
 .../ResourceModel/Quote/Item/Collection.php   |  18 ++-
 .../Report/Quote/CollectionTest.php           |  44 ++++----
 .../Model/Product/DataRetrieverTest.php       |  54 +++++++++
 4 files changed, 195 insertions(+), 27 deletions(-)
 create mode 100644 app/code/Magento/Reports/Model/Product/DataRetriever.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Reports/Model/Product/DataRetrieverTest.php

diff --git a/app/code/Magento/Reports/Model/Product/DataRetriever.php b/app/code/Magento/Reports/Model/Product/DataRetriever.php
new file mode 100644
index 0000000000000..c6260a4e7bacc
--- /dev/null
+++ b/app/code/Magento/Reports/Model/Product/DataRetriever.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Model\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Retrieve products data for reports by entity id's
+ */
+class DataRetriever
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * DataRetriever constructor.
+     *
+     * @param ProductCollectionFactory $productCollectionFactory
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        ProductCollectionFactory $productCollectionFactory,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->productCollectionFactory = $productCollectionFactory;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Retrieve products data by entity id's
+     *
+     * @param array $entityIds
+     * @return array
+     */
+    public function execute(array $entityIds = []): array
+    {
+        $productCollection = $this->getProductCollection($entityIds);
+
+        return $this->prepareDataByCollection($productCollection);
+    }
+
+    /**
+     * Get product collection filtered by entity id's
+     *
+     * @param array $entityIds
+     * @return ProductCollection
+     */
+    private function getProductCollection(array $entityIds = []): ProductCollection
+    {
+        $productCollection = $this->productCollectionFactory->create();
+        $productCollection->addAttributeToSelect('name');
+        $productCollection->addIdFilter($entityIds);
+        $productCollection->addPriceData(null, $this->getWebsiteIdForFilter());
+
+        return $productCollection;
+    }
+
+    /**
+     * Retrieve website id for filter collection
+     *
+     * @return int
+     */
+    private function getWebsiteIdForFilter(): int
+    {
+        $defaultStoreView = $this->storeManager->getDefaultStoreView();
+        if ($defaultStoreView) {
+            $websiteId = (int)$defaultStoreView->getWebsiteId();
+        } else {
+            $websites = $this->storeManager->getWebsites();
+            $website = reset($websites);
+            $websiteId = (int)$website->getId();
+        }
+
+        return $websiteId;
+    }
+
+    /**
+     * Prepare data by collection
+     *
+     * @param ProductCollection $productCollection
+     * @return array
+     */
+    private function prepareDataByCollection(ProductCollection $productCollection): array
+    {
+        $productsData = [];
+        foreach ($productCollection as $product) {
+            $productsData[$product->getId()] = $product->getData();
+        }
+
+        return $productsData;
+    }
+}
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
index 16df2d30db40d..e7dc28eb74a49 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -7,7 +7,8 @@
 
 namespace Magento\Reports\Model\ResourceModel\Quote\Item;
 
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Reports\Model\Product\DataRetriever as ProductDataRetriever;
 
 /**
  * Collection of Magento\Quote\Model\Quote\Item
@@ -49,6 +50,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected $orderResource;
 
+    /**
+     * @var ProductDataRetriever
+     */
+    private $productDataRetriever;
+
     /**
      * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
      * @param \Psr\Log\LoggerInterface $logger
@@ -59,6 +65,9 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      * @param \Magento\Sales\Model\ResourceModel\Order\Collection $orderResource
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
      * @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+     * @param ProductDataRetriever|null $productDataRetriever
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -69,7 +78,8 @@ public function __construct(
         \Magento\Customer\Model\ResourceModel\Customer $customerResource,
         \Magento\Sales\Model\ResourceModel\Order\Collection $orderResource,
         \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+        ?ProductDataRetriever $productDataRetriever = null
     ) {
         parent::__construct(
             $entityFactory,
@@ -82,6 +92,8 @@ public function __construct(
         $this->productResource = $productResource;
         $this->customerResource = $customerResource;
         $this->orderResource = $orderResource;
+        $this->productDataRetriever = $productDataRetriever
+            ?? ObjectManager::getInstance()->get(ProductDataRetriever::class);
     }
 
     /**
@@ -225,7 +237,7 @@ protected function _afterLoad()
         foreach ($items as $item) {
             $productIds[] = $item->getProductId();
         }
-        $productData = $this->getProductData($productIds);
+        $productData = $this->productDataRetriever->execute($productIds);
         $orderData = $this->getOrdersData($productIds);
         foreach ($items as $item) {
             $item->setId($item->getProductId());
diff --git a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
index 6e7d5bdce16f5..90d224ee417db 100644
--- a/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
+++ b/app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Report/Quote/CollectionTest.php
@@ -7,15 +7,17 @@
 
 namespace Magento\Reports\Test\Unit\Model\ResourceModel\Report\Quote;
 
-use Magento\Eav\Model\Entity\AbstractEntity;
+use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Quote\Model\ResourceModel\Quote;
-use Magento\Reports\Model\ResourceModel\Quote\Collection;
+use Magento\Reports\Model\Product\DataRetriever as ProductDataRetriever;
+use Magento\Reports\Model\ResourceModel\Quote\Collection as QuoteCollection;
+use Magento\Reports\Model\ResourceModel\Quote\Item\Collection as QuoteItemCollection;
+use Magento\Sales\Model\ResourceModel\Order\Collection as OrderCollection;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -34,16 +36,22 @@ class CollectionTest extends TestCase
      */
     protected $selectMock;
 
+    /**
+     * @var ProductDataRetriever|MockObject
+     */
+    private $productDataRetriever;
+
     protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
         $this->selectMock = $this->createMock(Select::class);
+        $this->productDataRetriever = $this->createMock(ProductDataRetriever::class);
     }
 
     public function testGetSelectCountSql()
     {
         /** @var MockObject $collection */
-        $collection = $this->getMockBuilder(Collection::class)
+        $collection = $this->getMockBuilder(QuoteCollection::class)
             ->setMethods(['getSelect'])
             ->disableOriginalConstructor()
             ->getMock();
@@ -61,8 +69,8 @@ public function testPrepareActiveCartItems()
     {
         /** @var MockObject $collection */
         $constructArgs = $this->objectManager
-            ->getConstructArguments(\Magento\Reports\Model\ResourceModel\Quote\Item\Collection::class);
-        $collection = $this->getMockBuilder(\Magento\Reports\Model\ResourceModel\Quote\Item\Collection::class)
+            ->getConstructArguments(QuoteItemCollection::class);
+        $collection = $this->getMockBuilder(QuoteItemCollection::class)
             ->setMethods(['getSelect', 'getTable', 'getFlag', 'setFlag'])
             ->disableOriginalConstructor()
             ->setConstructorArgs($constructArgs)
@@ -88,18 +96,18 @@ public function testLoadWithFilter()
     {
         /** @var MockObject $collection */
         $constructArgs = $this->objectManager
-            ->getConstructArguments(\Magento\Reports\Model\ResourceModel\Quote\Item\Collection::class);
+            ->getConstructArguments(QuoteItemCollection::class);
         $constructArgs['eventManager'] = $this->getMockForAbstractClass(ManagerInterface::class);
-        $connectionMock = $this->getMockForAbstractClass(AdapterInterface::class);
         $resourceMock = $this->createMock(Quote::class);
         $resourceMock->expects($this->any())->method('getConnection')
             ->willReturn($this->createMock(Mysql::class));
         $constructArgs['resource'] = $resourceMock;
-        $productResourceMock = $this->createMock(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+        $productResourceMock = $this->createMock(ProductCollection::class);
         $constructArgs['productResource'] = $productResourceMock;
-        $orderResourceMock = $this->createMock(\Magento\Sales\Model\ResourceModel\Order\Collection::class);
+        $orderResourceMock = $this->createMock(OrderCollection::class);
         $constructArgs['orderResource'] = $orderResourceMock;
-        $collection = $this->getMockBuilder(\Magento\Reports\Model\ResourceModel\Quote\Item\Collection::class)
+        $constructArgs['productDataRetriever'] = $this->productDataRetriever;
+        $collection = $this->getMockBuilder(QuoteItemCollection::class)
             ->setMethods(
                 [
                     '_beforeLoad',
@@ -129,24 +137,12 @@ public function testLoadWithFilter()
         //productLoad()
         $productAttributeMock = $this->createMock(AbstractAttribute::class);
         $priceAttributeMock = $this->createMock(AbstractAttribute::class);
-        $productResourceMock->expects($this->once())->method('getConnection')->willReturn($connectionMock);
         $productResourceMock->expects($this->any())->method('getAttribute')
             ->willReturnMap([['name', $productAttributeMock], ['price', $priceAttributeMock]]);
-        $productResourceMock->expects($this->once())->method('getSelect')->willReturn($this->selectMock);
-        $eavEntity = $this->createMock(AbstractEntity::class);
-        $eavEntity->expects($this->once())->method('getLinkField')->willReturn('entity_id');
-        $productResourceMock->expects($this->once())->method('getEntity')->willReturn($eavEntity);
-        $this->selectMock->expects($this->once())->method('reset')->willReturnSelf();
-        $this->selectMock->expects($this->once())->method('from')->willReturnSelf();
-        $this->selectMock->expects($this->once())->method('useStraightJoin')->willReturnSelf();
-        $this->selectMock->expects($this->once())->method('joinInner')->willReturnSelf();
-        $this->selectMock->expects($this->once())->method('joinLeft')->willReturnSelf();
         $collection->expects($this->once())->method('getOrdersData')->willReturn([]);
-        $productAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
-        $priceAttributeMock->expects($this->once())->method('getBackend')->willReturnSelf();
-        $connectionMock->expects($this->once())->method('fetchAssoc')->willReturn([1, 2, 3]);
         //_afterLoad()
         $collection->expects($this->once())->method('getItems')->willReturn([]);
+        $this->productDataRetriever->expects($this->once())->method('execute')->willReturn([]);
         $collection->loadWithFilter();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/Product/DataRetrieverTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/Product/DataRetrieverTest.php
new file mode 100644
index 0000000000000..086078685ae94
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Reports/Model/Product/DataRetrieverTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Model\Product;
+
+use Magento\Catalog\Model\Indexer\Product\Price\Processor;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoAppArea adminhtml
+ */
+class DataRetrieverTest extends TestCase
+{
+    /**
+     * @var DataRetriever
+     */
+    private $dataRetriever;
+
+    /**
+     * @var Processor
+     */
+    private $priceIndexerProcessor;
+
+    protected function setUp(): void
+    {
+        $this->dataRetriever = Bootstrap::getObjectManager()->create(DataRetriever::class);
+        $this->priceIndexerProcessor = Bootstrap::getObjectManager()->get(Processor::class);
+    }
+
+    /**
+     * Test retrieve products data for reports by entity id's
+     * Do not use magentoDbIsolation because index statement changing "tears" transaction (triggers creating)
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoConfigFixture default/reports/options/enabled 1
+     * @magentoDbIsolation disabled
+     *
+     * @return void
+     */
+    public function testExecute(): void
+    {
+        $productId = 1;
+        $this->priceIndexerProcessor->reindexAll();
+        $actualResult = $this->dataRetriever->execute([$productId]);
+        $this->assertNotEmpty($actualResult);
+        $this->assertCount(1, $actualResult);
+        $this->assertEquals(10, $actualResult[$productId]['price']);
+    }
+}

From 8f92a813b9132e75af4f54747959b44b6cfc9872 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 13 Oct 2020 10:55:53 +0300
Subject: [PATCH 510/671] MC-38269: [CLARIFICATION] [Magento Cloud] -
 Persistent Shopping cart Header Weelcome & Not you?

---
 .../Persistent/view/frontend/templates/additional.phtml    | 7 ++-----
 .../view/frontend/web/js/view/additional-welcome.js        | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
index 40c8674bc025a..0c19a1c5c8b05 100644
--- a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
+++ b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
@@ -4,13 +4,10 @@
  * See COPYING.txt for license details.
  */
 ?>
-<?php if ($block->getCustomerId()) :?>
-    <span>
-        <a <?= /* @noEscape */ $block->getLinkAttributes()?>><?= $block->escapeHtml(__('Not you?'));?></a>
-    </span>
-<?php endif;?>
 <script type="application/javascript">
     window.persistent = <?= /* @noEscape */ $block->getConfig(); ?>;
+    window.notYou = '<span> <a <?= /* @noEscape */ $block->getLinkAttributes()?>>'
+    + '<?= $block->escapeHtml(__("Not you?"));?></a></span>';
 </script>
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
index 7ace6e60d1c39..fb57d311e35c3 100644
--- a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
@@ -40,6 +40,7 @@ define([
 
                         $(this).attr('data-bind', html);
                         $(this).html(html);
+                        $(this).after(window.notYou);
                     });
                 }
             }

From 2bee5bc62a08cba4a46100e5dcb2d1e3d6abbb67 Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Tue, 13 Oct 2020 12:53:35 +0300
Subject: [PATCH 511/671] MC-38113: Same shipping address is repeating multiple
 times in storefront checkout when Reordered

---
 ...ckoutFillingShippingSectionActionGroup.xml |  2 +-
 ...ustomerHasNoOtherAddressesActionGroup.xml} |  4 +--
 ...nStartReorderFromOrderPageActionGroup.xml} |  8 ++---
 ...eorderAddressNotSavedInAddressBookTest.xml | 36 ++++++++++---------
 4 files changed, 25 insertions(+), 25 deletions(-)
 rename app/code/Magento/Customer/Test/Mftf/ActionGroup/{AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml => AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml} (79%)
 rename app/code/Magento/Sales/Test/Mftf/ActionGroup/{AdminReorderActionGroup.xml => AdminStartReorderFromOrderPageActionGroup.xml} (66%)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
index e1092a87e4a01..d3127362c637e 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
@@ -29,7 +29,7 @@
         <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
         <waitForLoadingMaskToDisappear stepKey="waitForShippingLoadingMask"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
-        <waitForElement selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
+        <waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
similarity index 79%
rename from app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml
rename to app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
index 2fde4d915c99f..8634ebb626e6d 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStoreFrontCustomerHasNoOtherAddressesActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
@@ -7,9 +7,9 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertStoreFrontCustomerHasNoOtherAddressesActionGroup">
+    <actionGroup name="AssertStorefrontCustomerHasNoOtherAddressesActionGroup">
         <annotations>
-            <description>Verifies customer no additional address in address book</description>
+            <description>Verifies customer has no additional address in address book</description>
         </annotations>
         <amOnPage url="customer/address/" stepKey="goToAddressPage"/>
         <waitForText userInput="You have no other address entries in your address book." selector=".block-addresses-list" stepKey="assertOtherAddresses"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml
similarity index 66%
rename from app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml
rename to app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml
index f4f076f25af8b..28a179faff9ac 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminReorderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml
@@ -7,16 +7,14 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminReorderActionGroup">
+    <actionGroup name="AdminStartReorderFromOrderPageActionGroup">
         <annotations>
             <description>Reorder existing order. Requires admin order page to be opened.</description>
         </annotations>
 
         <click selector="{{AdminOrderDetailsMainActionsSection.reorder}}" stepKey="clickReorder"/>
         <waitForPageLoad stepKey="waitPageLoad"/>
-
-        <click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmit"/>
-        <waitForPageLoad stepKey="waitOrderCreated"/>
-        <waitForText selector="{{AdminMessagesSection.success}}" userInput="You created the order." stepKey="seeOrderCreatedMessage"/>
+        <waitForElementVisible selector="{{AdminHeaderSection.pageTitle}}" stepKey="waitForPageTitle"/>
+        <see selector="{{AdminHeaderSection.pageTitle}}" userInput="Create New Order" stepKey="seeCreateNewOrderPageTitle"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
index 2b4bb43ec36cd..1c3ab70857151 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
@@ -9,36 +9,37 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminReorderAddressNotSavedInAddressBookTest">
         <annotations>
-            <title value="Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
-            <stories value="MC-38113: Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
-            <description value="Same shipping address is repeating multiple times in storefront checkout when Reordered"/>
             <features value="Sales"/>
-            <testCaseId value="MC-38113"/>
+            <stories value="Reorder"/>
+            <title value="Same shipping address is not repeating multiple times in storefront checkout when Reordered"/>
+            <description value="Same shipping address is not repeating multiple times in storefront checkout when Reordered"/>
+            <testCaseId value="MC-38412"/>
+            <useCaseId value="MC-38113"/>
             <severity value="MAJOR"/>
-            <group value="Sales"/>
+            <group value="sales"/>
         </annotations>
         <before>
-            <createData entity="ApiCategory" stepKey="Category"/>
-            <createData entity="ApiSimpleProduct" stepKey="Product">
-                <requiredEntity createDataKey="Category"/>
+            <createData entity="ApiCategory" stepKey="category"/>
+            <createData entity="ApiSimpleProduct" stepKey="product">
+                <requiredEntity createDataKey="category"/>
             </createData>
-            <createData entity="Simple_Customer_Without_Address" stepKey="Customer"/>
+            <createData entity="Simple_Customer_Without_Address" stepKey="customer"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-                <argument name="Customer" value="$Customer$"/>
+                <argument name="Customer" value="$customer$"/>
             </actionGroup>
         </before>
         <after>
+            <deleteData createDataKey="product" stepKey="deleteProduct"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
-            <deleteData createDataKey="Product" stepKey="deleteProduct"/>
-            <deleteData createDataKey="Category" stepKey="deleteCategory"/>
-            <deleteData createDataKey="Customer" stepKey="deleteCustomer"/>
         </after>
 
         <!-- Create order for registered customer -->
         <actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToOrder">
-            <argument name="product" value="$Product$"/>
+            <argument name="product" value="$product$"/>
         </actionGroup>
         <actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="openCheckoutPage"/>
         <actionGroup ref="LoggedInUserCheckoutFillingShippingSectionActionGroup" stepKey="fillAddressForm"/>
@@ -47,11 +48,12 @@
 
         <!-- Reorder created order -->
         <actionGroup ref="OpenOrderByIdActionGroup" stepKey="openOrderById">
-            <argument name="orderId" value="$grabOrderNumber"/>
+            <argument name="orderId" value="{$grabOrderNumber}"/>
         </actionGroup>
-        <actionGroup ref="AdminReorderActionGroup" stepKey="reorder"/>
+        <actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="startReorder"/>
+        <actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
 
         <!-- Assert no additional addresses saved -->
-        <actionGroup ref="AssertStoreFrontCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
+        <actionGroup ref="AssertStorefrontCustomerHasNoOtherAddressesActionGroup" stepKey="assertAddresses"/>
     </test>
 </tests>

From 56d8eae58d9083552c4d48de39aab94a435b3580 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Tue, 13 Oct 2020 13:08:21 +0300
Subject: [PATCH 512/671] MC-38243: Create automated test for "Product
 Categories Indexer in Update on Schedule mode"

---
 ...inProductCategoryIndexerInUpdateOnScheduleModeTest.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
index eebd3472cbd95..3008e89fd9dd1 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminProductCategoryIndexerInUpdateOnScheduleModeTest.xml
@@ -10,17 +10,15 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminProductCategoryIndexerInUpdateOnScheduleModeTest">
         <annotations>
+            <features value="Catalog"/>
             <stories value="Product Categories Indexer"/>
             <title value="Product Categories Indexer in Update on Schedule mode"/>
             <description value="The test verifies that in Update on Schedule mode if displaying of category products on Storefront changes due to product properties change,
             the changes are NOT applied immediately, but applied only after cron runs (twice)."/>
-            <severity value="BLOCKER"/>
-            <testCaseId value="MC-11146"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-26119"/>
             <group value="catalog"/>
             <group value="indexer"/>
-            <skip>
-                <issueId value="MC-20392"/>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>

From c72589d3132aa145ae98fbac2095d0b9b3db2965 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Tue, 13 Oct 2020 13:12:38 +0300
Subject: [PATCH 513/671] MC-37070: Create automated test for "Import products
 with shared images"

---
 .../Product/Gallery/UpdateHandlerTest.php     | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index ce36b27d51e7d..1101b7291528b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -16,6 +16,7 @@
 use Magento\Catalog\Model\ResourceModel\Product as ProductResource;
 use Magento\Catalog\Model\ResourceModel\Product\Gallery;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\ObjectManagerInterface;
@@ -90,6 +91,9 @@ class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
      */
     private $currentStoreId;
 
+    /** @var MetadataPool */
+    private $metadataPool;
+
     /**
      * @inheritdoc
      */
@@ -109,6 +113,7 @@ protected function setUp(): void
         $this->mediaDirectory = $this->objectManager->get(Filesystem::class)
             ->getDirectoryWrite(DirectoryList::MEDIA);
         $this->mediaDirectory->writeFile($this->fileName, 'Test');
+        $this->metadataPool = $this->objectManager->get(MetadataPool::class);
     }
 
     /**
@@ -534,28 +539,30 @@ private function duplicateMediaGalleryForProduct(string $imagePath, string $prod
         $product = $this->getProduct(null, $productSku);
         $connect = $this->galleryResource->getConnection();
         $select = $connect->select()->from($this->galleryResource->getMainTable())->where('value = ?', $imagePath);
-        $res = $connect->fetchRow($select);
-        $value_id = $res['value_id'];
-        unset($res['value_id']);
+        $result = $connect->fetchRow($select);
+        $value_id = $result['value_id'];
+        unset($result['value_id']);
         $rows = [
-            'attribute_id' => $res['attribute_id'],
-            'value' => $res['value'],
-            ProductAttributeMediaGalleryEntryInterface::MEDIA_TYPE => $res['media_type'],
-            ProductAttributeMediaGalleryEntryInterface::DISABLED => $res['disabled'],
+            'attribute_id' => $result['attribute_id'],
+            'value' => $result['value'],
+            ProductAttributeMediaGalleryEntryInterface::MEDIA_TYPE => $result['media_type'],
+            ProductAttributeMediaGalleryEntryInterface::DISABLED => $result['disabled'],
         ];
         $connect->insert($this->galleryResource->getMainTable(), $rows);
         $select = $connect->select()
             ->from($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE))
             ->where('value_id = ?', $value_id);
-        $res = $connect->fetchRow($select);
+        $result = $connect->fetchRow($select);
         $newValueId = (int)$value_id + 1;
+        $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
+        $linkField = $metadata->getLinkField();
         $rows = [
             'value_id' => $newValueId,
-            'store_id' => $res['store_id'],
-            ProductAttributeMediaGalleryEntryInterface::LABEL => $res['label'],
-            ProductAttributeMediaGalleryEntryInterface::POSITION => $res['position'],
-            ProductAttributeMediaGalleryEntryInterface::DISABLED => $res['disabled'],
-            'row_id' => $product->getRowId(),
+            'store_id' => $result['store_id'],
+            ProductAttributeMediaGalleryEntryInterface::LABEL => $result['label'],
+            ProductAttributeMediaGalleryEntryInterface::POSITION => $result['position'],
+            ProductAttributeMediaGalleryEntryInterface::DISABLED => $result['disabled'],
+            $linkField => $product->getData($linkField),
         ];
         $connect->insert($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE), $rows);
         $rows = ['value_id' => $newValueId, 'row_id' => $product->getRowId()];

From 12b60201014a997a72823b5cfeaac6ee126b3857 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Tue, 13 Oct 2020 13:38:50 +0300
Subject: [PATCH 514/671] MC-37558: Create automated test for "Override
 Category settings on Store View level"

---
 .../Controller/Adminhtml/Category/Save/UpdateCategoryTest.php   | 2 +-
 .../testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php
index c3d5ed080bcf2..75b96a1af3b09 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php
@@ -45,7 +45,7 @@ protected function setUp(): void
      * @param array $postData
      * @return void
      */
-    public function testUpdateCategoryForDefaultStoreView($postData): void
+    public function testUpdateCategoryForDefaultStoreView(array $postData): void
     {
         $storeId = (int)$this->storeManager->getStore('default')->getId();
         $postData = array_merge($postData, ['store_id' => $storeId]);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index 6469f80ff49b8..e829801d60e1a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -24,6 +24,7 @@
  * Provide tests for CategoryRepository model.
  *
  * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryRepositoryTest extends TestCase
 {

From 71b027dedf046771e334fd2a9cbf2b648e62201c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 13 Oct 2020 14:26:30 +0300
Subject: [PATCH 515/671] MC-29411: PHPStan: "Return typehint of method has
 invalid type " errors

---
 app/code/Magento/CatalogSearch/Model/Advanced.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index 5143762a07e08..ba58066cae917 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -359,6 +359,8 @@ protected function getPreparedSearchCriteria($attribute, $value)
         if (is_array($value)) {
             if (isset($value['from']) && isset($value['to'])) {
                 if (!empty($value['from']) || !empty($value['to'])) {
+                    $from = '';
+                    $to = '';
                     if (isset($value['currency'])) {
                         /** @var $currencyModel Currency */
                         $currencyModel = $this->_currencyFactory->create()->load($value['currency']);

From 101b711b00e64e35bdf4f41b2ac4a9ca043701ed Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 13 Oct 2020 15:07:18 +0300
Subject: [PATCH 516/671] MC-38315: Reorder is not working with custom options
 date after enabled JavaScript Calendar

---
 .../Model/Product/Option/Type/Date.php        |  40 +++++++
 .../Magento/Sales/Model/AdminOrder/Create.php |  21 +---
 .../Adminhtml/Order/Create/ReorderTest.php    | 108 ++++++++++++++++++
 .../order_with_date_time_option_product.php   |  97 ++++++++++++++++
 ...with_date_time_option_product_rollback.php |  12 ++
 5 files changed, 262 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/ReorderTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product_rollback.php

diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
index 8001d692c011b..725635bf4fc45 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Date.php
@@ -72,6 +72,9 @@ public function validateUserValue($values)
         $dateValid = true;
         if ($this->_dateExists()) {
             if ($this->useCalendar()) {
+                if (is_array($value) && $this->checkDateWithoutJSCalendar($value)) {
+                    $value['date'] = sprintf("%s/%s/%s", $value['day'], $value['month'], $value['year']);
+                }
                 /* Fixed validation if the date was not saved correctly after re-saved the order
                 for example: "09\/24\/2020,2020-09-24 00:00:00" */
                 if (is_string($value) && preg_match('/^\d{1,4}.+\d{1,4}.+\d{1,4},+(\w|\W)*$/', $value)) {
@@ -81,6 +84,9 @@ public function validateUserValue($values)
                 }
                 $dateValid = isset($value['date']) && preg_match('/^\d{1,4}.+\d{1,4}.+\d{1,4}$/', $value['date']);
             } else {
+                if (is_array($value)) {
+                    $value = $this->prepareDateByDateInternal($value);
+                }
                 $dateValid = isset(
                     $value['day']
                 ) && isset(
@@ -411,4 +417,38 @@ protected function _timeExists()
             ]
         );
     }
+
+    /**
+     * Check is date without JS Calendar
+     *
+     * @param array $value
+     *
+     * @return bool
+     */
+    private function checkDateWithoutJSCalendar(array $value): bool
+    {
+        return empty($value['date'])
+            && !empty($value['day'])
+            && !empty($value['month'])
+            && !empty($value['year']);
+    }
+
+    /**
+     * Prepare date by date internal
+     *
+     * @param array $value
+     * @return array
+     */
+    private function prepareDateByDateInternal(array $value): array
+    {
+        if (!empty($value['date']) && !empty($value['date_internal'])) {
+            $formatDate = explode(' ', $value['date_internal']);
+            $date = explode('-', $formatDate[0]);
+            $value['year'] = $date[0];
+            $value['month'] = $date[1];
+            $value['day'] = $date[2];
+        }
+
+        return $value;
+    }
 }
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 393d61b69bf22..bbbe2bee1b205 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -667,12 +667,14 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
             $productOptions = $orderItem->getProductOptions();
             if ($productOptions !== null && !empty($productOptions['options'])) {
                 $formattedOptions = [];
-                $useFrontendCalendar = $this->useFrontendCalendar();
                 foreach ($productOptions['options'] as $option) {
-                    if (in_array($option['option_type'], ['date', 'date_time']) && $useFrontendCalendar) {
+                    if (in_array($option['option_type'], ['date', 'date_time', 'time', 'file'])) {
                         $product->setSkipCheckRequiredOption(false);
-                        break;
+                        $formattedOptions[$option['option_id']] =
+                          $buyRequest->getDataByKey('options')[$option['option_id']];
+                        continue;
                     }
+
                     $formattedOptions[$option['option_id']] = $option['option_value'];
                 }
                 if (!empty($formattedOptions)) {
@@ -2123,17 +2125,4 @@ private function isAddressesAreEqual(Order $order)
 
         return $shippingData == $billingData;
     }
-
-    /**
-     * Use Calendar on frontend or not
-     *
-     * @return bool
-     */
-    private function useFrontendCalendar(): bool
-    {
-        return (bool)$this->_scopeConfig->getValue(
-            'catalog/custom_options/use_calendar',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        );
-    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/ReorderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/ReorderTest.php
new file mode 100644
index 0000000000000..af2cd504a1728
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/ReorderTest.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Sales\Controller\Adminhtml\Order\Create;
+
+use Magento\Customer\Model\Session;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Escaper;
+use Magento\Framework\Registry;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\TestFramework\Core\Version\View;
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+
+/**
+ * Test for reorder controller.
+ *
+ * @see \Magento\Sales\Controller\Adminhtml\Order\Create\Reorder
+ * @magentoAppArea adminhtml
+ */
+class ReorderTest extends AbstractBackendController
+{
+    /** @var OrderInterfaceFactory */
+    private $orderFactory;
+
+    /** @var CartRepositoryInterface */
+    private $quoteRepository;
+
+    /** @var CartInterface */
+    private $quote;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->orderFactory = $this->_objectManager->get(OrderInterfaceFactory::class);
+        $this->quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        if ($this->quote instanceof CartInterface) {
+            $this->quoteRepository->delete($this->quote);
+        }
+
+        parent::tearDown();
+    }
+
+    /**
+     * Reorder with JS calendar options
+     *
+     * @magentoConfigFixture current_store catalog/custom_options/use_calendar 1
+     * @magentoDataFixture Magento/Sales/_files/order_with_date_time_option_product.php
+     *
+     * @return void
+     */
+    public function testReorderAfterJSCalendarEnabled(): void
+    {
+        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
+        $this->dispatchReorderRequest((int)$order->getId());
+        $this->assertRedirect($this->stringContains('backend/sales/order_create'));
+        $this->quote = $this->getQuote('customer@example.com');
+        $this->assertTrue(!empty($this->quote));
+    }
+
+    /**
+     * Dispatch reorder request.
+     *
+     * @param null|int $orderId
+     * @return void
+     */
+    private function dispatchReorderRequest(?int $orderId = null): void
+    {
+        $this->getRequest()->setMethod(Request::METHOD_GET);
+        $this->getRequest()->setParam('order_id', $orderId);
+        $this->dispatch('backend/sales/order_create/reorder');
+    }
+
+    /**
+     * Gets quote by reserved order id.
+     *
+     * @return \Magento\Quote\Api\Data\CartInterface
+     */
+    private function getQuote(string $customerEmail): \Magento\Quote\Api\Data\CartInterface
+    {
+        /** @var SearchCriteriaBuilder $searchCriteriaBuilder */
+        $searchCriteriaBuilder = $this->_objectManager->get(SearchCriteriaBuilder::class);
+        $searchCriteria = $searchCriteriaBuilder->addFilter('customer_email', $customerEmail)
+            ->create();
+
+        /** @var CartRepositoryInterface $quoteRepository */
+        $quoteRepository = $this->_objectManager->get(CartRepositoryInterface::class);
+        $items = $quoteRepository->getList($searchCriteria)->getItems();
+
+        return array_pop($items);
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product.php
new file mode 100644
index 0000000000000..23fbeb94d2004
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple.php');
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+$addressData = include __DIR__ . '/../../../Magento/Sales/_files/address_data.php';
+
+$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
+$billingAddress->setAddressType('billing');
+
+$shippingAddress = clone $billingAddress;
+$shippingAddress->setId(null)->setAddressType('shipping');
+
+$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
+$payment->setMethod('checkmo');
+
+/** @var $product \Magento\Catalog\Model\Product */
+$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
+$repository = $objectManager->create(\Magento\Catalog\Model\ProductRepository::class);
+$product = $repository->get('simple');
+
+$optionValuesByType = [
+    'field' => 'Test value',
+    'date_time' => [
+        'month' => '3',
+        'day' => '5',
+        'year' => '2020',
+        'hour' => '2',
+        'minute' => '15',
+        'day_part' => 'am',
+        'date_internal' => '2020-09-30 02:15:00'
+    ],
+    'drop_down' => '3-1-select',
+    'radio' => '4-1-radio',
+];
+$optionsDate = [
+    [
+        'label' => 'date',
+        'value' => 'Mar 5, 2020',
+        'print_value' => 'Mar 5, 2020',
+        'option_id' => '1',
+        'option_type' => 'date',
+        'option_value' => '2020-03-05 00:00:00',
+        'custom_view' => '',
+    ]
+];
+
+$requestInfo = ['options' => []];
+$productOptions = $product->getOptions();
+foreach ($productOptions as $option) {
+    $requestInfo['options'][$option->getOptionId()] = $optionValuesByType[$option->getType()];
+}
+
+/** @var \Magento\Sales\Model\Order\Item $orderItem */
+$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
+$orderItem->setProductId($product->getId());
+$orderItem->setSku($product->getSku());
+$orderItem->setQtyOrdered(1);
+$orderItem->setBasePrice($product->getPrice());
+$orderItem->setPrice($product->getPrice());
+$orderItem->setRowTotal($product->getPrice());
+$orderItem->setProductType($product->getTypeId());
+$orderItem->setProductOptions([
+    'info_buyRequest' => $requestInfo,
+    'options' => $optionsDate,
+]);
+
+/** @var \Magento\Sales\Model\Order $order */
+$order = $objectManager->create(\Magento\Sales\Model\Order::class);
+$order->setIncrementId('100000001');
+$order->setState(\Magento\Sales\Model\Order::STATE_NEW);
+$order->setStatus($order->getConfig()->getStateDefaultStatus(\Magento\Sales\Model\Order::STATE_NEW));
+$order->setCustomerIsGuest(true);
+$order->setCustomerEmail('customer@example.com');
+$order->setCustomerFirstname('firstname');
+$order->setCustomerLastname('lastname');
+$order->setBillingAddress($billingAddress);
+$order->setShippingAddress($shippingAddress);
+$order->setAddresses([$billingAddress, $shippingAddress]);
+$order->setPayment($payment);
+$order->addItem($orderItem);
+$order->setStoreId($objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId());
+$order->setSubtotal(100);
+$order->setBaseSubtotal(100);
+$order->setBaseGrandTotal(100);
+$order->setCustomerId(1)
+    ->setCustomerIsGuest(false)
+    ->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product_rollback.php
new file mode 100644
index 0000000000000..0966f21645e3b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_date_time_option_product_rollback.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');

From 3ffc2e809d87b45a07dbd3b439523fb30ff1636b Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Tue, 13 Oct 2020 15:17:09 +0300
Subject: [PATCH 517/671] MC-37070: Create automated test for "Import products
 with shared images"

---
 .../Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index 1101b7291528b..c5221f1ae5e76 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -565,7 +565,7 @@ private function duplicateMediaGalleryForProduct(string $imagePath, string $prod
             $linkField => $product->getData($linkField),
         ];
         $connect->insert($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TABLE), $rows);
-        $rows = ['value_id' => $newValueId, 'row_id' => $product->getRowId()];
+        $rows = ['value_id' => $newValueId, $linkField => $product->getData($linkField)];
         $connect->insert($this->galleryResource->getTable(Gallery::GALLERY_VALUE_TO_ENTITY_TABLE), $rows);
     }
 

From e8ad9aee3fe307fce2e0c4b0cdd0661567170ae7 Mon Sep 17 00:00:00 2001
From: Solwininfotech <stdabhoya@yahoo.com>
Date: Tue, 13 Oct 2020 17:51:54 +0530
Subject: [PATCH 518/671] removed .content and .fieldset selectors

---
 .../web/css/source/module/_cart.less                 | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
index 405bc1d2af373..2c8c52bdb7af2 100644
--- a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
+++ b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_cart.less
@@ -727,16 +727,14 @@
                     position: static;
                 }
             }
-            .content {
-                .fieldset {
-                    .actions-toolbar {
-                        width: auto;
-                    }
-                }
-            }
+
             &.discount {
                 width: auto;
             }
+
+            .actions-toolbar {
+                width: auto;
+            }
         }
     }
 

From 80e33111c3325423ea2fbced8094313a34d87cbb Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <1408sheva@gmail.com>
Date: Tue, 13 Oct 2020 15:51:36 +0300
Subject: [PATCH 519/671] MC-37546: Create automated test for "Create new
 Category Update"

---
 .../StorefrontCheckPresentSubCategoryActionGroup.xml            | 2 +-
 .../AdminCategoryBasicFieldSection.xml                          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
index 7d8113f05518b..7cb3287614433 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
@@ -18,6 +18,6 @@
 
         <waitForElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(parenCategoryName)}}" stepKey="waitForTopMenuLoaded"/>
         <moveMouseOver selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(parenCategoryName)}}" stepKey="moveMouseToParentCategory"/>
-        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(childCategoryName)}}" stepKey="seeCategoryUpdated"/>
+        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(childCategoryName)}}" stepKey="seeSubcategoryInTree"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml
index aff7ffe4d5763..1b041c5ca306f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryBasicFieldSection/AdminCategoryBasicFieldSection.xml
@@ -22,5 +22,6 @@
         <element name="FieldError" type="text" selector=".admin__field-error[data-bind='attr: {for: {{field}}}, text: error']" parameterized="true"/>
         <element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
         <element name="productsInCategory" type="input" selector="div[data-index='assign_products']" timeout="30"/>
+        <element name="scheduleDesignUpdateTab" type="block" selector="div[data-index='schedule_design_update']" timeout="15"/>
     </section>
 </sections>

From b0c27189e8e4930ee8dd2acd778c8a35dd4c9bf9 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 13 Oct 2020 16:07:33 +0300
Subject: [PATCH 520/671] MC-38269: [CLARIFICATION] [Magento Cloud] -
 Persistent Shopping cart Header Weelcome & Not you?

---
 .../view/frontend/templates/additional.phtml  |  5 ++-
 .../web/js/view/additional-welcome.js         |  2 +-
 .../Block/Header/AdditionalTest.php           | 33 ++++++++++---------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
index 0c19a1c5c8b05..61feeae04369d 100644
--- a/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
+++ b/app/code/Magento/Persistent/view/frontend/templates/additional.phtml
@@ -5,9 +5,8 @@
  */
 ?>
 <script type="application/javascript">
-    window.persistent = <?= /* @noEscape */ $block->getConfig(); ?>;
-    window.notYou = '<span> <a <?= /* @noEscape */ $block->getLinkAttributes()?>>'
-    + '<?= $block->escapeHtml(__("Not you?"));?></a></span>';
+    window.persistent = <?=/* @noEscape */ $block->getConfig()?>;
+    window.notYouLink = '<?=/* @noEscape */ $block->getLinkAttributes()?>';
 </script>
 <script type="text/x-magento-init">
     {
diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
index fb57d311e35c3..2f5c42f090d18 100644
--- a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
@@ -40,7 +40,7 @@ define([
 
                         $(this).attr('data-bind', html);
                         $(this).html(html);
-                        $(this).after(window.notYou);
+                        $(this).after('<span><a ' + window.notYouLink + '>' + $t('Not you?') + '</a></span>');
                     });
                 }
             }
diff --git a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index c923a809441ba..42390f5303a94 100644
--- a/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -6,41 +6,47 @@
 
 namespace Magento\Persistent\Block\Header;
 
+use Magento\Customer\Model\Session;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Persistent\Helper\Session as SessionHelper;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
 /**
  * @magentoDataFixture Magento/Persistent/_files/persistent.php
  */
-class AdditionalTest extends \PHPUnit\Framework\TestCase
+class AdditionalTest extends TestCase
 {
     /**
-     * @var \Magento\Persistent\Block\Header\Additional
+     * @var Additional
      */
     protected $_block;
 
     /**
-     * @var \Magento\Persistent\Helper\Session
+     * @var SessionHelper
      */
     protected $_persistentSessionHelper;
 
     /**
-     * @var \Magento\Customer\Model\Session
+     * @var Session
      */
     protected $_customerSession;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $_objectManager;
 
     protected function setUp(): void
     {
-        $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+        $this->_objectManager = Bootstrap::getObjectManager();
 
-        /** @var \Magento\Persistent\Helper\Session $persistentSessionHelper */
-        $this->_persistentSessionHelper = $this->_objectManager->create(\Magento\Persistent\Helper\Session::class);
+        /** @var Session $persistentSessionHelper */
+        $this->_persistentSessionHelper = $this->_objectManager->create(Session::class);
 
-        $this->_customerSession = $this->_objectManager->get(\Magento\Customer\Model\Session::class);
+        $this->_customerSession = $this->_objectManager->get(Session::class);
 
-        $this->_block = $this->_objectManager->create(\Magento\Persistent\Block\Header\Additional::class);
+        $this->_block = $this->_objectManager->create(Additional::class);
     }
 
     /**
@@ -54,12 +60,7 @@ protected function setUp(): void
     public function testToHtml()
     {
         $this->_customerSession->loginById(1);
-        $translation = __('Not you?');
-
-        $this->assertStringContainsString(
-            '<a href="' . $this->_block->getHref() . '">' . $translation . '</a>',
-            $this->_block->toHtml()
-        );
+        $this->assertStringContainsString($this->_block->getHref(), $this->_block->toHtml());
         $this->_customerSession->logout();
     }
 }

From 3b2ece2b3f203c67bc0117e74bf5513f26ed2f35 Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Tue, 13 Oct 2020 17:09:57 +0300
Subject: [PATCH 521/671] MC-38113: Same shipping address is repeating multiple
 times in storefront checkout when Reordered

---
 ...oggedInUserCheckoutFillingShippingSectionActionGroup.xml | 6 +++---
 ...sertStorefrontCustomerHasNoOtherAddressesActionGroup.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
index d3127362c637e..4b6680442a470 100644
--- a/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutFillingShippingSectionActionGroup.xml
@@ -24,10 +24,10 @@
         <selectOption selector="{{CheckoutShippingSection.region}}" userInput="{{customerAddressVar.state}}" stepKey="selectRegion"/>
         <fillField selector="{{CheckoutShippingSection.postcode}}" userInput="{{customerAddressVar.postcode}}" stepKey="enterPostcode"/>
         <fillField selector="{{CheckoutShippingSection.telephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
+        <waitForPageLoad stepKey="waitForLoadingMask"/>
         <click selector="{{CheckoutShippingSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod"/>
-        <waitForElement selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForShippingLoadingMask"/>
+        <waitForElementVisible selector="{{CheckoutShippingSection.next}}" time="30" stepKey="waitForNextButton"/>
+        <waitForPageLoad stepKey="waitForShippingLoadingMask"/>
         <click selector="{{CheckoutShippingSection.next}}" stepKey="clickNext"/>
         <waitForElementVisible selector="{{CheckoutPaymentSection.paymentSectionTitle}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
         <seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
index 8634ebb626e6d..1f56ba505128f 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
@@ -11,7 +11,7 @@
         <annotations>
             <description>Verifies customer has no additional address in address book</description>
         </annotations>
-        <amOnPage url="customer/address/" stepKey="goToAddressPage"/>
+        <amOnPage url="{{StorefrontCustomerAddressesPage.url}}" stepKey="goToAddressPage"/>
         <waitForText userInput="You have no other address entries in your address book." selector=".block-addresses-list" stepKey="assertOtherAddresses"/>
     </actionGroup>
 </actionGroups>

From 4e5ac6783aacb9e78b6cdb095ab2297723899e8d Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Tue, 13 Oct 2020 16:15:30 +0200
Subject: [PATCH 522/671] MC-37896: Create automated test for "Reset Widget"

---
 .../AdminSaveAndContinueWidgetActionGroup.xml | 21 ++++++
 .../AdminSetInputTypeAndDesignActionGroup.xml | 22 +++++++
 .../AdminSetWidgetNameAndStoreActionGroup.xml | 24 +++++++
 .../Widget/Test/Mftf/Data/WidgetsData.xml     |  1 +
 .../Mftf/Section/AdminNewWidgetSection.xml    |  4 +-
 .../Test/Mftf/Test/AdminResetWidgetTest.xml   | 65 +++++++++++++++++++
 6 files changed, 136 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
 create mode 100644 app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml

diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
new file mode 100644
index 0000000000000..d480ea685736d
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
@@ -0,0 +1,21 @@
+<!--
+ /**
+  * 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="AdminSaveAndContinueWidgetActionGroup">
+        <annotations>
+            <description>Click on the Save an Continue button and check the success message</description>
+        </annotations>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+        <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageLoad"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
+    </actionGroup>
+</actionGroups>
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.xml
new file mode 100644
index 0000000000000..3071f60bbc9d6
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.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="AdminSetInputTypeAndDesignActionGroup">
+        <annotations>
+            <description>On the widget_instance page select widget type and design</description>
+        </annotations>
+        <arguments>
+            <argument name="widgetType" defaultValue="{{ProductsListWidget.type}}" type="string"/>
+            <argument name="widgetDesign" defaultValue="{{ProductsListWidget.design_theme}}" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widgetType}}" stepKey="setWidgetType"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widgetDesign}}" stepKey="setWidgetDesignTheme"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
new file mode 100644
index 0000000000000..80546b9d5e6df
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
@@ -0,0 +1,24 @@
+<?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="AdminSetWidgetNameAndStoreActionGroup">
+        <annotations>
+            <description>On the widget creation page page set widget name, store add sort order.</description>
+        </annotations>
+        <arguments>
+            <argument name="widgetName" defaultValue="{{ProductsListWidget.name}}" type="string"/>
+            <argument name="widgetStore" defaultValue="{{ProductsListWidget.store_ids}}"  type="string"/>
+            <argument name="widgetSortOrder" defaultValue="{{ProductsListWidget.sort_order}}" type="string"/>
+        </arguments>
+        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetName}}" stepKey="fillTitle"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="[{{widgetStore}}]" stepKey="setWidgetStoreId"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widgetSortOrder}}" stepKey="fillSortOrder"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index ffd2d025548cf..0bac99731ef7b 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -12,6 +12,7 @@
         <data key="type">Catalog Products List</data>
         <data key="design_theme">Magento Luma</data>
         <data key="name" unique="suffix">TestWidget</data>
+        <data key="sort_order">0</data>
         <array key="store_ids">
             <item>All Store Views</item>
         </array>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index c1ff351823823..2e455f4a3470b 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -12,6 +12,7 @@
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
         <element name="continue" type="button" timeout="30" selector="#continue_button"/>
+        <element name="resetBtn" type="button" selector="#reset" timeout="30"/>
         <element name="widgetTitle" type="input" selector="#title"/>
         <element name="widgetStoreIds" type="select" selector="#store_ids"/>
         <element name="widgetSortOrder" type="input" selector="#sort_order"/>
@@ -38,10 +39,11 @@
         <element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
         <element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
         <element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
-        <element name="saveWidget" type="select" selector="#save"/>
+        <element name="saveWidget" type="button" selector="#save"/>
         <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
         <element name="restrictTypes" type="select" selector="select[id*='types']"/>
         <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
+        <element name="widgetInstanceType" type="select" selector="#instance_code" />
         <!-- Catalog Product List Widget Options -->
         <element name="title" type="input" selector="[name='parameters[title]']"/>
         <element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
new file mode 100644
index 0000000000000..3a94871d06e1c
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminResetWidgetTest">
+        <annotations>
+            <features value="Widget"/>
+            <stories value="Reset widget"/>
+            <title value="[CMS Widgets] Reset Widget"/>
+            <description value="Check that admin user can reset widget form after filling out all information"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-37892"/>
+            <group value="widget"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidget">
+                <argument name="widget" value="ProductsListWidget"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+        <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
+        <actionGroup ref="AdminSetInputTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign">
+            <argument name="widgetType" value="{{ProductsListWidget.type}}"/>
+            <argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
+        </actionGroup>
+        <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetInstance"/>
+        <dontSeeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetType}}" stepKey="dontSeeTypeAfterReset"/>
+        <dontSeeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="dontSeeDesignAfterReset"/>
+        <actionGroup ref="AdminSetInputTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset">
+            <argument name="widgetType" value="{{ProductsListWidget.type}}"/>
+            <argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
+        </actionGroup>
+        <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
+        <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStore">
+            <argument name="widgetName" value="{{ProductsListWidget.name}}"/>
+            <argument name="widgetStore" value="{{ProductsListWidget.store_ids}}"/>
+            <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
+        </actionGroup>
+        <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetNameAndStore"/>
+        <dontSeeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="dontSeeNameAfterReset"/>
+        <dontSeeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="dontSeeStoreAfterReset"/>
+        <dontSeeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="dontSeeSortOrderAfterReset"/>
+        <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStoreAfterReset">
+            <argument name="widgetName" value="{{ProductsListWidget.name}}"/>
+            <argument name="widgetStore" value="{{ProductsListWidget.store_ids}}"/>
+            <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidget"/>
+        <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidget"/>
+        <seeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="seeNameAfterReset"/>
+        <seeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="seeStoreAfterReset"/>
+        <seeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="seeSortOrderAfterReset"/>
+        <seeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetInstanceType}}" stepKey="seeTypeAfterReset"/>
+        <seeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="seeThemeAfterReset"/>
+    </test>
+</tests>

From fceacabac975f59d29ef75271c4ad638a349810c Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Tue, 13 Oct 2020 17:31:58 +0300
Subject: [PATCH 523/671] MC-36960: Create automated test for "Create product
 for "all" store views using API service"

---
 .../ProductRepositoryAllStoreViewsTest.php    | 236 ++++++++++++++++++
 1 file changed, 236 insertions(+)
 create mode 100644 dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
new file mode 100644
index 0000000000000..1d3b4ca591c08
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Api;
+
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\WebapiAbstract;
+
+/**
+ * Tests for products creation for all store views.
+ *
+ * @magentoAppIsolation enabled
+ */
+class ProductRepositoryAllStoreViewsTest extends WebapiAbstract
+{
+    const PRODUCT_SERVICE_NAME = 'catalogProductRepositoryV1';
+    const SERVICE_VERSION = 'V1';
+    const PRODUCTS_RESOURCE_PATH = '/V1/products';
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @var string
+     */
+    private $productSku = 'simple';
+
+    /**
+     * @var Link
+     */
+    private $productWebsiteLink;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->productRepository->cleanCache();
+        $this->registry = $this->objectManager->get(Registry::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->productWebsiteLink = $this->objectManager->get(Link::class);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+        $this->productRepository->delete(
+            $this->productRepository->get($this->productSku)
+        );
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', false);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     */
+    public function testCreateProduct(): void
+    {
+        $productData = $this->getProductData();
+        $resultData = $this->saveProduct($productData);
+        $this->assertProductWebsites($this->productSku, $this->getAllWebsiteIds());
+        $this->assertProductData($productData, $resultData, $this->getAllWebsiteIds());
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     * @magentoApiDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     */
+    public function testCreateProductOnMultipleWebsites(): void
+    {
+        $productData = $this->getProductData();
+        $resultData = $this->saveProduct($productData);
+        $this->assertProductWebsites($this->productSku, $this->getAllWebsiteIds());
+        $this->assertProductData($productData, $resultData, $this->getAllWebsiteIds());
+    }
+
+    /**
+     * Saves Product via API.
+     *
+     * @param $product
+     * @return array
+     */
+    private function saveProduct($product): array
+    {
+        $serviceInfo = [
+            'rest' => ['resourcePath' =>self::PRODUCTS_RESOURCE_PATH, 'httpMethod' => Request::HTTP_METHOD_POST],
+            'soap' => [
+                'service' => self::PRODUCT_SERVICE_NAME,
+                'serviceVersion' => self::SERVICE_VERSION,
+                'operation' => self::PRODUCT_SERVICE_NAME . 'Save'
+            ]
+        ];
+        $requestData = ['product' => $product];
+        return $this->_webApiCall($serviceInfo, $requestData, null, 'all');
+    }
+
+    /**
+     * Returns product data.
+     *
+     * @return array
+     */
+    private function getProductData(): array
+    {
+        return [
+                'sku' => $this->productSku,
+                'name' => 'simple',
+                'type_id' => Type::TYPE_SIMPLE,
+                'weight' => 1,
+                'attribute_set_id' => 4,
+                'price' => 10,
+                'status' => 1,
+                'visibility' => 4,
+                'extension_attributes' => [
+                    'stock_item' => ['is_in_stock' => true, 'qty' => 1000]
+                ],
+                'custom_attributes' => [
+                    ['attribute_code' => 'url_key', 'value' => 'simple'],
+                    ['attribute_code' => 'tax_class_id', 'value' => 2],
+                    ['attribute_code' => 'category_ids', 'value' => [333]]
+                ]
+        ];
+    }
+
+    /**
+     * Asserts that product is linked to websites in 'catalog_product_website' table.
+     *
+     * @param string $sku
+     * @param array $websiteIds
+     * @return void
+     */
+    private function assertProductWebsites(string $sku, array $websiteIds): void
+    {
+        $productId = $this->productRepository->get($sku)->getId();
+        $this->assertEquals($websiteIds, $this->productWebsiteLink->getWebsiteIdsByProductId($productId));
+    }
+
+    /**
+     * Asserts result after product creation.
+     *
+     * @param array $productData
+     * @param array $resultData
+     * @param array $websiteIds
+     * @return void
+     */
+    private function assertProductData(array $productData, array $resultData, array $websiteIds): void
+    {
+        foreach ($productData as $key => $value) {
+            if ($key == 'extension_attributes' || $key == 'custom_attributes') {
+                continue;
+            }
+            $this->assertEquals($value, $resultData[$key]);
+        }
+        foreach ($productData['custom_attributes'] as $attribute) {
+            $resultAttribute = $this->getCustomAttributeByCode(
+                $resultData['custom_attributes'],
+                $attribute['attribute_code']
+            );
+            $this->assertEquals($attribute['value'], $resultAttribute['value']);
+        }
+        foreach ($productData['extension_attributes']['stock_item'] as $key => $value) {
+            $this->assertEquals($value, $resultData['extension_attributes']['stock_item'][$key]);
+        }
+        $this->assertEquals($websiteIds, $resultData['extension_attributes']['website_ids']);
+    }
+
+    /**
+     * Get list of all websites IDs.
+     *
+     * @return array
+     */
+    private function getAllWebsiteIds(): array
+    {
+        $websiteIds = [];
+        $websites = $this->storeManager->getWebsites();
+        foreach ($websites as $website) {
+            $websiteIds[] = $website->getId();
+        }
+
+        return $websiteIds;
+    }
+
+    /**
+     * Returns custom attribute data by given code.
+     *
+     * @param array $attributes
+     * @param string $attributeCode
+     * @return array
+     */
+    private function getCustomAttributeByCode(array $attributes, string $attributeCode): array
+    {
+        $items = array_filter(
+            $attributes,
+            function ($attribute) use ($attributeCode) {
+                return $attribute['attribute_code'] == $attributeCode;
+            }
+        );
+
+        return reset($items);
+    }
+}

From 4c1243c56ba28eb8e68a111b34115a91993066f4 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Tue, 13 Oct 2020 17:43:50 +0300
Subject: [PATCH 524/671] MC-36960: Create automated test for "Create product
 for "all" store views using API service"

---
 .../ProductRepositoryAllStoreViewsTest.php    | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
index 1d3b4ca591c08..2950dda4b3c52 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
@@ -7,8 +7,12 @@
 
 namespace Magento\Catalog\Api;
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
+use Magento\Eav\Model\Config;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Webapi\Rest\Request;
@@ -48,14 +52,18 @@ class ProductRepositoryAllStoreViewsTest extends WebapiAbstract
     private $storeManager;
 
     /**
-     * @var string
+     * @var Link
      */
-    private $productSku = 'simple';
+    private $productWebsiteLink;
+    /**
+     * @var Config
+     */
+    private $eavConfig;
 
     /**
-     * @var Link
+     * @var string
      */
-    private $productWebsiteLink;
+    private $productSku = 'simple';
 
     /**
      * @inheritdoc
@@ -66,6 +74,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
         $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
         $this->productRepository->cleanCache();
+        $this->eavConfig = $this->objectManager->get(Config::class);
         $this->registry = $this->objectManager->get(Registry::class);
         $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
         $this->productWebsiteLink = $this->objectManager->get(Link::class);
@@ -137,15 +146,18 @@ private function saveProduct($product): array
      */
     private function getProductData(): array
     {
+        $setId =(int)$this->eavConfig->getEntityType(ProductAttributeInterface::ENTITY_TYPE_CODE)
+            ->getDefaultAttributeSetId();
+
         return [
                 'sku' => $this->productSku,
                 'name' => 'simple',
                 'type_id' => Type::TYPE_SIMPLE,
                 'weight' => 1,
-                'attribute_set_id' => 4,
+                'attribute_set_id' => $setId,
                 'price' => 10,
-                'status' => 1,
-                'visibility' => 4,
+                'status' => Status::STATUS_ENABLED,
+                'visibility' => Visibility::VISIBILITY_BOTH,
                 'extension_attributes' => [
                     'stock_item' => ['is_in_stock' => true, 'qty' => 1000]
                 ],

From 1c2d999aa225cb0f06c80ca34df6b0eb561e68eb Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 13 Oct 2020 18:17:17 +0300
Subject: [PATCH 525/671] MC-29405: PHPStan: "Class does not have a constructor
 and must be instantiated without any parameters" errors

---
 .../Attribute/Backend/BillingTest.php         |  5 +---
 .../Attribute/Backend/ShippingTest.php        |  5 +---
 .../Design/Config/Edit/SaveButtonTest.php     | 23 +------------------
 .../Test/Unit/Topology/QueueInstallerTest.php |  3 +--
 .../Module/Dependency/ServiceLocator.php      |  2 +-
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
index cd7154de14858..4f318948097cc 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
@@ -23,10 +23,7 @@ class BillingTest extends TestCase
 
     protected function setUp(): void
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        /** @var LoggerInterface $logger */
-        $this->testable = new Billing($logger);
+        $this->testable = new Billing();
     }
 
     public function testBeforeSave()
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
index 3947a01582313..6270905ca2e85 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
@@ -23,10 +23,7 @@ class ShippingTest extends TestCase
 
     protected function setUp(): void
     {
-        $logger = $this->getMockBuilder(LoggerInterface::class)
-            ->getMock();
-        /** @var LoggerInterface $logger */
-        $this->testable = new Shipping($logger);
+        $this->testable = new Shipping();
     }
 
     public function testBeforeSave()
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
index 65e2b934741ee..0ce450df39b59 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
@@ -20,16 +20,9 @@ class SaveButtonTest extends TestCase
      */
     protected $block;
 
-    /**
-     * @var Context|MockObject
-     */
-    protected $context;
-
     protected function setUp(): void
     {
-        $this->initContext();
-
-        $this->block = new SaveButton($this->context);
+        $this->block = new SaveButton();
     }
 
     public function testGetButtonData()
@@ -41,18 +34,4 @@ public function testGetButtonData()
         $this->assertArrayHasKey('data_attribute', $result);
         $this->assertIsArray($result['data_attribute']);
     }
-
-    protected function initContext()
-    {
-        $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->context = $this->getMockBuilder(Context::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->context->expects($this->any())
-            ->method('getUrlBuilder')
-            ->willReturn($this->urlBuilder);
-    }
 }
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
index 7493d1691699a..44d33362ae26e 100644
--- a/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/Topology/QueueInstallerTest.php
@@ -16,8 +16,7 @@ class QueueInstallerTest extends TestCase
 {
     public function testInstall()
     {
-        $bindingInstaller = $this->getMockForAbstractClass(QueueConfigItemInterface::class);
-        $model = new QueueInstaller($bindingInstaller);
+        $model = new QueueInstaller();
         $channel = $this->createMock(AMQPChannel::class);
 
         $queue = $this->getMockForAbstractClass(QueueConfigItemInterface::class);
diff --git a/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
index 27f0c7e8e616f..d162d07b38cf8 100644
--- a/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
+++ b/setup/src/Magento/Setup/Module/Dependency/ServiceLocator.php
@@ -95,7 +95,7 @@ public static function getCircularDependenciesReportBuilder()
             self::$circularDependenciesReportBuilder = new CircularReport\Builder(
                 self::getComposerJsonParser(),
                 new CircularReport\Writer(self::getCsvWriter()),
-                new CircularTool([], null)
+                new CircularTool()
             );
         }
         return self::$circularDependenciesReportBuilder;

From 19da476f971c476909713ac6425f454b7ac4cc79 Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Tue, 13 Oct 2020 17:21:26 +0200
Subject: [PATCH 526/671] MC-37896: Create automated test for "Reset Widget"

---
 .../ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml     | 2 --
 .../ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml     | 4 ++--
 .../Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
index d480ea685736d..cd9774f3b13ba 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
@@ -17,5 +17,3 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
     </actionGroup>
 </actionGroups>
-
-
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
index 80546b9d5e6df..f1faadb1e434e 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
@@ -14,11 +14,11 @@
         </annotations>
         <arguments>
             <argument name="widgetName" defaultValue="{{ProductsListWidget.name}}" type="string"/>
-            <argument name="widgetStore" defaultValue="{{ProductsListWidget.store_ids}}"  type="string"/>
+            <argument name="widgetStoreIds" defaultValue="{{ProductsListWidget.store_ids}}"  type="string"/>
             <argument name="widgetSortOrder" defaultValue="{{ProductsListWidget.sort_order}}" type="string"/>
         </arguments>
         <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetName}}" stepKey="fillTitle"/>
-        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="[{{widgetStore}}]" stepKey="setWidgetStoreId"/>
+        <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="{{widgetStoreIds}}" stepKey="setWidgetStoreId"/>
         <fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widgetSortOrder}}" stepKey="fillSortOrder"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
index 3a94871d06e1c..88610d9143bb4 100644
--- a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
@@ -42,7 +42,7 @@
         <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
         <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStore">
             <argument name="widgetName" value="{{ProductsListWidget.name}}"/>
-            <argument name="widgetStore" value="{{ProductsListWidget.store_ids}}"/>
+            <argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
             <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
         </actionGroup>
         <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetNameAndStore"/>
@@ -51,7 +51,7 @@
         <dontSeeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="dontSeeSortOrderAfterReset"/>
         <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStoreAfterReset">
             <argument name="widgetName" value="{{ProductsListWidget.name}}"/>
-            <argument name="widgetStore" value="{{ProductsListWidget.store_ids}}"/>
+            <argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
             <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
         </actionGroup>
         <actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidget"/>

From 6442ec3100fe3b3f420602821e95e68cbb22aaae Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 13 Oct 2020 21:08:22 +0300
Subject: [PATCH 527/671] MC-29414: PHPStan: "Method invoked with X parameters,
 Y required" errors

---
 .../Model/Widget/Grid/AbstractTotals.php      |  8 ++---
 .../Backend/Test/Unit/Helper/DataTest.php     |  1 -
 .../Catalog/Block/Product/View/Details.php    |  3 +-
 .../Model/ResourceModel/Category/Tree.php     |  9 +++++-
 .../Model/ResourceModel/Product/Action.php    |  2 +-
 .../Product/Attribute/RepositoryTest.php      | 11 +------
 .../Product/Option/Validator/SelectTest.php   |  2 +-
 .../Product/Price/PricePersistenceTest.php    |  2 +-
 .../Model/Quote/Item/QuantityValidator.php    |  2 +-
 .../Model/Plugin/AfterProductLoadTest.php     | 16 +---------
 .../Observer/ProcessCronQueueObserverTest.php |  4 ++-
 app/code/Magento/Customer/Model/Address.php   |  4 +--
 .../Customer/Model/ResourceModel/Customer.php |  2 +-
 .../Adminhtml/Index/ViewfileTest.php          |  6 +---
 .../Model/Product/TypeHandler/SampleTest.php  |  2 +-
 .../Unit/Model/Entity/AttributeLoaderTest.php |  6 ++--
 .../Widget/Grid/Column/Renderer/Link.php      |  7 ++--
 .../Integration/Model/Oauth/Consumer.php      | 26 +++++++--------
 .../Magento/Integration/Model/Oauth/Token.php | 24 +++++++-------
 .../Unit/Controller/Partners/IndexTest.php    |  6 ++--
 .../Test/Unit/Model/PartnersTest.php          |  6 ++--
 .../Model/Cron/ReportNewRelicCronTest.php     | 11 +------
 .../Subscriber/Grid/Collection.php            |  3 +-
 .../Product/Gallery/RetrieveImageTest.php     | 32 +++----------------
 app/code/Magento/Quote/Model/QuoteIdMask.php  |  2 +-
 .../Model/ResourceModel/Order/Collection.php  |  2 +-
 .../Magento/Review/Block/Adminhtml/Grid.php   | 15 ++++-----
 app/code/Magento/Sales/Model/Order.php        | 16 +++++-----
 .../Controller/Adminhtml/Order/ViewTest.php   |  5 ++-
 .../Sales/Test/Unit/Helper/DataTest.php       | 27 +++-------------
 .../Swatches/Test/Unit/Helper/DataTest.php    | 28 +++-------------
 .../Unit/Model/SwatchAttributeCodesTest.php   |  9 ++----
 .../System/Design/Theme/Edit/Tab/Css.php      |  6 ++--
 .../Design/Config/Collection.php              |  7 ++--
 .../System/Design/Theme/SaveTest.php          |  2 +-
 .../frontend/templates/html/sections.phtml    |  4 +--
 .../Adapter/Rest/DocumentationGenerator.php   |  2 +-
 .../Framework/Cache/Backend/MongoDbTest.php   |  2 +-
 .../Magento/Framework/Session/ConfigTest.php  | 10 +++---
 .../Magento/Test/Legacy/ObsoleteCodeTest.php  |  4 ++-
 .../Magento/Framework/Backup/Filesystem.php   |  6 +++-
 lib/internal/Magento/Framework/DB/Tree.php    | 12 +++++++
 .../Indexer/Test/Unit/IndexStructureTest.php  |  2 +-
 .../Test/Unit/TypeProcessorTest.php           |  6 ++--
 .../TestFramework/Unit/Block/Adminhtml.php    | 11 ++++---
 lib/internal/Magento/Framework/Url.php        |  2 +-
 .../Magento/Framework/View/Context.php        |  7 ++--
 .../View/Test/Unit/Asset/ConfigTest.php       | 10 +-----
 .../Message/MessageConfigurationsPoolTest.php | 12 +++----
 .../Test/Unit/Model/ModuleUninstallerTest.php | 12 +------
 .../Di/App/Task/OperationFactoryTest.php      |  3 +-
 51 files changed, 160 insertions(+), 259 deletions(-)

diff --git a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
index bb68853dcc08d..dd92661eb9452 100644
--- a/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
+++ b/app/code/Magento/Backend/Model/Widget/Grid/AbstractTotals.php
@@ -117,7 +117,7 @@ protected function _countExpr($expr, $collection)
         foreach ($parsedExpression as $operand) {
             if ($this->_parser->isOperation($operand)) {
                 $this->_checkOperandsSet($firstOperand, $secondOperand, $tmpResult, $result);
-                $result = $this->_operate($firstOperand, $secondOperand, $operand, $tmpResult, $result);
+                $result = $this->_operate($firstOperand, $secondOperand, $operand);
                 $firstOperand = $secondOperand = null;
             } else {
                 if (null === $firstOperand) {
@@ -133,9 +133,9 @@ protected function _countExpr($expr, $collection)
     /**
      * Check if operands in not null and set operands values if they are empty
      *
-     * @param float|int &$firstOperand
-     * @param float|int &$secondOperand
-     * @param float|int &$tmpResult
+     * @param float|int $firstOperand
+     * @param float|int $secondOperand
+     * @param float|int $tmpResult
      * @param float|int $result
      * @return void
      */
diff --git a/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php b/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php
index cfeed42b11ba1..58fec039a90fe 100644
--- a/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Backend/Test/Unit/Helper/DataTest.php
@@ -42,7 +42,6 @@ protected function setUp(): void
             $this->createMock(Auth::class),
             $this->_frontResolverMock,
             $this->createMock(Random::class),
-            $this->getMockForAbstractClass(RequestInterface::class)
         );
     }
 
diff --git a/app/code/Magento/Catalog/Block/Product/View/Details.php b/app/code/Magento/Catalog/Block/Product/View/Details.php
index 67303d177e71e..8a569c268dd1d 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Details.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Details.php
@@ -27,10 +27,11 @@ class Details extends \Magento\Framework\View\Element\Template
      *
      * @return array
      * @since 103.0.1
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getGroupSortedChildNames(string $groupName, string $callback): array
     {
-        $groupChildNames = $this->getGroupChildNames($groupName, $callback);
+        $groupChildNames = $this->getGroupChildNames($groupName);
         $layout = $this->getLayout();
 
         $childNamesSortOrder = [];
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
index 972f11db7aae3..bcfa6ba3f8d0c 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category/Tree.php
@@ -24,6 +24,11 @@ class Tree extends Dbp
 
     const LEVEL_FIELD = 'level';
 
+    /**
+     * @var array
+     */
+    private $_inactiveItems;
+
     /**
      * @var \Magento\Framework\Event\ManagerInterface
      */
@@ -290,7 +295,7 @@ protected function _getDisabledIds($collection, $allIds)
         foreach ($allIds as $id) {
             $parents = $this->getNodeById($id)->getPath();
             foreach ($parents as $parent) {
-                if (!$this->_getItemIsActive($parent->getId(), $storeId)) {
+                if (!$this->_getItemIsActive($parent->getId())) {
                     $disabledIds[] = $id;
                     continue;
                 }
@@ -680,6 +685,8 @@ public function getExistingCategoryIdsBySpecifiedIds($ids)
     }
 
     /**
+     * Get entity methadata pool.
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
index 71ab9413a0d09..85f6269f63af0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Action.php
@@ -160,7 +160,7 @@ protected function _saveAttributeValue($object, $attribute, $value)
         $storeId = (int) $this->_storeManager->getStore($object->getStoreId())->getId();
         $table = $attribute->getBackend()->getTable();
 
-        $entityId = $this->resolveEntityId($object->getId(), $table);
+        $entityId = $this->resolveEntityId($object->getId());
 
         /**
          * If we work in single store mode all values should be saved just
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
index 0c2e5f361413e..673e12a5b42b5 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php
@@ -83,11 +83,6 @@ class RepositoryTest extends TestCase
      */
     protected $searchResultMock;
 
-    /**
-     * @var AttributeOptionManagementInterface|MockObject
-     */
-    private $optionManagementMock;
-
     /**
      * @inheritdoc
      */
@@ -116,8 +111,6 @@ protected function setUp(): void
                     ['getItems', 'getSearchCriteria', 'getTotalCount', 'setItems', 'setSearchCriteria', 'setTotalCount']
                 )
                 ->getMockForAbstractClass();
-        $this->optionManagementMock =
-            $this->getMockForAbstractClass(ProductAttributeOptionManagementInterface::class);
 
         $this->model = new Repository(
             $this->attributeResourceMock,
@@ -126,8 +119,7 @@ protected function setUp(): void
             $this->eavAttributeRepositoryMock,
             $this->eavConfigMock,
             $this->validatorFactoryMock,
-            $this->searchCriteriaBuilderMock,
-            $this->optionManagementMock
+            $this->searchCriteriaBuilderMock
         );
     }
 
@@ -291,7 +283,6 @@ public function testSaveDoesNotSaveAttributeOptionsIfOptionsAreAbsentInPayload()
         // Attribute code must not be changed after attribute creation
         $attributeMock->expects($this->once())->method('setAttributeCode')->with($attributeCode);
         $this->attributeResourceMock->expects($this->once())->method('save')->with($attributeMock);
-        $this->optionManagementMock->expects($this->never())->method('add');
 
         $this->model->save($attributeMock);
     }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
index 11412324b8363..d10f4931a928f 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Option/Validator/SelectTest.php
@@ -66,7 +66,7 @@ protected function setUp(): void
         ];
         $configMock->expects($this->once())->method('getAll')->willReturn($config);
         $methods = ['getTitle', 'getType', 'getPriceType', 'getPrice', 'getData'];
-        $this->valueMock = $this->createPartialMock(Option::class, $methods, []);
+        $this->valueMock = $this->createPartialMock(Option::class, $methods);
         $this->validator = new Select(
             $configMock,
             $priceConfigMock,
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
index cdd5f4d91b653..6f70f7973c10c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Product/Price/PricePersistenceTest.php
@@ -301,7 +301,7 @@ public function testDeleteWithException()
             ->willReturn($idsBySku);
         $this->attributeRepository->expects($this->once())->method('get')->willReturn($this->productAttribute);
         $this->productAttribute->expects($this->once())->method('getAttributeId')->willReturn($attributeId);
-        $this->attributeResource->expects($this->atLeastOnce(2))->method('getConnection')
+        $this->attributeResource->expects($this->atLeastOnce())->method('getConnection')
             ->willReturn($this->connection);
         $this->connection->expects($this->once())->method('beginTransaction')->willReturnSelf();
         $this->attributeResource
diff --git a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
index 2ccb726f2c625..317a573a653e9 100644
--- a/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
+++ b/app/code/Magento/CatalogInventory/Model/Quote/Item/QuantityValidator.php
@@ -193,7 +193,7 @@ public function validate(Observer $observer)
                     $option->setHasError(true);
                     //Setting this to false, so no error statuses are cleared
                     $removeError = false;
-                    $this->addErrorInfoToQuote($result, $quoteItem, $removeError);
+                    $this->addErrorInfoToQuote($result, $quoteItem);
                 }
             }
             if ($removeError) {
diff --git a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php
index d0e34c89b897c..215b31e1b4dad 100644
--- a/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php
+++ b/app/code/Magento/CatalogInventory/Test/Unit/Model/Plugin/AfterProductLoadTest.php
@@ -30,11 +30,6 @@ class AfterProductLoadTest extends TestCase
      */
     protected $productMock;
 
-    /**
-     * @var ProductExtensionFactory|MockObject
-     */
-    protected $productExtensionFactoryMock;
-
     /**
      * @var ProductExtensionInterface|MockObject
      */
@@ -43,16 +38,9 @@ class AfterProductLoadTest extends TestCase
     protected function setUp(): void
     {
         $stockRegistryMock = $this->getMockForAbstractClass(StockRegistryInterface::class);
-        $this->productExtensionFactoryMock = $this->getMockBuilder(
-            ProductExtensionFactory::class
-        )
-            ->setMethods(['create'])
-            ->disableOriginalConstructor()
-            ->getMock();
 
         $this->plugin = new AfterProductLoad(
-            $stockRegistryMock,
-            $this->productExtensionFactoryMock
+            $stockRegistryMock
         );
 
         $productId = 5494;
@@ -88,8 +76,6 @@ public function testAfterLoad()
         $this->productMock->expects($this->once())
             ->method('getExtensionAttributes')
             ->willReturn($this->productExtensionMock);
-        $this->productExtensionFactoryMock->expects($this->never())
-            ->method('create');
 
         $this->assertEquals(
             $this->productMock,
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
index e1e28ff6f06a3..a48a3dd76b884 100644
--- a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
+++ b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -679,6 +679,8 @@ public function dispatchExceptionInCallbackDataProvider()
 
     /**
      * Test case, successfully run job
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testDispatchRunJob()
     {
@@ -764,7 +766,7 @@ function ($callback) {
             ->method('getCollection')->willReturn($this->scheduleCollectionMock);
         $scheduleMock->expects($this->any())
             ->method('getResource')->willReturn($this->scheduleResourceMock);
-        $this->scheduleFactoryMock->expects($this->once(2))
+        $this->scheduleFactoryMock->expects($this->once())
             ->method('create')->willReturn($scheduleMock);
 
         $testCronJob = $this->getMockBuilder('CronJob')
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 241abbb06f8a1..c89821d5c984a 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -15,8 +15,8 @@
  * Customer address model
  *
  * @api
- * @method int getParentId() getParentId()
- * @method \Magento\Customer\Model\Address setParentId() setParentId(int $parentId)
+ * @method int getParentId()
+ * @method \Magento\Customer\Model\Address setParentId(int $parentId)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
index 1477287f79f4b..6ebd6b9410a0c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
@@ -85,7 +85,7 @@ public function __construct(
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
         $this->setType('customer');
-        $this->setConnection('customer_read', 'customer_write');
+        $this->setConnection('customer_read');
         $this->storeManager = $storeManager;
     }
 
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
index 8cb5957cbd672..ea8a37127e85d 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
@@ -257,11 +257,7 @@ public function testExecuteInvalidFile()
 
         $this->urlDecoderMock->expects($this->once())->method('decode')->with($decodedFile)->willReturn($file);
         $fileFactoryMock = $this->createMock(
-            FileFactory::class,
-            [],
-            [],
-            '',
-            false
+            FileFactory::class
         );
 
         $controller = $this->objectManager->getObject(
diff --git a/app/code/Magento/Downloadable/Test/Unit/Model/Product/TypeHandler/SampleTest.php b/app/code/Magento/Downloadable/Test/Unit/Model/Product/TypeHandler/SampleTest.php
index a77ebf9ba7edb..675f900a8b9c1 100644
--- a/app/code/Magento/Downloadable/Test/Unit/Model/Product/TypeHandler/SampleTest.php
+++ b/app/code/Magento/Downloadable/Test/Unit/Model/Product/TypeHandler/SampleTest.php
@@ -96,7 +96,7 @@ protected function setUp(): void
      */
     public function testSave($product, array $data, array $modelData)
     {
-        $link = $this->createSampleModel($product, $modelData, true);
+        $link = $this->createSampleModel($product, $modelData);
         $this->metadataMock->expects($this->once())->method('getLinkField')->willReturn('id');
         $this->sampleFactory->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
index af6ce1bca8f58..6c3c61c4a6ec6 100644
--- a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
+++ b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
@@ -48,13 +48,13 @@ class AttributeLoaderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->configMock = $this->createMock(Config::class, [], [], '', false);
+        $this->configMock = $this->createMock(Config::class);
         $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $this->entityMock = $this->createMock(AbstractEntity::class, [], [], '', false);
-        $this->entityTypeMock = $this->createMock(Type::class, [], [], '', false);
+        $this->entityMock = $this->createMock(AbstractEntity::class);
+        $this->entityTypeMock = $this->createMock(Type::class);
         $this->attributeLoader = new AttributeLoader(
             $this->configMock,
             $this->objectManagerMock
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
index 9a406945f3b96..76667f6060853 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
@@ -81,8 +81,9 @@ public function isDisabled()
     }
 
     /**
-     * Return URL pattern for action associated with the link e.g. "(star)(slash)(star)(slash)activate" ->
-     * will be translated to http://.../admin/integration/activate/id/X
+     * Return URL pattern for action associated with the link e.g. "(star)(slash)(star)(slash)activate"
+     *
+     * Will be translated to http://.../admin/integration/activate/id/X
      *
      * @return string
      */
@@ -164,6 +165,6 @@ protected function _getDataAttributes()
      */
     protected function _getUrl(DataObject $row)
     {
-        return $this->isDisabled($row) ? '#' : $this->getUrl($this->getUrlPattern(), ['id' => $row->getId()]);
+        return $this->isDisabled() ? '#' : $this->getUrl($this->getUrlPattern(), ['id' => $row->getId()]);
     }
 }
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php
index 4442be310b967..b436defcd0cfa 100644
--- a/app/code/Magento/Integration/Model/Oauth/Consumer.php
+++ b/app/code/Magento/Integration/Model/Oauth/Consumer.php
@@ -13,15 +13,15 @@
  * @api
  * @author Magento Core Team <core@magentocommerce.com>
  * @method string getName()
- * @method Consumer setName() setName(string $name)
- * @method Consumer setKey() setKey(string $key)
- * @method Consumer setSecret() setSecret(string $secret)
- * @method Consumer setCallbackUrl() setCallbackUrl(string $url)
- * @method Consumer setCreatedAt() setCreatedAt(string $date)
+ * @method Consumer setName(string $name)
+ * @method Consumer setKey(string $key)
+ * @method Consumer setSecret(string $secret)
+ * @method Consumer setCallbackUrl(string $url)
+ * @method Consumer setCreatedAt(string $date)
  * @method string getUpdatedAt()
- * @method Consumer setUpdatedAt() setUpdatedAt(string $date)
+ * @method Consumer setUpdatedAt(string $date)
  * @method string getRejectedCallbackUrl()
- * @method Consumer setRejectedCallbackUrl() setRejectedCallbackUrl(string $rejectedCallbackUrl)
+ * @method Consumer setRejectedCallbackUrl(string $rejectedCallbackUrl)
  * @since 100.0.2
  */
 class Consumer extends \Magento\Framework\Model\AbstractModel implements ConsumerInterface
@@ -112,7 +112,7 @@ public function beforeSave()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function validate()
     {
@@ -158,7 +158,7 @@ public function loadByKey($key)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getKey()
     {
@@ -166,7 +166,7 @@ public function getKey()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getSecret()
     {
@@ -174,7 +174,7 @@ public function getSecret()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getCallbackUrl()
     {
@@ -182,7 +182,7 @@ public function getCallbackUrl()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getCreatedAt()
     {
@@ -190,7 +190,7 @@ public function getCreatedAt()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function isValidForTokenExchange()
     {
diff --git a/app/code/Magento/Integration/Model/Oauth/Token.php b/app/code/Magento/Integration/Model/Oauth/Token.php
index 53d9ec300a862..7a3580b8bd402 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token.php
@@ -15,27 +15,27 @@
  *
  * @method string getName() Consumer name (joined from consumer table)
  * @method int getConsumerId()
- * @method Token setConsumerId() setConsumerId(int $consumerId)
+ * @method Token setConsumerId(int $consumerId)
  * @method int getAdminId()
- * @method Token setAdminId() setAdminId(int $adminId)
+ * @method Token setAdminId(int $adminId)
  * @method int getCustomerId()
- * @method Token setCustomerId() setCustomerId(int $customerId)
+ * @method Token setCustomerId(int $customerId)
  * @method int getUserType()
- * @method Token setUserType() setUserType(int $userType)
+ * @method Token setUserType(int $userType)
  * @method string getType()
- * @method Token setType() setType(string $type)
+ * @method Token setType(string $type)
  * @method string getCallbackUrl()
- * @method Token setCallbackUrl() setCallbackUrl(string $callbackUrl)
+ * @method Token setCallbackUrl(string $callbackUrl)
  * @method string getCreatedAt()
- * @method Token setCreatedAt() setCreatedAt(string $createdAt)
+ * @method Token setCreatedAt(string $createdAt)
  * @method string getToken()
- * @method Token setToken() setToken(string $token)
+ * @method Token setToken(string $token)
  * @method string getSecret()
- * @method Token setSecret() setSecret(string $tokenSecret)
+ * @method Token setSecret(string $tokenSecret)
  * @method int getRevoked()
- * @method Token setRevoked() setRevoked(int $revoked)
+ * @method Token setRevoked(int $revoked)
  * @method int getAuthorized()
- * @method Token setAuthorized() setAuthorized(int $authorized)
+ * @method Token setAuthorized(int $authorized)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @api
  * @since 100.0.2
@@ -200,7 +200,7 @@ public function createAdminToken($userId)
     public function createCustomerToken($userId)
     {
         $this->setCustomerId($userId);
-        return $this->saveAccessToken(UserContextInterface::USER_TYPE_CUSTOMER, $userId);
+        return $this->saveAccessToken(UserContextInterface::USER_TYPE_CUSTOMER);
     }
 
     /**
diff --git a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php b/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php
index ae4042536eb0c..3f44c5616d597 100644
--- a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php
+++ b/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php
@@ -93,7 +93,7 @@ public function getControllerIndexMock($methods = null)
      */
     public function getLayoutFactoryMock($methods = null)
     {
-        return $this->createPartialMock(LayoutFactory::class, $methods, []);
+        return $this->createPartialMock(LayoutFactory::class, $methods);
     }
 
     /**
@@ -109,7 +109,7 @@ public function getLayoutMock()
      */
     public function getResponseMock($methods = null)
     {
-        return $this->createPartialMock(Response::class, $methods, []);
+        return $this->createPartialMock(Response::class, $methods);
     }
 
     /**
@@ -117,7 +117,7 @@ public function getResponseMock($methods = null)
      */
     public function getRequestMock($methods = null)
     {
-        return $this->createPartialMock(Http::class, $methods, []);
+        return $this->createPartialMock(Http::class, $methods);
     }
 
     /**
diff --git a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php b/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
index 76bb7be6e8b19..59928f40ca599 100644
--- a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
+++ b/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
@@ -140,7 +140,7 @@ public function getPartnersBlockMock($methods = null)
      */
     public function getPartnersModelMock($methods)
     {
-        return $this->createPartialMock(Partners::class, $methods, []);
+        return $this->createPartialMock(Partners::class, $methods);
     }
 
     /**
@@ -150,7 +150,7 @@ public function getPartnersModelMock($methods)
      */
     public function getCurlMock($methods)
     {
-        return $this->createPartialMock(Curl::class, $methods, []);
+        return $this->createPartialMock(Curl::class, $methods);
     }
 
     /**
@@ -160,6 +160,6 @@ public function getCurlMock($methods)
      */
     public function getCacheMock($methods)
     {
-        return $this->createPartialMock(Cache::class, $methods, []);
+        return $this->createPartialMock(Cache::class, $methods);
     }
 }
diff --git a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
index 2a86a9d3018dd..b7ab4bda8da53 100644
--- a/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
+++ b/app/code/Magento/NewRelicReporting/Test/Unit/Model/Cron/ReportNewRelicCronTest.php
@@ -17,7 +17,6 @@
 use Magento\NewRelicReporting\Model\Module\Collect;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class ReportNewRelicCronTest extends TestCase
 {
@@ -61,11 +60,6 @@ class ReportNewRelicCronTest extends TestCase
      */
     protected $deploymentsModel;
 
-    /**
-     * @var LoggerInterface|MockObject
-     */
-    private $logger;
-
     /**
      * Setup
      *
@@ -117,15 +111,13 @@ protected function setUp(): void
         $this->deploymentsFactory->expects($this->any())
             ->method('create')
             ->willReturn($this->deploymentsModel);
-        $this->logger = $this->getMockForAbstractClass(LoggerInterface::class);
 
         $this->model = new ReportNewRelicCron(
             $this->config,
             $this->collect,
             $this->counter,
             $this->cronEventFactory,
-            $this->deploymentsFactory,
-            $this->logger
+            $this->deploymentsFactory
         );
     }
 
@@ -215,7 +207,6 @@ public function testReportNewRelicCronRequestFailed()
             ->method('sendRequest');
 
         $this->cronEventModel->expects($this->once())->method('sendRequest')->willThrowException(new \Exception());
-        $this->logger->expects($this->never())->method('critical');
 
         $this->deploymentsModel->expects($this->any())
             ->method('setDeployment');
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php
index e16effb8c7e12..d0da06553a5f3 100644
--- a/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php
+++ b/app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Grid/Collection.php
@@ -17,7 +17,8 @@ class Collection extends \Magento\Newsletter\Model\ResourceModel\Subscriber\Coll
     protected function _initSelect()
     {
         parent::_initSelect();
-        $this->showCustomerInfo(true)->addSubscriberTypeField()->showStoreInfo();
+        $this->showCustomerInfo()->addSubscriberTypeField()->showStoreInfo();
+
         return $this;
     }
 }
diff --git a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
index 519a8cba014f2..f3d21e97eb9ee 100644
--- a/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
+++ b/app/code/Magento/ProductVideo/Test/Unit/Controller/Adminhtml/Product/Gallery/RetrieveImageTest.php
@@ -181,20 +181,8 @@ public function testExecuteInvalidFileImage()
         $this->request->expects($this->any())->method('getParam')->willReturn(
             'https://example.com/test.jpg'
         );
-        $readInterface = $this->createMock(
-            ReadInterface::class,
-            [],
-            [],
-            '',
-            false
-        );
-        $writeInterface = $this->createMock(
-            WriteInterface::class,
-            [],
-            [],
-            '',
-            false
-        );
+        $readInterface = $this->createMock(ReadInterface::class);
+        $writeInterface = $this->createMock(WriteInterface::class);
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($readInterface);
         $readInterface->expects($this->any())->method('getAbsolutePath')->willReturn('');
         $this->abstractAdapter->expects($this->any())
@@ -217,20 +205,8 @@ public function testExecuteInvalidFileType()
         $this->request->expects($this->any())->method('getParam')->willReturn(
             'https://example.com/test.php'
         );
-        $readInterface = $this->createMock(
-            ReadInterface::class,
-            [],
-            [],
-            '',
-            false
-        );
-        $writeInterface = $this->createMock(
-            WriteInterface::class,
-            [],
-            [],
-            '',
-            false
-        );
+        $readInterface = $this->createMock(ReadInterface::class);
+        $writeInterface = $this->createMock(WriteInterface::class);
         $this->filesystemMock->expects($this->any())->method('getDirectoryRead')->willReturn($readInterface);
         $readInterface->expects($this->any())->method('getAbsolutePath')->willReturn('');
         $this->abstractAdapter->expects($this->never())->method('validateUploadFile');
diff --git a/app/code/Magento/Quote/Model/QuoteIdMask.php b/app/code/Magento/Quote/Model/QuoteIdMask.php
index 47b02db7650df..8fa0b1fbba80c 100644
--- a/app/code/Magento/Quote/Model/QuoteIdMask.php
+++ b/app/code/Magento/Quote/Model/QuoteIdMask.php
@@ -10,7 +10,7 @@
  * QuoteIdMask model
  *
  * @method string getMaskedId()
- * @method QuoteIdMask setMaskedId()
+ * @method QuoteIdMask setMaskedId(string $id)
  */
 class QuoteIdMask extends \Magento\Framework\Model\AbstractModel
 {
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 44571550459c2..47583c27370fb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -159,7 +159,7 @@ public function prepareSummary($range, $customStart, $customEnd, $isFilter = 0)
         if ($this->_isLive) {
             $this->_prepareSummaryLive($range, $customStart, $customEnd, $isFilter);
         } else {
-            $this->_prepareSummaryAggregated($range, $customStart, $customEnd, $isFilter);
+            $this->_prepareSummaryAggregated($range, $customStart, $customEnd);
         }
 
         return $this;
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid.php b/app/code/Magento/Review/Block/Adminhtml/Grid.php
index e20cb7554e094..798d6ae7148af 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid.php
@@ -10,12 +10,11 @@
 /**
  * Adminhtml reviews grid
  *
- * @method int getProductId() getProductId()
- * @method \Magento\Review\Block\Adminhtml\Grid setProductId() setProductId(int $productId)
- * @method int getCustomerId() getCustomerId()
- * @method \Magento\Review\Block\Adminhtml\Grid setCustomerId() setCustomerId(int $customerId)
- * @method \Magento\Review\Block\Adminhtml\Grid setMassactionIdFieldOnlyIndexValue()
- * setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
+ * @method int getProductId()
+ * @method Grid setProductId(int $productId)
+ * @method int getCustomerId()
+ * @method Grid setCustomerId(int $customerId)
+ * @method Grid setMassactionIdFieldOnlyIndexValue(bool $onlyIndex)
  */
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
@@ -110,9 +109,7 @@ protected function _afterLoadCollection()
     }
 
     /**
-     * Prepare collection
-     *
-     * @return \Magento\Review\Block\Adminhtml\Grid
+     * @inheritDoc
      */
     protected function _prepareCollection()
     {
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 0af42b0a99d09..7cb99bc75ba03 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -42,17 +42,17 @@
  *
  * @api
  * @method int getGiftMessageId()
- * @method \Magento\Sales\Model\Order setGiftMessageId(int $value)
+ * @method Order setGiftMessageId(int $value)
  * @method bool hasBillingAddressId()
- * @method \Magento\Sales\Model\Order unsBillingAddressId()
+ * @method Order unsBillingAddressId()
  * @method bool hasShippingAddressId()
- * @method \Magento\Sales\Model\Order unsShippingAddressId()
+ * @method Order unsShippingAddressId()
  * @method int getShippigAddressId()
  * @method bool hasCustomerNoteNotify()
  * @method bool hasForcedCanCreditmemo()
  * @method bool getIsInProcess()
  * @method \Magento\Customer\Model\Customer|null getCustomer()
- * @method \Magento\Sales\Model\Order setSendEmail(bool $value)
+ * @method Order setSendEmail(bool $value)
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -494,7 +494,7 @@ public function setCanSendNewEmailFlag($flag)
      * Load order by system increment identifier
      *
      * @param string $incrementId
-     * @return \Magento\Sales\Model\Order
+     * @return Order
      */
     public function loadByIncrementId($incrementId)
     {
@@ -506,7 +506,7 @@ public function loadByIncrementId($incrementId)
      *
      * @param string $incrementId
      * @param string $storeId
-     * @return \Magento\Sales\Model\Order
+     * @return Order
      */
     public function loadByIncrementIdAndStoreId($incrementId, $storeId)
     {
@@ -1818,7 +1818,7 @@ public function getTotalDue()
         $total = $this->priceCurrency->round($total);
         return max($total, 0);
     }
-    
+
     /**
      * Retrieve order total due value
      *
@@ -2052,7 +2052,7 @@ public function getStoreGroupName()
     {
         $storeId = $this->getStoreId();
         if ($storeId === null) {
-            return $this->getStoreName(1);
+            return $this->getStoreName();
         }
         return $this->getStore()->getGroup()->getName();
     }
diff --git a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php
index 69aa43ceca1e0..2ae5be872e6c4 100644
--- a/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/ViewTest.php
@@ -203,7 +203,7 @@ public function testExecute()
         $id = 111;
         $titlePart = '#111';
         $this->initOrder();
-        $this->initOrderSuccess($id);
+        $this->initOrderSuccess();
         $this->prepareRedirect();
         $this->initAction();
 
@@ -264,10 +264,9 @@ public function testExecuteNoOrder()
      */
     public function testGlobalException()
     {
-        $id = 111;
         $exception = new \Exception();
         $this->initOrder();
-        $this->initOrderSuccess($id);
+        $this->initOrderSuccess();
         $this->prepareRedirect();
 
         $this->resultPageFactoryMock->expects($this->once())
diff --git a/app/code/Magento/Sales/Test/Unit/Helper/DataTest.php b/app/code/Magento/Sales/Test/Unit/Helper/DataTest.php
index 9b2f818aeebb3..75ab7ff0378da 100644
--- a/app/code/Magento/Sales/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Helper/DataTest.php
@@ -9,8 +9,6 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Helper\Context;
-use Magento\Framework\App\State;
-use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Sales\Helper\Data;
 use Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity;
 use Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity;
@@ -21,7 +19,7 @@
 use Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity;
 use Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\Store;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -41,7 +39,7 @@ class DataTest extends TestCase
     protected $scopeConfigMock;
 
     /**
-     * @var MockObject|\Magento\Sales\Model\Store
+     * @var MockObject|Store
      */
     protected $storeMock;
 
@@ -60,26 +58,9 @@ protected function setUp(): void
             ->method('getScopeConfig')
             ->willReturn($this->scopeConfigMock);
 
-        $storeManagerMock = $this->getMockBuilder(StoreManagerInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $appStateMock = $this->getMockBuilder(State::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $pricingCurrencyMock = $this->getMockBuilder(PriceCurrencyInterface::class)
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-
-        $this->helper = new Data(
-            $contextMock,
-            $storeManagerMock,
-            $appStateMock,
-            $pricingCurrencyMock
-        );
+        $this->helper = new Data($contextMock);
 
-        $this->storeMock = $this->getMockBuilder(\Magento\Sales\Model\Store::class)
+        $this->storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
     }
diff --git a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
index 880fbca71dce3..4c1ceecf153dd 100644
--- a/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Helper/DataTest.php
@@ -255,7 +255,7 @@ public function dataForAssembleEavAttribute()
      */
     public function testLoadFirstVariationWithSwatchImage($imageTypes, $expected, $requiredAttributes)
     {
-        $this->getSwatchAttributes($this->productMock);
+        $this->getSwatchAttributes();
         $this->getUsedProducts($imageTypes + $requiredAttributes, $imageTypes);
 
         $result = $this->swatchHelperObject->loadFirstVariationWithSwatchImage($this->productMock, $requiredAttributes);
@@ -295,16 +295,13 @@ public function dataForVariationWithSwatchImage()
         ];
     }
 
-    /**
-     * @dataProvider dataForCreateSwatchProductByFallback
-     */
-    public function testLoadVariationByFallback($product)
+    public function testLoadVariationByFallback()
     {
         $metadataMock = $this->getMockForAbstractClass(EntityMetadataInterface::class);
         $this->metaDataPoolMock->expects($this->once())->method('getMetadata')->willReturn($metadataMock);
         $metadataMock->expects($this->once())->method('getLinkField')->willReturn('id');
 
-        $this->getSwatchAttributes($product);
+        $this->getSwatchAttributes();
 
         $this->prepareVariationCollection();
 
@@ -321,7 +318,7 @@ public function testLoadVariationByFallback($product)
      */
     public function testLoadFirstVariationWithImage($imageTypes, $expected, $requiredAttributes)
     {
-        $this->getSwatchAttributes($this->productMock);
+        $this->getSwatchAttributes();
         $this->getUsedProducts($imageTypes + $requiredAttributes, $imageTypes);
 
         $result = $this->swatchHelperObject->loadFirstVariationWithImage($this->productMock, $requiredAttributes);
@@ -592,23 +589,6 @@ public function dataForCreateSwatchProduct()
         ];
     }
 
-    /**
-     * @return array
-     */
-    public function dataForCreateSwatchProductByFallback()
-    {
-        $productMock = $this->createMock(Product::class);
-
-        return [
-            [
-                95,
-            ],
-            [
-                $productMock,
-            ],
-        ];
-    }
-
     /**
      * @dataProvider dataForGettingSwatchAsArray
      */
diff --git a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeCodesTest.php b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeCodesTest.php
index 29eb752bb3c57..c952cd3c2e6a2 100644
--- a/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeCodesTest.php
+++ b/app/code/Magento/Swatches/Test/Unit/Model/SwatchAttributeCodesTest.php
@@ -90,17 +90,12 @@ public function testGetCodes($swatchAttributeCodesCache, $expected)
             ->withConsecutive(
                 [
                     self::identicalTo(
-                        ['a' => self::ATTRIBUTE_TABLE],
-                        [
-                            'attribute_id' => 'a.attribute_id',
-                            'attribute_code' => 'a.attribute_code',
-                        ]
+                        ['a' => self::ATTRIBUTE_TABLE]
                     )
                 ],
                 [
                     self::identicalTo(
-                        ['o' => self::ATTRIBUTE_OPTION_TABLE],
-                        ['attribute_id' => 'o.attribute_id']
+                        ['o' => self::ATTRIBUTE_OPTION_TABLE]
                     )
                 ]
             )
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 2d55bbce2ec2c..5e3bb8774d246 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -194,8 +194,7 @@ protected function _addCustomCssFieldset()
                         Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE
                     ]
                 ) . "', null, null,'" . $this->escapeJs(
-                    __('Upload Images'),
-                    true
+                    __('Upload Images')
                 ) . "');",
             ]
         );
@@ -222,8 +221,7 @@ protected function _addCustomCssFieldset()
                         Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT
                     ]
                 ) . "', null, null,'" . $this->escapeJs(
-                    __('Upload Fonts'),
-                    true
+                    __('Upload Fonts')
                 ) . "');",
             ]
         );
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php
index 3a19ff99a9270..6db521978cfab 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php
@@ -77,12 +77,13 @@ protected function _afterLoad()
                 'value',
                 $this->valueProcessor->process(
                     $item->getData('value'),
-                    $this->getData('scope'),
-                    $this->getData('scope_id'),
+                    $item->getData('scope'),
+                    $item->getData('scope_id'),
                     $item->getData('path')
                 )
             );
         }
-        parent::_afterLoad();
+
+        return parent::_afterLoad();
     }
 }
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php
index b2641d304fb84..f14b176e95e5c 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php
@@ -57,7 +57,7 @@ public function testSaveAction()
             ->with('js_order')
             ->willReturn($jsOrder);
 
-        $this->_request->expects($this->once(5))->method('getPostValue')->willReturn(true);
+        $this->_request->expects($this->once())->method('getPostValue')->willReturn(true);
 
         $themeMock = $this->getMockBuilder(Theme::class)
             ->addMethods(['setCustomization'])
diff --git a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
index 7f1128b3b07c7..9c6cf4fa07cf2 100644
--- a/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/html/sections.phtml
@@ -11,12 +11,12 @@
 $group = $block->getGroupName();
 $groupCss = $block->getGroupCss();
 ?>
-<?php if ($detailedInfoGroup = $block->getGroupChildNames($group, 'getChildHtml')) :?>
+<?php if ($detailedInfoGroup = $block->getGroupChildNames($group)):?>
     <div class="sections <?= $block->escapeHtmlAttr($groupCss) ?>">
         <?php $layout = $block->getLayout(); ?>
         <div class="section-items <?= $block->escapeHtmlAttr($groupCss) ?>-items"
              data-mage-init='{"tabs":{"openedState":"active"}}'>
-            <?php foreach ($detailedInfoGroup as $name) :?>
+            <?php foreach ($detailedInfoGroup as $name):?>
                 <?php
                     $html = $layout->renderElement($name);
                 if (!trim($html) && ($block->getUseForce() != true)) {
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/DocumentationGenerator.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/DocumentationGenerator.php
index 32f7f4aa3a8a6..945dc935d440c 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/DocumentationGenerator.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest/DocumentationGenerator.php
@@ -23,7 +23,7 @@ class DocumentationGenerator
     public function generateDocumentation($httpMethod, $resourcePath, $arguments, $response)
     {
         $content = $this->generateHtmlContent($httpMethod, $resourcePath, $arguments, $response);
-        $filePath = $this->generateFileName($resourcePath);
+        $filePath = $this->generateFileName();
         if ($filePath === null) {
             return;
         }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Cache/Backend/MongoDbTest.php b/dev/tests/integration/testsuite/Magento/Framework/Cache/Backend/MongoDbTest.php
index f4cec6e80aa36..82512c0bd37ff 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Cache/Backend/MongoDbTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Cache/Backend/MongoDbTest.php
@@ -203,7 +203,7 @@ public function testSave()
         $actualData = $this->_model->load($cacheId);
         $this->assertEquals($data, $actualData);
         $actualMetadata = $this->_model->getMetadatas($cacheId);
-        $this->arrayHasKey('tags', $actualMetadata);
+        $this->arrayHasKey('tags');
         $this->assertEquals($tags, $actualMetadata['tags']);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
index bed9a33c73148..095e70a6d0e1a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -12,8 +12,6 @@
 
     use Magento\Framework\App\Filesystem\DirectoryList;
 
-    // @codingStandardsIgnoreEnd
-
     /**
      * Mock ini_get global function
      *
@@ -37,6 +35,8 @@ function ini_get($varName)
         return call_user_func_array('\ini_get', func_get_args());
     }
 
+    // @codingStandardsIgnoreEnd
+
     /**
      * @magentoAppIsolation enabled
      */
@@ -181,7 +181,7 @@ public function testSettingInvalidCookieLifetime()
             $model->setCookieLifetime('foobar_bogus');
             $this->assertEquals($preVal, $model->getCookieLifetime());
         }
-      
+
         public function testSettingInvalidCookieLifetime2()
         {
             $model = $this->getModel();
@@ -193,8 +193,8 @@ public function testSettingInvalidCookieLifetime2()
         public function testWrongMethodCall()
         {
             $model = $this->getModel();
-            $this->expectException(
-                '\BadMethodCallException',
+            $this->expectException(\BadMethodCallException::class);
+            $this->expectExceptionMessage(
                 'Method "methodThatNotExist" does not exist in Magento\Framework\Session\Config'
             );
             $model->methodThatNotExist();
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 62baa3ab07568..cd1cb7bf14b98 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -169,7 +169,7 @@ public function testXmlFiles()
         $invoker(
             function ($file) {
                 $content = file_get_contents($file);
-                $this->_testObsoleteClasses($content, $file);
+                $this->_testObsoleteClasses($content);
                 $this->_testObsoleteNamespaces($content);
                 $this->_testObsoletePaths($file);
             },
@@ -950,8 +950,10 @@ private function getBlacklistFiles($absolutePath = false)
         $appPath = BP;
         foreach ($blackList as $file) {
             if ($absolutePath) {
+                // phpcs:ignore
                 $ignored = array_merge($ignored, glob($appPath . DIRECTORY_SEPARATOR . $file, GLOB_NOSORT));
             } else {
+                // phpcs:ignore
                 $ignored = array_merge($ignored, $this->processPattern($appPath, $file));
             }
         }
diff --git a/lib/internal/Magento/Framework/Backup/Filesystem.php b/lib/internal/Magento/Framework/Backup/Filesystem.php
index 72996cdd28fda..299bf88c1c409 100644
--- a/lib/internal/Magento/Framework/Backup/Filesystem.php
+++ b/lib/internal/Magento/Framework/Backup/Filesystem.php
@@ -294,7 +294,7 @@ protected function _checkBackupsDir()
             }
 
             mkdir($backupsDir);
-            chmod($backupsDir);
+            chmod($backupsDir, 0755);
         }
 
         if (!is_writable($backupsDir)) {
@@ -316,6 +316,8 @@ protected function _getTarTmpPath()
     }
 
     /**
+     * Get rollback FTP
+     *
      * @return Ftp
      * @deprecated 101.0.0
      */
@@ -332,6 +334,8 @@ protected function getRollBackFtp()
     }
 
     /**
+     * Get rollback FS
+     *
      * @return Fs
      * @deprecated 101.0.0
      */
diff --git a/lib/internal/Magento/Framework/DB/Tree.php b/lib/internal/Magento/Framework/DB/Tree.php
index 6fbd014213bc8..3718c55f61c8a 100644
--- a/lib/internal/Magento/Framework/DB/Tree.php
+++ b/lib/internal/Magento/Framework/DB/Tree.php
@@ -93,6 +93,7 @@ public function __construct($config = [])
 
             // use an object from the registry?
             if (is_string($connection)) {
+                /** @phpstan-ignore-next-line */
                 $connection = \Zend::registry($connection);
             }
 
@@ -358,6 +359,7 @@ public function appendChild($nodeId, $data)
             } catch (\Exception $e) {
                 $this->_db->rollBack();
                 echo $e->getMessage();
+                /** @phpstan-ignore-next-line */
                 echo $sql;
                 exit;
             }
@@ -833,6 +835,7 @@ public function moveNodes($eId, $pId, $aId = 0)
         if ($pId == 0) {
             $levelUp = 0;
         } else {
+            /** @phpstan-ignore-next-line */
             $levelUp = $pInfo[$this->_level];
         }
 
@@ -844,15 +847,20 @@ public function moveNodes($eId, $pId, $aId = 0)
             $rightKeyNear = $this->_db->fetchOne('SELECT MAX(' . $this->_right . ') FROM ' . $this->_table);
         } elseif ($aId != 0 && $pId == $eInfo[$this->_pid]) {
             // if we have after ID
+            /** @phpstan-ignore-next-line */
             $rightKeyNear = $aInfo[$this->_right];
+            /** @phpstan-ignore-next-line */
             $leftKeyNear = $aInfo[$this->_left];
         } elseif ($aId == 0 && $pId == $eInfo[$this->_pid]) {
             // if we do not have after ID
+            /** @phpstan-ignore-next-line */
             $rightKeyNear = $pInfo[$this->_left];
         } elseif ($pId != $eInfo[$this->_pid]) {
+            /** @phpstan-ignore-next-line */
             $rightKeyNear = $pInfo[$this->_right] - 1;
         }
 
+        /** @phpstan-ignore-next-line */
         $skewLevel = $pInfo[$this->_level] - $eInfo[$this->_level] + 1;
         $skewTree = $eInfo[$this->_right] - $eInfo[$this->_left] + 1;
 
@@ -996,12 +1004,14 @@ public function moveNodes($eId, $pId, $aId = 0)
 
         $this->_db->beginTransaction();
         try {
+            /** @phpstan-ignore-next-line */
             $this->_db->query($sql);
             $this->_db->commit();
         } catch (\Exception $e) {
             $this->_db->rollBack();
             echo $e->getMessage();
             echo "<br>\r\n";
+            /** @phpstan-ignore-next-line */
             echo $sql;
             echo "<br>\r\n";
             exit;
@@ -1052,6 +1062,7 @@ public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
             exit;
         }
 
+        /** @phpstan-ignore-next-line */
         $dbSelect = new Select($this->_db);
         $dbSelect->from(
             $this->_table
@@ -1092,6 +1103,7 @@ public function getChildren($nodeId, $startLevel = 0, $endLevel = 0)
      */
     public function getNode($nodeId)
     {
+        /** @phpstan-ignore-next-line */
         $dbSelect = new Select($this->_db);
         $dbSelect->from($this->_table)->where($this->_table . '.' . $this->_id . ' >= :id');
 
diff --git a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
index da286bd8cd6e8..c03875f0a2fd2 100644
--- a/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
+++ b/lib/internal/Magento/Framework/Indexer/Test/Unit/IndexStructureTest.php
@@ -167,7 +167,7 @@ public function testCreateWithEmptyFields()
             ->method('resolve')
             ->with($index, $dimensions)
             ->willReturn($index . '_flat');
-        $position = $this->mockFulltextTable($position, $expectedTable, true);
+        $position = $this->mockFulltextTable($position, $expectedTable);
         $this->mockFlatTable($position, $index . '_flat');
 
         $this->target->create($index, $fields, $dimensions);
diff --git a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
index f1707fff7786b..a955e5cff2df8 100644
--- a/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
+++ b/lib/internal/Magento/Framework/Reflection/Test/Unit/TypeProcessorTest.php
@@ -221,9 +221,9 @@ public function testProcessSimpleTypeStringArrayToIntArray()
      */
     public function testProcessSimpleTypeException($value, $type)
     {
-        $this->expectException(
-            SerializationException::class,
-            'Invalid type for value: "' . $value . '". Expected Type: "' . $type . '"'
+        $this->expectException(SerializationException::class);
+        $this->expectExceptionMessage(
+            "The \"$value\" value's type is invalid. The \"$type\" type was expected. Verify and try again."
         );
         $this->typeProcessor->processSimpleAndAnyType($value, $type);
     }
diff --git a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
index f8bb912ea6c85..5b86d46452e33 100644
--- a/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
+++ b/lib/internal/Magento/Framework/TestFramework/Unit/Block/Adminhtml.php
@@ -108,6 +108,7 @@ class Adminhtml extends \PHPUnit\Framework\TestCase
     protected $_formKey;
 
     /**
+     * @inheritDoc
      */
     protected function setUp(): void
     {
@@ -150,6 +151,7 @@ protected function setUp(): void
             [$this, 'translateCallback']
         );
 
+        /** @phpstan-ignore-next-line */
         $this->_context = new \Magento\Backend\Block\Template\Context(
             $this->_requestMock,
             $this->_layoutMock,
@@ -194,11 +196,10 @@ protected function _makeMock($className)
     /**
      * Sets up a stubbed method with specified behavior and expectations
      *
-     * @param \PHPUnit_Framework_MockObject_MockObject                       $object
-     * @param string                                                        $stubName
-     * @param mixed                                                         $return
-     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount|null        $expects
-     *
+     * @param \PHPUnit_Framework_MockObject_MockObject $object
+     * @param string $stubName
+     * @param mixed $return
+     * @param \PHPUnit\Framework\MockObject\Matcher\InvokedCount|null $expects
      * @return \PHPUnit\Framework\MockObject\Builder\InvocationMocker
      */
     protected function _setStub(
diff --git a/lib/internal/Magento/Framework/Url.php b/lib/internal/Magento/Framework/Url.php
index 1d00b732c5795..d63632fafc7d3 100644
--- a/lib/internal/Magento/Framework/Url.php
+++ b/lib/internal/Magento/Framework/Url.php
@@ -935,7 +935,7 @@ private function createUrl($routePath = null, array $routeParams = null)
             if (is_string($query)) {
                 $this->_setQuery($query);
             } elseif (is_array($query)) {
-                $this->addQueryParams($query, !empty($routeParams['_current']));
+                $this->addQueryParams($query);
             }
             if ($query === false) {
                 $this->addQueryParams([]);
diff --git a/lib/internal/Magento/Framework/View/Context.php b/lib/internal/Magento/Framework/View/Context.php
index 8503c48d135c2..f781dc40ba39c 100644
--- a/lib/internal/Magento/Framework/View/Context.php
+++ b/lib/internal/Magento/Framework/View/Context.php
@@ -27,6 +27,7 @@
  *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @api
  * @since 100.0.2
  */
@@ -383,7 +384,7 @@ public function getFullActionName()
     public function getAcceptType()
     {
         // TODO: do intelligence here
-        $type = $this->getHeader('Accept', 'html');
+        $type = $this->getHeader('Accept') ?: 'html';
         if (strpos($type, 'json') !== false) {
             return 'json';
         } elseif (strpos($type, 'soap') !== false) {
@@ -486,7 +487,9 @@ protected function getPhysicalTheme(Design\ThemeInterface $theme)
             $result = $result->getParentTheme();
         }
         if (!$result) {
-            throw new \Exception("Unable to find a physical ancestor for a theme '{$theme->getThemeTitle()}'.");
+            throw new \InvalidArgumentException(
+                "Unable to find a physical ancestor for a theme '{$theme->getThemeTitle()}'."
+            );
         }
         return $result;
     }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php
index 3f7a700ffb212..a3ded21f2c907 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/ConfigTest.php
@@ -24,11 +24,6 @@ class ConfigTest extends BaseTestCase
      */
     private $scopeConfigMock;
 
-    /**
-     * @var MockObject|State
-     */
-    private $appStateMock;
-
     /**
      * @var Config
      */
@@ -41,10 +36,7 @@ protected function setUp(): void
     {
         $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->getMockForAbstractClass();
-        $this->appStateMock = $this->getMockBuilder(State::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->model = new Config($this->scopeConfigMock, $this->appStateMock);
+        $this->model = new Config($this->scopeConfigMock);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php
index 5974042ef9777..467f9485f77b6 100644
--- a/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php
+++ b/lib/internal/Magento/Framework/View/Test/Unit/Element/Message/MessageConfigurationsPoolTest.php
@@ -41,10 +41,8 @@ public function testGetMessageConfiguration()
      */
     public function testConstructNoRendererException(array $configuration)
     {
-        static::expectException(
-            '\InvalidArgumentException',
-            'Renderer should be defined.'
-        );
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Renderer should be defined.');
 
         new MessageConfigurationsPool($configuration);
     }
@@ -67,10 +65,8 @@ public function wrongRenderersDataProvider()
      */
     public function testConstructWrongDataException(array $configuration)
     {
-        static::expectException(
-            '\InvalidArgumentException',
-            'Data should be of array type.'
-        );
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Data should be of array type.');
 
         new MessageConfigurationsPool($configuration);
     }
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
index bc0050513ad85..b5e616a95437c 100644
--- a/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Model/ModuleUninstallerTest.php
@@ -15,7 +15,6 @@
 use Magento\Framework\Setup\Patch\PatchApplier;
 use Magento\Framework\Setup\UninstallInterface;
 use Magento\Setup\Model\ModuleContext;
-use Magento\Setup\Model\ModuleRegistryUninstaller;
 use Magento\Setup\Model\ModuleUninstaller;
 use Magento\Setup\Model\ObjectManagerProvider;
 use Magento\Setup\Model\UninstallCollector;
@@ -60,11 +59,6 @@ class ModuleUninstallerTest extends TestCase
      */
     private $output;
 
-    /**
-     * @var MockObject|ModuleRegistryUninstaller
-     */
-    private $moduleRegistryUninstaller;
-
     /**
      * @var PatchApplier|MockObject
      */
@@ -72,7 +66,6 @@ class ModuleUninstallerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->moduleRegistryUninstaller = $this->createMock(ModuleRegistryUninstaller::class);
         $this->objectManager = $this->getMockForAbstractClass(
             ObjectManagerInterface::class,
             [],
@@ -94,8 +87,7 @@ protected function setUp(): void
             $objectManagerProvider,
             $this->remove,
             $this->collector,
-            $setupFactory,
-            $this->moduleRegistryUninstaller
+            $setupFactory
         );
 
         $this->output = $this->getMockForAbstractClass(OutputInterface::class);
@@ -103,7 +95,6 @@ protected function setUp(): void
 
     public function testUninstallRemoveData()
     {
-        $this->moduleRegistryUninstaller->expects($this->never())->method($this->anything());
         $uninstall = $this->getMockForAbstractClass(UninstallInterface::class, [], '', false);
         $uninstall->expects($this->atLeastOnce())
             ->method('uninstall')
@@ -136,7 +127,6 @@ public function testUninstallRemoveData()
 
     public function testUninstallRemoveCode()
     {
-        $this->moduleRegistryUninstaller->expects($this->never())->method($this->anything());
         $this->output->expects($this->once())->method('writeln');
         $packageInfoFactory = $this->createMock(PackageInfoFactory::class);
         $packageInfo = $this->createMock(PackageInfo::class);
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
index 4682b0b035798..b2af18b34959a 100644
--- a/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
+++ b/setup/src/Magento/Setup/Test/Unit/Module/Di/App/Task/OperationFactoryTest.php
@@ -65,8 +65,7 @@ public function testCreateException()
         $notRegisteredOperation = 'coffee';
         $this->expectException(OperationException::class);
         $this->expectExceptionMessage(
-            sprintf('Unrecognized operation "%s"', $notRegisteredOperation),
-            OperationException::UNAVAILABLE_OPERATION
+            sprintf('Unrecognized operation "%s"', $notRegisteredOperation)
         );
         $this->factory->create($notRegisteredOperation);
     }

From cd42c9d4a41512cf4a978120fcbeaac3d17d9e24 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 13 Oct 2020 22:57:16 +0300
Subject: [PATCH 528/671] MC-38074: Report - Products in Carts not following
 user roles scope

---
 .../Reports/Block/Adminhtml/Grid/Shopcart.php |   5 +
 .../Block/Adminhtml/Grid/ShopcartTest.php     | 110 ++++++++++++++++++
 2 files changed, 115 insertions(+)
 create mode 100644 app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/ShopcartTest.php

diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
index afa0ce79aca6e..1d65dd5874c6e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
@@ -28,6 +28,7 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
 
     /**
      * StoreIds setter
+     *
      * @codeCoverageIgnore
      *
      * @param array $storeIds
@@ -46,6 +47,10 @@ public function setStoreIds($storeIds)
      */
     public function getCurrentCurrencyCode()
     {
+        if (empty($this->_storeIds)) {
+            $this->setStoreIds(array_keys($this->_storeManager->getStores()));
+        }
+
         if ($this->_currentCurrencyCode === null) {
             reset($this->_storeIds);
             $this->_currentCurrencyCode = count(
diff --git a/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/ShopcartTest.php b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/ShopcartTest.php
new file mode 100644
index 0000000000000..25dcccdb1ef7a
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Unit/Block/Adminhtml/Grid/ShopcartTest.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Reports\Test\Unit\Block\Adminhtml\Grid;
+
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Reports\Block\Adminhtml\Grid\Shopcart;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for class \Magento\Reports\Block\Adminhtml\Grid\Shopcart.
+ */
+class ShopcartTest extends TestCase
+{
+    /**
+     * @var Shopcart|MockObject
+     */
+    private $model;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManagerMock;
+
+    protected function setUp(): void
+    {
+        $objectManager = new ObjectManager($this);
+
+        $this->storeManagerMock = $this->getMockForAbstractClass(
+            StoreManagerInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getStore']
+        );
+
+        $this->model = $objectManager->getObject(
+            Shopcart::class,
+            ['_storeManager' => $this->storeManagerMock]
+        );
+    }
+
+    /**
+     * @param $storeIds
+     *
+     * @dataProvider getCurrentCurrencyCodeDataProvider
+     */
+    public function testGetCurrentCurrencyCode($storeIds)
+    {
+        $storeMock = $this->getMockForAbstractClass(
+            StoreInterface::class,
+            [],
+            '',
+            true,
+            true,
+            true,
+            ['getBaseCurrencyCode']
+        );
+
+        $this->model->setStoreIds($storeIds);
+
+        if ($storeIds) {
+            $expectedCurrencyCode = 'EUR';
+            $this->storeManagerMock->expects($this->once())
+                ->method('getStore')
+                ->with($storeIds[0])
+                ->willReturn($storeMock);
+            $storeMock->expects($this->once())
+                ->method('getBaseCurrencyCode')
+                ->willReturn($expectedCurrencyCode);
+        } else {
+            $expectedCurrencyCode = 'USD';
+            $this->storeManagerMock->expects($this->once())
+                ->method('getStore')
+                ->with(1)
+                ->willReturn($storeMock);
+            $this->storeManagerMock->expects($this->once())
+                ->method('getStores')
+                ->willReturn([1 => $storeMock]);
+            $storeMock->expects($this->once())
+                ->method('getBaseCurrencyCode')
+                ->willReturn($expectedCurrencyCode);
+        }
+
+        $currencyCode = $this->model->getCurrentCurrencyCode();
+        $this->assertEquals($expectedCurrencyCode, $currencyCode);
+    }
+
+    /**
+     * DataProvider for testGetCurrentCurrencyCode.
+     *
+     * @return array
+     */
+    public function getCurrentCurrencyCodeDataProvider()
+    {
+        return [
+            [[]],
+            [[2]],
+        ];
+    }
+}

From ab42ff6465bf58a53b83810278b37085ff4e93aa Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Tue, 13 Oct 2020 16:15:04 -0500
Subject: [PATCH 529/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Indexer/Product/Price/Action/Rows.php     |   1 -
 .../Indexer/Product/Price/Action/RowsTest.php | 161 +++++++++++++++++-
 2 files changed, 156 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
index ce2f1ff75adbe..dfeb5b6bfea26 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
@@ -13,7 +13,6 @@
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
 use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Store\Model\StoreManagerInterface;
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
index 4242ab7b2e914..9fd86e81c7a51 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
@@ -7,27 +7,178 @@
 
 namespace Magento\Catalog\Test\Unit\Model\Indexer\Product\Price\Action;
 
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\Factory;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\DefaultPrice;
+use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\TierPrice;
+use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
 use Magento\Catalog\Model\Indexer\Product\Price\Action\Rows;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Indexer\MultiDimensionProvider;
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class RowsTest extends TestCase
 {
     /**
      * @var Rows
      */
-    protected $_model;
+    private $actionRows;
+
+    /**
+     * @var ScopeConfigInterface|MockObject
+     */
+    private $config;
+
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private $storeManager;
+
+    /**
+     * @var CurrencyFactory|MockObject
+     */
+    private $currencyFactory;
+
+    /**
+     * @var TimezoneInterface|MockObject
+     */
+    private $localeDate;
+
+    /**
+     * @var DateTime|MockObject
+     */
+    private $dateTime;
+
+    /**
+     * @var Type|MockObject
+     */
+    private $catalogProductType;
+
+    /**
+     * @var Factory|MockObject
+     */
+    private $indexerPriceFactory;
+
+    /**
+     * @var DefaultPrice|MockObject
+     */
+    private $defaultIndexerResource;
+
+    /**
+     * @var TierPrice|MockObject
+     */
+    private $tierPriceIndexResource;
+
+    /**
+     * @var DimensionCollectionFactory|MockObject
+     */
+    private $dimensionCollectionFactory;
+
+    /**
+     * @var TableMaintainer|MockObject
+     */
+    private $tableMaintainer;
 
     protected function setUp(): void
     {
-        $objectManager = new ObjectManager($this);
-        $this->_model = $objectManager->getObject(Rows::class);
+        $this->config = $this->getMockBuilder(ScopeConfigInterface::class)
+            ->getMockForAbstractClass();
+        $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $this->currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->localeDate = $this->getMockBuilder(TimezoneInterface::class)
+            ->getMockForAbstractClass();
+        $this->dateTime = $this->getMockBuilder(DateTime::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->catalogProductType = $this->getMockBuilder(Type::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->indexerPriceFactory = $this->getMockBuilder(Factory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->defaultIndexerResource = $this->getMockBuilder(DefaultPrice::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->tierPriceIndexResource = $this->getMockBuilder(TierPrice::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dimensionCollectionFactory = $this->getMockBuilder(DimensionCollectionFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->tableMaintainer = $this->getMockBuilder(TableMaintainer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $batchSize = 2;
+
+        $this->actionRows = new Rows(
+            $this->config,
+            $this->storeManager,
+            $this->currencyFactory,
+            $this->localeDate,
+            $this->dateTime,
+            $this->catalogProductType,
+            $this->indexerPriceFactory,
+            $this->defaultIndexerResource,
+            $this->tierPriceIndexResource,
+            $this->dimensionCollectionFactory,
+            $this->tableMaintainer,
+            $batchSize
+        );
     }
 
     public function testEmptyIds()
     {
         $this->expectException('Magento\Framework\Exception\InputException');
         $this->expectExceptionMessage('Bad value was supplied.');
-        $this->_model->execute(null);
+        $this->actionRows->execute(null);
+    }
+
+    public function testBatchProcessing()
+    {
+        $ids = [1, 2, 3, 4];
+        $select = $this->getMockBuilder(Select::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $select->expects($this->any())->method('from')->willReturnSelf();
+        $select->expects($this->any())->method('where')->willReturnSelf();
+        $select->expects($this->any())->method('join')->willReturnSelf();
+        $adapter = $this->getMockBuilder(AdapterInterface::class)->getMockForAbstractClass();
+        $adapter->expects($this->any())->method('select')->willReturn($select);
+        $this->defaultIndexerResource->expects($this->any())
+            ->method('getConnection')
+            ->willReturn($adapter);
+        $adapter->expects($this->any())
+            ->method('fetchAll')
+            ->with($select)
+            ->willReturn([]);
+        $adapter->expects($this->any())
+            ->method('fetchPairs')
+            ->with($select)
+            ->willReturn([]);
+        $multiDimensionProvider = $this->getMockBuilder(MultiDimensionProvider::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->dimensionCollectionFactory->expects($this->exactly(2))
+            ->method('create')
+            ->willReturn($multiDimensionProvider);
+        $iterator = new \ArrayObject([]);
+        $multiDimensionProvider->expects($this->exactly(2))
+            ->method('getIterator')
+            ->willReturn($iterator);
+        $this->catalogProductType->expects($this->any())
+            ->method('getTypesByPriority')
+            ->willReturn([]);
+        $this->actionRows->execute($ids);
     }
 }

From 90372d9caa114b021447b0da1d793756617f9f1f Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Tue, 13 Oct 2020 19:16:30 -0500
Subject: [PATCH 530/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
index dfeb5b6bfea26..acbe20721ee9e 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Rows.php
@@ -20,6 +20,7 @@
 /**
  * Class Rows reindex action for mass actions
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) to preserve compatibility with parent class
  */
 class Rows extends \Magento\Catalog\Model\Indexer\Product\Price\AbstractAction
 {

From e3fd2463dba30032f6777c926bba96a40f53730c Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 14 Oct 2020 10:52:52 +0100
Subject: [PATCH 531/671] Small changes to increase performance

---
 .../Magento/Wishlist/Block/AddToWishlist.php  | 73 ++++++++-----------
 .../frontend/layout/catalog_category_view.xml |  6 +-
 .../layout/catalogsearch_result_index.xml     |  7 +-
 .../view/frontend/web/js/add-to-wishlist.js   | 36 +++++----
 4 files changed, 56 insertions(+), 66 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/AddToWishlist.php b/app/code/Magento/Wishlist/Block/AddToWishlist.php
index dffd8cb027e74..0d4d403034f2a 100644
--- a/app/code/Magento/Wishlist/Block/AddToWishlist.php
+++ b/app/code/Magento/Wishlist/Block/AddToWishlist.php
@@ -6,7 +6,11 @@
 
 namespace Magento\Wishlist\Block;
 
+use Magento\Catalog\Api\Data\ProductTypeInterface;
+use Magento\Catalog\Api\ProductTypeListInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
 
 /**
  * Wishlist js plugin initialization block
@@ -24,63 +28,50 @@ class AddToWishlist extends Template
     private $productTypes;
 
     /**
-     * Returns wishlist widget options
-     *
-     * @return array
-     * @since 100.1.0
+     * @var ProductTypeListInterface
      */
-    public function getWishlistOptions()
-    {
-        return [
-            'productType' => $this->getProductTypes(),
-            'isProductList' => (bool)$this->getData('is_product_list')
-        ];
-    }
+    private $productTypeList;
 
     /**
-     * Returns an array of product types
-     *
-     * @return array|null
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * AddToWishlist constructor.
+     * @param ProductTypeListInterface $productTypeList
+     * @param Context $context
+     * @param array $data
      */
-    private function getProductTypes()
-    {
-        if ($this->productTypes === null) {
-            $this->productTypes = [];
-            $block = $this->getLayout()->getBlock($this->getProductListBlockName());
-            if ($block) {
-                $productCollection = $block->getLoadedProductCollection();
-                $productTypes = [];
-                /** @var $product \Magento\Catalog\Model\Product */
-                foreach ($productCollection as $product) {
-                    $productTypes[] = $this->escapeHtml($product->getTypeId());
-                }
-                $this->productTypes = array_unique($productTypes);
-            }
-        }
-        return $this->productTypes;
+    public function __construct(
+        Context $context,
+        array $data = [],
+        ?ProductTypeListInterface $productTypeList = null
+    ) {
+        parent::__construct($context, $data);
+        $this->productTypes = [];
+        $this->productTypeList = $productTypeList ?: ObjectManager::getInstance()->get(ProductTypeListInterface::class);
     }
 
     /**
-     * Get product list block name in layout
+     * Returns wishlist widget options
      *
-     * @return string
+     * @return array
+     * @since 100.1.0
      */
-    private function getProductListBlockName(): string
+    public function getWishlistOptions()
     {
-        return $this->getData('product_list_block') ?: 'category.products.list';
+        return ['productType' => $this->getProductTypes()];
     }
 
     /**
-     * @inheritDoc
+     * Returns an array of product types
      *
-     * @since 100.1.0
+     * @return array
      */
-    protected function _toHtml()
+    private function getProductTypes(): array
     {
-        if (!$this->getProductTypes()) {
-            return '';
+        if (count($this->productTypes) === 0) {
+            /** @var ProductTypeInterface productTypes */
+            $this->productTypes = array_map(function ($productType) {
+                return $productType->getName();
+            }, $this->productTypeList->getProductTypes());
         }
-        return parent::_toHtml();
+        return $this->productTypes;
     }
 }
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
index c305b7c489d59..81bd966b904d7 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/catalog_category_view.xml
@@ -23,11 +23,7 @@
             <referenceContainer name="category.product.list.additional">
                 <block class="Magento\Wishlist\Block\AddToWishlist"
                     name="category.product.list.additional.wishlist_addto"
-                    template="Magento_Wishlist::addto.phtml">
-                    <arguments>
-                        <argument name="is_product_list" xsi:type="boolean">true</argument>
-                    </arguments>
-                </block>
+                    template="Magento_Wishlist::addto.phtml"/>
             </referenceContainer>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml b/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
index b36a7cc2347af..b26aa64ad89b1 100644
--- a/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
+++ b/app/code/Magento/Wishlist/view/frontend/layout/catalogsearch_result_index.xml
@@ -17,12 +17,7 @@
         <referenceBlock name="wishlist_page_head_components">
             <block class="Magento\Wishlist\Block\AddToWishlist"
                 name="catalogsearch.wishlist_addto"
-                template="Magento_Wishlist::addto.phtml">
-                <arguments>
-                    <argument name="is_product_list" xsi:type="boolean">true</argument>
-                    <argument name="product_list_block" xsi:type="string">search_result_list</argument>
-                </arguments>
-            </block>
+                template="Magento_Wishlist::addto.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 727a9751cc2f6..38ed1f62cea66 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -18,8 +18,8 @@ define([
             customOptionsInfo: '.product-custom-option',
             qtyInfo: '#qty',
             actionElement: '[data-action="add-to-wishlist"]',
-            productListItem: '.item.product-item',
-            isProductList: false
+            productListWrapper: '.product-item-info',
+            productPageWrapper: '.product-info-main'
         },
 
         /** @inheritdoc */
@@ -67,23 +67,17 @@ define([
         _updateWishlistData: function (event) {
             var dataToAdd = {},
                 isFileUploaded = false,
-                productItem = null,
                 handleObjSelector = null,
                 self = this;
 
             if (event.handleObj.selector == this.options.qtyInfo) { //eslint-disable-line eqeqeq
-                this._updateAddToWishlistButton({}, productItem);
+                this._updateAddToWishlistButton({}, event);
                 event.stopPropagation();
 
                 return;
             }
 
-            if (this.options.isProductList) {
-                productItem = $(event.target).closest(this.options.productListItem);
-                handleObjSelector = productItem.find(event.handleObj.selector);
-            } else {
-                handleObjSelector = $(event.handleObj.selector);
-            }
+            handleObjSelector = $(event.currentTarget).closest('form').find(event.handleObj.selector)
 
             handleObjSelector.each(function (index, element) {
                 if ($(element).is('input[type=text]') ||
@@ -110,18 +104,18 @@ define([
             if (isFileUploaded) {
                 this.bindFormSubmit();
             }
-            this._updateAddToWishlistButton(dataToAdd, productItem);
+            this._updateAddToWishlistButton(dataToAdd, event);
             event.stopPropagation();
         },
 
         /**
          * @param {Object} dataToAdd
-         * @param {Object} productItem
+         * @param {jQuery.Event} event
          * @private
          */
-        _updateAddToWishlistButton: function (dataToAdd, productItem) {
+        _updateAddToWishlistButton: function (dataToAdd, event) {
             var self = this,
-                buttons = productItem ? productItem.find(this.options.actionElement) : $(this.options.actionElement);
+                buttons = this._getAddToWishlistButton(event);
 
             buttons.each(function (index, element) {
                 var params = $(element).data('post');
@@ -139,6 +133,20 @@ define([
             });
         },
 
+        /**
+         * @param {jQuery.Event} event
+         * @private
+         */
+        _getAddToWishlistButton: function (event) {
+            var productListWrapper = $(event.currentTarget).closest(this.options.productListWrapper);
+
+            if (productListWrapper.length) {
+                return productListWrapper.find(this.options.actionElement);
+            }
+
+            return $(event.currentTarget).closest(this.options.productPageWrapper).find(this.options.actionElement);
+        },
+
         /**
          * @param {Object} array1
          * @param {Object} array2

From dd159ef462103a5b923a5115f5dfccd3e179a0e4 Mon Sep 17 00:00:00 2001
From: Sudheer S <sudheers@kensium.com>
Date: Wed, 14 Oct 2020 16:11:14 +0530
Subject: [PATCH 532/671] 30349: Product filter with category_id does not work
 as expected - fixed query returns missing items

---
 .../CollectionProcessor/FilterProcessor/CategoryFilter.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
index 92888a2775e17..7fd4b4bfa8e35 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php
@@ -51,6 +51,11 @@ public function __construct(
      */
     public function apply(Filter $filter, AbstractDb $collection)
     {
+        $conditionType = $filter->getConditionType();
+        if ($conditionType !== 'eq') {
+            return true;
+        }
+
         $categoryIds = $filter->getValue();
         if (!is_array($categoryIds)) {
             $categoryIds = [$categoryIds];
@@ -61,6 +66,7 @@ public function apply(Filter $filter, AbstractDb $collection)
             $category = $this->categoryFactory->create();
             $this->categoryResourceModel->load($category, $categoryId);
             $categoryProducts[$categoryId] = $category->getProductCollection()->getAllIds();
+            $collection->addCategoryFilter($category);
         }
 
         $categoryProductIds = array_unique(array_merge(...$categoryProducts));

From c40f065d7d518b8893188b11b7dd41fa46ad032c Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Wed, 14 Oct 2020 13:44:26 +0200
Subject: [PATCH 533/671] 29251 fix product loading based row_id

---
 .../Magento/ConfigurableProduct/Helper/Data.php | 10 +++++++---
 .../Model/Options/Collection.php                | 15 ++++++++++-----
 .../Model/Variant/Collection.php                | 17 ++++++++++-------
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php
index a5fdcd62c7aa1..54b95bcd7bd90 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Data.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php
@@ -7,9 +7,11 @@
 namespace Magento\ConfigurableProduct\Helper;
 
 use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Helper\Image as ImageHelper;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Image;
 
 /**
@@ -73,7 +75,7 @@ public function getGalleryImages(ProductInterface $product)
     /**
      * Get Options for Configurable Product Options
      *
-     * @param \Magento\Catalog\Model\Product $currentProduct
+     * @param Product $currentProduct
      * @param array $allowedProducts
      * @return array
      */
@@ -100,11 +102,13 @@ public function getOptions($currentProduct, $allowedProducts)
     /**
      * Get allowed attributes
      *
-     * @param \Magento\Catalog\Model\Product $product
+     * @param Product $product
      * @return array
      */
     public function getAllowAttributes($product)
     {
-        return $product->getTypeInstance()->getConfigurableAttributes($product);
+        return ($product->getTypeId() == Configurable::TYPE_CODE)
+            ? $product->getTypeInstance()->getConfigurableAttributes($product)
+            : [];
     }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
index c5c66a194503a..7a27964897828 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
@@ -186,8 +186,8 @@ private function fetch() : array
                         = $this->selectionUidFormatter->encode((int)$attribute->getId(), (int)$value['value_index']);
                     $this->attributeMap[$productId][$attribute->getId()]['values'][$index]
                         ['is_available_for_selection'] =
-                        isset($options[$attribute['attribute_id']][$value['value_index']])
-                        && $options[$attribute['attribute_id']][$value['value_index']];
+                        isset($options[$attribute->getAttributeId()][$value['value_index']])
+                        && $options[$attribute->getAttributeId()][$value['value_index']];
                 }
             }
         }
@@ -196,16 +196,21 @@ private function fetch() : array
     }
 
     /**
-     * Load products by entity ids
+     * Load products by link field ids
      *
      * @param int[] $productIds
      * @return ProductInterface[]
      */
     private function getProducts($productIds)
     {
-        $this->searchCriteriaBuilder->addFilter('entity_id', $productIds, 'in');
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $this->searchCriteriaBuilder->addFilter($linkField, $productIds, 'in');
         $searchCriteria = $this->searchCriteriaBuilder->create();
         $products = $this->productRepository->getList($searchCriteria)->getItems();
-        return $products;
+        $productsLinkFieldMap = [];
+        foreach ($products as $product) {
+            $productsLinkFieldMap[$product->getData($linkField)] = $product;
+        }
+        return $productsLinkFieldMap;
     }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index b60a660251f4d..cd6d78e5c3ffb 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -9,6 +9,7 @@
 
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ChildCollection;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -175,19 +176,21 @@ private function fetch(ContextInterface $context = null) : array
     }
 
     /**
-     * Get attributes code
+     * Get attributes codes for given product
      *
-     * @param \Magento\Catalog\Model\Product $currentProduct
+     * @param Product $currentProduct
      * @return array
      */
     private function getAttributesCodes(Product $currentProduct): array
     {
         $attributeCodes = $this->attributeCodes;
-        $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
-        foreach ($allowAttributes as $attribute) {
-            $productAttribute = $attribute->getProductAttribute();
-            if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
-                $attributeCodes[] = $productAttribute->getAttributeCode();
+        if ($currentProduct->getTypeId() == Configurable::TYPE_CODE) {
+            $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
+            foreach ($allowAttributes as $attribute) {
+                $productAttribute = $attribute->getProductAttribute();
+                if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
+                    $attributeCodes[] = $productAttribute->getAttributeCode();
+                }
             }
         }
 

From 8d025339e6df3bce298c231e920ddb243d44c95b Mon Sep 17 00:00:00 2001
From: Gabriel Galvao da Gama <galvaoda@adobe.com>
Date: Wed, 14 Oct 2020 14:25:00 +0100
Subject: [PATCH 534/671] Fixed static tests

---
 app/code/Magento/Wishlist/Block/AddToWishlist.php              | 3 ++-
 .../Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Wishlist/Block/AddToWishlist.php b/app/code/Magento/Wishlist/Block/AddToWishlist.php
index 0d4d403034f2a..7997a6ed99031 100644
--- a/app/code/Magento/Wishlist/Block/AddToWishlist.php
+++ b/app/code/Magento/Wishlist/Block/AddToWishlist.php
@@ -34,9 +34,10 @@ class AddToWishlist extends Template
 
     /**
      * AddToWishlist constructor.
-     * @param ProductTypeListInterface $productTypeList
+     *
      * @param Context $context
      * @param array $data
+     * @param ProductTypeListInterface|null $productTypeList
      */
     public function __construct(
         Context $context,
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
index 38ed1f62cea66..62756f7211cee 100644
--- a/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
+++ b/app/code/Magento/Wishlist/view/frontend/web/js/add-to-wishlist.js
@@ -77,7 +77,7 @@ define([
                 return;
             }
 
-            handleObjSelector = $(event.currentTarget).closest('form').find(event.handleObj.selector)
+            handleObjSelector = $(event.currentTarget).closest('form').find(event.handleObj.selector);
 
             handleObjSelector.each(function (index, element) {
                 if ($(element).is('input[type=text]') ||

From 59c1bc64ece9510009383c7b21196f9054bd32c7 Mon Sep 17 00:00:00 2001
From: Munkh-Ulzii Balidar <mbalidar@comwrap.com>
Date: Wed, 14 Oct 2020 16:03:51 +0200
Subject: [PATCH 535/671] 29251 update unit test belongs to change

---
 .../Test/Unit/Helper/DataTest.php                  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
index db72e1ca6ab4c..963322e2f2c57 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
@@ -49,7 +49,7 @@ protected function setUp(): void
             ->getMock();
         $this->_imageHelperMock = $this->createMock(Image::class);
         $this->_productMock = $this->createMock(Product::class);
-
+        $this->_productMock->setTypeId(Configurable::TYPE_CODE);
         $this->_model = $objectManager->getObject(
             Data::class,
             [
@@ -66,6 +66,10 @@ public function testGetAllowAttributes()
             ->method('getConfigurableAttributes')
             ->with($this->_productMock);
 
+        $this->_productMock->expects($this->once())
+            ->method('getTypeId')
+            ->willReturn(Configurable::TYPE_CODE);
+
         $this->_productMock->expects($this->once())
             ->method('getTypeInstance')
             ->willReturn($typeInstanceMock);
@@ -119,7 +123,10 @@ public function getOptionsDataProvider()
     {
         $currentProductMock = $this->createPartialMock(
             Product::class,
-            ['getTypeInstance']
+            [
+                'getTypeInstance',
+                'getTypeId'
+            ]
         );
         $provider = [];
         $provider[] = [
@@ -156,6 +163,9 @@ public function getOptionsDataProvider()
         $typeInstanceMock->expects($this->any())
             ->method('getConfigurableAttributes')
             ->willReturn($attributes);
+        $currentProductMock->expects($this->any())
+            ->method('getTypeId')
+            ->willReturn(Configurable::TYPE_CODE);
         $currentProductMock->expects($this->any())
             ->method('getTypeInstance')
             ->willReturn($typeInstanceMock);

From f4b7937cba82d62caf780f18bd7e51e93738ecf5 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Wed, 14 Oct 2020 10:05:08 -0500
Subject: [PATCH 536/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Model/Indexer/Product/Price/Action/RowsTest.php    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
index 9fd86e81c7a51..44ac8b67d392b 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
@@ -25,6 +25,11 @@
 use PHPUnit\Framework\TestCase;
 use PHPUnit\Framework\MockObject\MockObject;
 
+/**
+ * Test coverage for the rows action
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) to preserve compatibility with parent class
+ */
 class RowsTest extends TestCase
 {
     /**
@@ -172,13 +177,16 @@ public function testBatchProcessing()
         $this->dimensionCollectionFactory->expects($this->exactly(2))
             ->method('create')
             ->willReturn($multiDimensionProvider);
-        $iterator = new \ArrayObject([]);
+        $iterator = new \ArrayIterator([]);
         $multiDimensionProvider->expects($this->exactly(2))
             ->method('getIterator')
             ->willReturn($iterator);
         $this->catalogProductType->expects($this->any())
             ->method('getTypesByPriority')
             ->willReturn([]);
+        $adapter->expects($this->any())
+            ->method('getPrimaryKeyName')
+            ->willReturn(['COLUMNS_LIST'=>['entity_id']]);
         $this->actionRows->execute($ids);
     }
 }

From 22692c74455f87e4a987e10d8686c7cd49f0426d Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Wed, 14 Oct 2020 12:19:42 -0500
Subject: [PATCH 537/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Unit/Model/Indexer/Product/Price/Action/RowsTest.php   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
index 44ac8b67d392b..e6ef516ac0663 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
@@ -184,9 +184,12 @@ public function testBatchProcessing()
         $this->catalogProductType->expects($this->any())
             ->method('getTypesByPriority')
             ->willReturn([]);
-        $adapter->expects($this->any())
+        $adapter->expects($this->once())
+            ->method('getIndexList')
+            ->willReturn(['entity_id'=>['COLUMNS_LIST'=>['test']]]);
+        $adapter->expects($this->once())
             ->method('getPrimaryKeyName')
-            ->willReturn(['COLUMNS_LIST'=>['entity_id']]);
+            ->willReturn('entity_id');
         $this->actionRows->execute($ids);
     }
 }

From d10f1c881daed60d3d7bfae6cadf9fda7d54adb2 Mon Sep 17 00:00:00 2001
From: Yaroslav Bogutsky <y.bogutsky@vveb.pro>
Date: Wed, 14 Oct 2020 21:04:55 +0300
Subject: [PATCH 538/671] Fixed placeholder translation in Magento UI grid
 search component

---
 app/code/Magento/Ui/view/base/web/js/grid/search/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
index ce53b23b79e11..3f5434761ba18 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/search/search.js
@@ -19,7 +19,7 @@ define([
     return Element.extend({
         defaults: {
             template: 'ui/grid/search/search',
-            placeholder: 'Search by keyword',
+            placeholder: $t('Search by keyword'),
             label: $t('Keyword'),
             value: '',
             previews: [],

From a1bf66a893c244293840a17365cdee3fac2b6fc9 Mon Sep 17 00:00:00 2001
From: Oleksandr Iegorov <oiegorov@adobe.com>
Date: Wed, 14 Oct 2020 13:33:54 -0500
Subject: [PATCH 539/671] MC-38038: Partial reindex of prices causes empty
 categories (missed products)

---
 .../Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
index e6ef516ac0663..816dc923ebc0a 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Price/Action/RowsTest.php
@@ -184,10 +184,10 @@ public function testBatchProcessing()
         $this->catalogProductType->expects($this->any())
             ->method('getTypesByPriority')
             ->willReturn([]);
-        $adapter->expects($this->once())
+        $adapter->expects($this->exactly(2))
             ->method('getIndexList')
             ->willReturn(['entity_id'=>['COLUMNS_LIST'=>['test']]]);
-        $adapter->expects($this->once())
+        $adapter->expects($this->exactly(2))
             ->method('getPrimaryKeyName')
             ->willReturn('entity_id');
         $this->actionRows->execute($ids);

From a56f2c5ea7fa7c67644b079d4048c737edabaacf Mon Sep 17 00:00:00 2001
From: Arnob Saha <arnobsh@gmail.com>
Date: Mon, 21 Sep 2020 01:33:14 -0500
Subject: [PATCH 540/671] MC-36954: [Magento Cloud] Coupon Code with single
 payment option

- Adding key check with the PO
---
 .../OfflinePayments/Model/Purchaseorder.php   |  5 +--
 .../Plugin/ValidatePurchaseOrderNumber.php    | 43 ++++++++++++++++++
 .../Test/Unit/Model/PurchaseorderTest.php     |  6 +--
 .../Magento/OfflinePayments/composer.json     |  3 +-
 app/code/Magento/OfflinePayments/etc/di.xml   |  3 ++
 ...etPurchaseOrderPaymentMethodOnCartTest.php | 17 ++++---
 ...etPurchaseOrderPaymentMethodOnCartTest.php | 17 ++++---
 .../Quote/Model/QuoteManagementTest.php       | 44 +++++++++++++++++++
 .../_files/quote_with_purchase_order.php      | 43 ++++++++++++++++++
 .../quote_with_purchase_order_rollback.php    | 21 +++++++++
 10 files changed, 183 insertions(+), 19 deletions(-)
 create mode 100644 app/code/Magento/OfflinePayments/Plugin/ValidatePurchaseOrderNumber.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order_rollback.php

diff --git a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
index fe30570aba50d..21790f3ac20bb 100644
--- a/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
+++ b/app/code/Magento/OfflinePayments/Model/Purchaseorder.php
@@ -10,6 +10,7 @@
 /**
  * Class Purchaseorder
  *
+ * Update additional payments fields and validate the payment data
  * @method \Magento\Quote\Api\Data\PaymentMethodExtensionInterface getExtensionAttributes()
  *
  * @api
@@ -68,10 +69,6 @@ public function validate()
     {
         parent::validate();
 
-        if (empty($this->getInfoInstance()->getPoNumber())) {
-            throw new LocalizedException(__('Purchase order number is a required field.'));
-        }
-
         return $this;
     }
 }
diff --git a/app/code/Magento/OfflinePayments/Plugin/ValidatePurchaseOrderNumber.php b/app/code/Magento/OfflinePayments/Plugin/ValidatePurchaseOrderNumber.php
new file mode 100644
index 0000000000000..18e80864f434b
--- /dev/null
+++ b/app/code/Magento/OfflinePayments/Plugin/ValidatePurchaseOrderNumber.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\OfflinePayments\Plugin;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\OfflinePayments\Model\Purchaseorder;
+use Magento\Quote\Model\Quote;
+use Magento\Quote\Model\QuoteManagement;
+
+/**
+ * Class ValidatePurchaseOrderNumber
+ *
+ * Validate purchase order number before submit order
+ */
+class ValidatePurchaseOrderNumber
+{
+    /**
+     * Before submitOrder plugin.
+     *
+     * @param QuoteManagement $subject
+     * @param Quote $quote
+     * @param array $orderData
+     * @return void
+     * @throws LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSubmit(
+        QuoteManagement $subject,
+        Quote $quote,
+        array $orderData = []
+    ): void {
+        $payment = $quote->getPayment();
+        if ($payment->getMethod() === Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE
+            && empty($payment->getPoNumber())) {
+            throw new LocalizedException(__('Purchase order number is a required field.'));
+        }
+    }
+}
diff --git a/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php b/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
index c4c717550dbae..2bbaad03d4b87 100644
--- a/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
+++ b/app/code/Magento/OfflinePayments/Test/Unit/Model/PurchaseorderTest.php
@@ -66,9 +66,6 @@ public function testAssignData()
 
     public function testValidate()
     {
-        $this->expectException(LocalizedException::class);
-        $this->expectExceptionMessage('Purchase order number is a required field.');
-
         $data = new DataObject([]);
 
         $addressMock = $this->getMockForAbstractClass(OrderAddressInterface::class);
@@ -84,6 +81,7 @@ public function testValidate()
         $this->object->setData('info_instance', $instance);
         $this->object->assignData($data);
 
-        $this->object->validate();
+        $result = $this->object->validate();
+        $this->assertEquals($result, $this->object);
     }
 }
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 56c7eb2778c48..237812a205130 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -8,7 +8,8 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-checkout": "*",
-        "magento/module-payment": "*"
+        "magento/module-payment": "*",
+        "magento/module-quote": "*"
     },
     "suggest": {
         "magento/module-config": "*"
diff --git a/app/code/Magento/OfflinePayments/etc/di.xml b/app/code/Magento/OfflinePayments/etc/di.xml
index 1e3d7cba3b86a..e0a2e250eadcd 100644
--- a/app/code/Magento/OfflinePayments/etc/di.xml
+++ b/app/code/Magento/OfflinePayments/etc/di.xml
@@ -13,4 +13,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="\Magento\Quote\Model\QuoteManagement">
+        <plugin name="validate_purchase_order_number" type="Magento\OfflinePayments\Plugin\ValidatePurchaseOrderNumber"/>
+    </type>
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
index 1777289afe5bc..69dc78b9d08d9 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/SetPurchaseOrderPaymentMethodOnCartTest.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Quote\Customer;
 
-use Exception;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\OfflinePayments\Model\Purchaseorder;
@@ -100,9 +99,6 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
      */
     public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumber()
     {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Purchase order number is a required field.');
-
         $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
@@ -122,7 +118,18 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumbe
   }
 }
 QUERY;
-        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        $response = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertEquals(
+            $methodCode,
+            $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
+        );
+        self::assertArrayNotHasKey(
+            'purchase_order_number',
+            $response['setPaymentMethodOnCart']['cart']['selected_payment_method']
+        );
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
index 2c93a27012a01..121b04cc8ed11 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/SetPurchaseOrderPaymentMethodOnCartTest.php
@@ -7,7 +7,6 @@
 
 namespace Magento\GraphQl\Quote\Guest;
 
-use Exception;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\OfflinePayments\Model\Purchaseorder;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -91,9 +90,6 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithSimpleProduct()
      */
     public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumber()
     {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Purchase order number is a required field.');
-
         $methodCode = Purchaseorder::PAYMENT_METHOD_PURCHASEORDER_CODE;
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
 
@@ -113,7 +109,18 @@ public function testSetPurchaseOrderPaymentMethodOnCartWithoutPurchaseOrderNumbe
   }
 }
 QUERY;
-        $this->graphQlMutation($query);
+        $response = $this->graphQlMutation($query);
+        self::assertArrayHasKey('setPaymentMethodOnCart', $response);
+        self::assertArrayHasKey('cart', $response['setPaymentMethodOnCart']);
+        self::assertArrayHasKey('selected_payment_method', $response['setPaymentMethodOnCart']['cart']);
+        self::assertEquals(
+            $methodCode,
+            $response['setPaymentMethodOnCart']['cart']['selected_payment_method']['code']
+        );
+        self::assertArrayNotHasKey(
+            'purchase_order_number',
+            $response['setPaymentMethodOnCart']['cart']['selected_payment_method']
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
index 26ae82120b2c7..c02d32430939a 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -13,6 +13,7 @@
 use Magento\Customer\Model\Vat;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\ObjectManagerInterface;
@@ -134,6 +135,49 @@ public function testSubmitGuestCustomer(): void
         self::assertEquals(3, $quoteAfterOrderPlaced->getCustomerTaxClassId());
     }
 
+    /**
+     * Creates order with purchase_order payment method
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/quote_with_purchase_order.php
+     *
+     * @return void
+     * @throws CouldNotSaveException
+     */
+    public function testSubmitWithPurchaseOrder(): void
+    {
+        $paymentMethodName = 'purchaseorder';
+        $poNumber = '12345678';
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_1');
+        $quote->getPayment()->setPoNumber($poNumber);
+        $quote->collectTotals()->save();
+        $orderId = $this->cartManagement->placeOrder($quote->getId());
+        $order = $this->orderRepository->get($orderId);
+        $orderItems = $order->getItems();
+        $this->assertCount(1, $orderItems);
+        $payment = $order->getPayment();
+        $this->assertEquals($paymentMethodName, $payment->getMethod());
+        $this->assertEquals($poNumber, $payment->getPoNumber());
+    }
+
+    /**
+     * Creates order with purchase_order payment method without po_number
+     *
+     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Sales/_files/quote_with_purchase_order.php
+     *
+     * @return void
+     * @throws CouldNotSaveException
+     */
+    public function testSubmitWithPurchaseOrderWithException(): void
+    {
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('Purchase order number is a required field.');
+
+        $quote = $this->getQuoteByReservedOrderId->execute('test_order_1');
+        $this->cartManagement->placeOrder($quote->getId());
+    }
+
     /**
      * Tries to create order with product that has child items and one of them was deleted.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order.php
new file mode 100644
index 0000000000000..96a5484746da2
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Model\Quote\Address\Rate;
+use Magento\Quote\Model\QuoteFactory;
+use Magento\Quote\Model\QuoteIdMaskFactory;
+use Magento\Quote\Model\ResourceModel\Quote as QuoteResource;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/quote_with_address.php');
+/** @var QuoteFactory $quoteFactory */
+$quoteFactory = Bootstrap::getObjectManager()->get(QuoteFactory::class);
+/** @var QuoteResource $quoteResource */
+$quoteResource = Bootstrap::getObjectManager()->get(QuoteResource::class);
+$quote = $quoteFactory->create();
+$quoteResource->load($quote, 'test_order_1', 'reserved_order_id');
+
+/** @var $rate Rate */
+$rate = Bootstrap::getObjectManager()->create(
+    Rate::class
+);
+$rate->setCode('freeshipping_freeshipping');
+$rate->getPrice(100);
+
+$quote->getShippingAddress()->setShippingMethod('freeshipping_freeshipping');
+$quote->getShippingAddress()->addShippingRate($rate);
+$quote->getPayment()->setMethod('purchaseorder');
+
+$quote->collectTotals();
+$quote->save();
+$quote->getPayment()->setMethod('purchaseorder');
+
+$quoteIdMask = Bootstrap::getObjectManager()
+    ->create(QuoteIdMaskFactory::class)
+    ->create();
+$quoteIdMask->setQuoteId($quote->getId());
+$quoteIdMask->setDataChanges(true);
+$quoteIdMask->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order_rollback.php
new file mode 100644
index 0000000000000..84d5ef051519c
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_purchase_order_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Rollback for quote_with_purchase_order.php fixture.
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\Quote\Model\Quote;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/default_rollback.php');
+
+/** @var $objectManager \Magento\TestFramework\ObjectManager */
+$objectManager = Bootstrap::getObjectManager();
+$objectManager->get(Registry::class)->unregister('quote');
+$quote = $objectManager->create(Quote::class);
+$quote->load('test_order_1', 'reserved_order_id')->delete();

From aa34315ab9c12729b6936905394d0f1280a115f9 Mon Sep 17 00:00:00 2001
From: Arnob Saha <arnobsh@gmail.com>
Date: Wed, 23 Sep 2020 15:07:44 -0500
Subject: [PATCH 541/671] MC-37794: [REST] Order has wrong number of items
 shipped via REST API

- Reverting the changes of MC-35633 in scope of MC-37794
---
 app/code/Magento/Sales/Model/ShipOrder.php    |  38 +--
 .../Plugin/ProcessOrderAndShipmentViaAPI.php  | 241 --------------
 .../Sales/Test/Unit/Model/ShipOrderTest.php   |   2 +-
 app/code/Magento/Sales/etc/webapi_rest/di.xml |   3 -
 app/code/Magento/Sales/etc/webapi_soap/di.xml |   3 -
 .../Sales/Service/V1/ShipmentCreateTest.php   | 307 +++---------------
 .../order_with_bundle_shipped_separately.php  |   4 -
 7 files changed, 65 insertions(+), 533 deletions(-)
 delete mode 100644 app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php

diff --git a/app/code/Magento/Sales/Model/ShipOrder.php b/app/code/Magento/Sales/Model/ShipOrder.php
index f955f6574a7b2..3bb8527d6e516 100644
--- a/app/code/Magento/Sales/Model/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/ShipOrder.php
@@ -5,25 +5,15 @@
  */
 namespace Magento\Sales\Model;
 
-use DomainException;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
-use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
-use Magento\Sales\Api\Data\ShipmentPackageCreationInterface;
-use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Sales\Api\Exception\CouldNotShipExceptionInterface;
-use Magento\Sales\Api\Exception\DocumentValidationExceptionInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Sales\Api\ShipOrderInterface;
-use Magento\Sales\Exception\CouldNotShipException;
-use Magento\Sales\Exception\DocumentValidationException;
 use Magento\Sales\Model\Order\Config as OrderConfig;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Shipment\NotifierInterface;
 use Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface;
-use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Validation\ShipOrderInterface as ShipOrderValidator;
 use Psr\Log\LoggerInterface;
 
@@ -126,27 +116,29 @@ public function __construct(
      * Process the shipment and save shipment and order data
      *
      * @param int $orderId
-     * @param ShipmentItemCreationInterface[] $items
+     * @param \Magento\Sales\Api\Data\ShipmentItemCreationInterface[] $items
      * @param bool $notify
      * @param bool $appendComment
-     * @param ShipmentCommentCreationInterface|null $comment
-     * @param ShipmentTrackCreationInterface[] $tracks
-     * @param ShipmentPackageCreationInterface[] $packages
-     * @param ShipmentCreationArgumentsInterface|null $arguments
+     * @param \Magento\Sales\Api\Data\ShipmentCommentCreationInterface|null $comment
+     * @param \Magento\Sales\Api\Data\ShipmentTrackCreationInterface[] $tracks
+     * @param \Magento\Sales\Api\Data\ShipmentPackageCreationInterface[] $packages
+     * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return int
-     * @throws DocumentValidationExceptionInterface
-     * @throws CouldNotShipExceptionInterface
-     * @throws DomainException
+     * @throws \Magento\Sales\Api\Exception\DocumentValidationExceptionInterface
+     * @throws \Magento\Sales\Api\Exception\CouldNotShipExceptionInterface
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \DomainException
      */
     public function execute(
         $orderId,
         array $items = [],
         $notify = false,
         $appendComment = false,
-        ShipmentCommentCreationInterface $comment = null,
+        \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
         array $tracks = [],
         array $packages = [],
-        ShipmentCreationArgumentsInterface $arguments = null
+        \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface $arguments = null
     ) {
         $connection = $this->resourceConnection->getConnection('sales');
         $order = $this->orderRepository->get($orderId);
@@ -170,7 +162,7 @@ public function execute(
             $packages
         );
         if ($validationMessages->hasMessages()) {
-            throw new DocumentValidationException(
+            throw new \Magento\Sales\Exception\DocumentValidationException(
                 __("Shipment Document Validation Error(s):\n" . implode("\n", $validationMessages->getMessages()))
             );
         }
@@ -189,7 +181,7 @@ public function execute(
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $connection->rollBack();
-            throw new CouldNotShipException(
+            throw new \Magento\Sales\Exception\CouldNotShipException(
                 __('Could not save a shipment, see error log for details')
             );
         }
diff --git a/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php b/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php
deleted file mode 100644
index 2f81de65fad74..0000000000000
--- a/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\Sales\Plugin;
-
-use Exception;
-use Magento\Framework\DB\Transaction;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Sales\Api\Data\ShipmentInterface;
-use Magento\Sales\Model\Order;
-use Magento\Sales\Model\Order\Shipment\Item;
-use Magento\Sales\Model\Order\ShipmentRepository;
-use Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader;
-
-/**
- * Plugin to update order data before and after saving shipment via API
- */
-class ProcessOrderAndShipmentViaAPI
-{
-    /**
-     * @var ShipmentLoader
-     */
-    private $shipmentLoader;
-
-    /**
-     * @var Transaction
-     */
-    private $transaction;
-
-    /**
-     * Init plugin
-     *
-     * @param ShipmentLoader $shipmentLoader
-     * @param Transaction $transaction
-     */
-    public function __construct(
-        ShipmentLoader $shipmentLoader,
-        Transaction $transaction
-    ) {
-        $this->shipmentLoader = $shipmentLoader;
-        $this->transaction = $transaction;
-    }
-
-    /**
-     * Process shipping details before saving shipment via API
-     *
-     * @param ShipmentRepository $shipmentRepository
-     * @param ShipmentInterface $shipmentData
-     * @return array
-     * @throws LocalizedException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     */
-    public function beforeSave(
-        ShipmentRepository $shipmentRepository,
-        ShipmentInterface $shipmentData
-    ): array {
-        $this->shipmentLoader->setOrderId($shipmentData->getOrderId());
-        $trackData = !empty($shipmentData->getTracks()) ?
-            $this->getShipmentTracking($shipmentData) : [];
-        $this->shipmentLoader->setTracking($trackData);
-        $shipmentItems = !empty($shipmentData) ?
-            $this->getShipmentItems($shipmentData) : [];
-        $orderItems = [];
-        if (!empty($shipmentData)) {
-            $order = $shipmentData->getOrder();
-            $orderItems = $order ? $this->getOrderItems($order) : [];
-        }
-        $data = (!empty($shipmentItems) && !empty($orderItems)) ?
-            $this->getShippingData($shipmentItems, $orderItems) : [];
-        $this->shipmentLoader->setShipment($data);
-        $shipment = $this->shipmentLoader->load();
-        $shipment = empty($shipment) ? $shipmentData
-            : $this->processShippingDetails($shipmentData, $shipment);
-        return [$shipment];
-    }
-
-    /**
-     * Save order data after saving shipment via API
-     *
-     * @param ShipmentRepository $shipmentRepository
-     * @param ShipmentInterface $shipment
-     * @return ShipmentInterface
-     * @throws Exception
-     */
-    public function afterSave(
-        ShipmentRepository $shipmentRepository,
-        ShipmentInterface $shipment
-    ): ShipmentInterface {
-        $shipmentDetails = $shipmentRepository->get($shipment->getEntityId());
-        $order = $shipmentDetails->getOrder();
-        $shipmentItems = !empty($shipment) ?
-            $this->getShipmentItems($shipment) : [];
-        $this->processOrderItems($order, $shipmentItems);
-        $order->setIsInProcess(true);
-        $this->transaction
-            ->addObject($order)
-            ->save();
-        return $shipment;
-    }
-
-    /**
-     * Process shipment items
-     *
-     * @param ShipmentInterface $shipment
-     * @return array
-     * @throws LocalizedException
-     */
-    private function getShipmentItems(ShipmentInterface $shipment): array
-    {
-        $shipmentItems = [];
-        foreach ($shipment->getItems() as $item) {
-            $sku = $item->getSku();
-            if (isset($sku)) {
-                $shipmentItems[$sku]['qty'] = $item->getQty();
-            }
-        }
-        return $shipmentItems;
-    }
-
-    /**
-     * Get shipment tracking data from the shipment array
-     *
-     * @param ShipmentInterface $shipment
-     * @return array
-     */
-    private function getShipmentTracking(ShipmentInterface $shipment): array
-    {
-        $trackData = [];
-        foreach ($shipment->getTracks() as $key => $track) {
-            $trackData[$key]['number'] = $track->getTrackNumber();
-            $trackData[$key]['title'] = $track->getTitle();
-            $trackData[$key]['carrier_code'] = $track->getCarrierCode();
-        }
-        return $trackData;
-    }
-
-    /**
-     * Get orderItems from shipment order
-     *
-     * @param Order $order
-     * @return array
-     */
-    private function getOrderItems(Order $order): array
-    {
-        $orderItems = [];
-        foreach ($order->getItems() as $item) {
-            $orderItems[$item->getSku()] = $item->getItemId();
-        }
-        return $orderItems;
-    }
-
-    /**
-     * Get available shipping data from shippingItems and orderItems
-     *
-     * @param array $shipmentItems
-     * @param array $orderItems
-     * @return array
-     * @throws LocalizedException
-     */
-    private function getShippingData(array $shipmentItems, array $orderItems): array
-    {
-        $data = [];
-        foreach ($shipmentItems as $shippingItemSku => $shipmentItem) {
-            if (isset($orderItems[$shippingItemSku])) {
-                $itemId = (int) $orderItems[$shippingItemSku];
-                $data['items'][$itemId] = $shipmentItem['qty'];
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Process shipping comments if available
-     *
-     * @param ShipmentInterface $shipmentData
-     * @param ShipmentInterface $shipment
-     * @return void
-     */
-    private function processShippingComments(ShipmentInterface $shipmentData, ShipmentInterface $shipment): void
-    {
-        foreach ($shipmentData->getComments() as $comment) {
-            $shipment->addComment(
-                $comment->getComment(),
-                $comment->getIsCustomerNotified(),
-                $comment->getIsVisibleOnFront()
-            );
-            $shipment->setCustomerNote($comment->getComment());
-            $shipment->setCustomerNoteNotify((bool) $comment->getIsCustomerNotified());
-        }
-    }
-
-    /**
-     * Process shipping details
-     *
-     * @param ShipmentInterface $shipmentData
-     * @param ShipmentInterface $shipment
-     * @return ShipmentInterface
-     */
-    private function processShippingDetails(
-        ShipmentInterface $shipmentData,
-        ShipmentInterface $shipment
-    ): ShipmentInterface {
-        if (empty($shipment->getItems())) {
-            $shipment->setItems($shipmentData->getItems());
-        }
-        if (!empty($shipmentData->getComments())) {
-            $this->processShippingComments($shipmentData, $shipment);
-        }
-        if ((int) $shipment->getTotalQty() < 1) {
-            $shipment->setTotalQty($shipmentData->getTotalQty());
-        }
-        return $shipment;
-    }
-
-    /**
-     * Process order items data and set the proper item qty
-     *
-     * @param Order $order
-     * @param array $shipmentItems
-     * @throws LocalizedException
-     */
-    private function processOrderItems(Order $order, array $shipmentItems): void
-    {
-        /** @var Item $item */
-        foreach ($order->getAllItems() as $item) {
-            if (isset($shipmentItems[$item->getSku()])) {
-                $qty = (float)$shipmentItems[$item->getSku()]['qty'];
-                $item->setQty($qty);
-                if ((float)$item->getQtyToShip() > 0) {
-                    $item->setQtyShipped((float)$item->getQtyToShip());
-                }
-            }
-        }
-    }
-}
diff --git a/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php b/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
index 77cd6a058df6f..a31b79fcb0c5c 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php
@@ -189,7 +189,7 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->shipOrderValidatorMock = $this->getMockBuilder(ShipOrderInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $this->validationMessagesMock = $this->getMockBuilder(ValidatorResultInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['hasMessages', 'getMessages', 'addMessage'])
diff --git a/app/code/Magento/Sales/etc/webapi_rest/di.xml b/app/code/Magento/Sales/etc/webapi_rest/di.xml
index 1a8478438b04a..5d7838297a7c7 100644
--- a/app/code/Magento/Sales/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_rest/di.xml
@@ -19,7 +19,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Order\ShipmentRepository">
-        <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
-    </type>
 </config>
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 1a8478438b04a..5d7838297a7c7 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -19,7 +19,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Order\ShipmentRepository">
-        <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
-    </type>
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
index 29a11f9d68e8f..dab4ad05f84d3 100644
--- a/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Sales/Service/V1/ShipmentCreateTest.php
@@ -6,10 +6,6 @@
 
 namespace Magento\Sales\Service\V1;
 
-use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Webapi\Rest\Request;
-use Magento\Sales\Model\Order;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
 /**
@@ -26,78 +22,23 @@ class ShipmentCreateTest extends WebapiAbstract
     const SERVICE_VERSION = 'V1';
 
     /**
-     * @var ObjectManagerInterface
+     * @var \Magento\Framework\ObjectManagerInterface
      */
     protected $objectManager;
 
     protected function setUp(): void
     {
-        $this->objectManager = Bootstrap::getObjectManager();
+        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
     }
 
     /**
-     * Test save shipment return valid result with multiple tracks with multiple comments
-     *
      * @magentoApiDataFixture Magento/Sales/_files/order.php
      */
-    public function testInvokeWithMultipleTrackAndComments()
+    public function testInvoke()
     {
-        $data = $this->getEntityData();
-        $result = $this->_webApiCall(
-            $this->getServiceInfo(),
-            [
-                'entity' => $data['shipment data with multiple tracking and multiple comments']]
-        );
-        $this->assertNotEmpty($result);
-        $this->assertEquals(3, count($result['tracks']));
-        $this->assertEquals(3, count($result['comments']));
-    }
-
-    /**
-     * Test save shipment return valid result with multiple tracks with no comments
-     *
-     * @magentoApiDataFixture Magento/Sales/_files/order.php
-     */
-    public function testInvokeWithMultipleTrackAndNoComments()
-    {
-        $data = $this->getEntityData();
-        $result = $this->_webApiCall(
-            $this->getServiceInfo(),
-            [
-                'entity' => $data['shipment data with multiple tracking']]
-        );
-        $this->assertNotEmpty($result);
-        $this->assertEquals(3, count($result['tracks']));
-        $this->assertEquals(0, count($result['comments']));
-    }
-
-    /**
-     * Test save shipment return valid result with no tracks with multiple comments
-     *
-     * @magentoApiDataFixture Magento/Sales/_files/order.php
-     */
-    public function testInvokeWithNoTrackAndMultipleComments()
-    {
-        $data = $this->getEntityData();
-        $result = $this->_webApiCall(
-            $this->getServiceInfo(),
-            [
-                'entity' => $data['shipment data with multiple comments']]
-        );
-        $this->assertNotEmpty($result);
-        $this->assertEquals(0, count($result['tracks']));
-        $this->assertEquals(3, count($result['comments']));
-    }
-
-    /**
-     * @return array
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function getEntityData()
-    {
-        $existingOrder = $this->getOrder('100000001');
-        $orderItem = current($existingOrder->getAllItems());
-
+        /** @var \Magento\Sales\Model\Order $order */
+        $order = $this->objectManager->create(\Magento\Sales\Model\Order::class)->loadByIncrementId('100000001');
+        $orderItem = current($order->getAllItems());
         $items = [
             [
                 'order_item_id' => $orderItem->getId(),
@@ -114,201 +55,10 @@ public function getEntityData()
                 'weight' => null,
             ],
         ];
-        return [
-            'shipment data with multiple tracking and multiple comments' => [
-                'order_id' => $existingOrder->getId(),
-                'entity_id' => null,
-                'store_id' => null,
-                'total_weight' => null,
-                'total_qty' => null,
-                'email_sent' => null,
-                'customer_id' => null,
-                'shipping_address_id' => null,
-                'billing_address_id' => null,
-                'shipment_status' => null,
-                'increment_id' => null,
-                'created_at' => null,
-                'updated_at' => null,
-                'shipping_label' => null,
-                'tracks' => [
-                    [
-                        'carrier_code' => 'UPS',
-                        'order_id' => $existingOrder->getId(),
-                        'title' => 'ground',
-                        'description' => null,
-                        'track_number' => '12345678',
-                        'parent_id' => null,
-                        'created_at' => null,
-                        'updated_at' => null,
-                        'qty' => null,
-                        'weight' => null
-                    ],
-                    [
-                        'carrier_code' => 'UPS',
-                        'order_id' => $existingOrder->getId(),
-                        'title' => 'ground',
-                        'description' => null,
-                        'track_number' => '654563221',
-                        'parent_id' => null,
-                        'created_at' => null,
-                        'updated_at' => null,
-                        'qty' => null,
-                        'weight' => null
-                    ],
-                    [
-                        'carrier_code' => 'USPS',
-                        'order_id' => $existingOrder->getId(),
-                        'title' => 'ground',
-                        'description' => null,
-                        'track_number' => '789654565',
-                        'parent_id' => null,
-                        'created_at' => null,
-                        'updated_at' => null,
-                        'qty' => null,
-                        'weight' => null
-                    ]
-                ],
-                'items' => $items,
-                'comments' => [
-                    [
-                        'comment' => 'Shipment-related comment-1.',
-                        'is_customer_notified' => null,
-                        'is_visible_on_front' => null,
-                        'parent_id' => null
-                    ],
-                    [
-                        'comment' => 'Shipment-related comment-2.',
-                        'is_customer_notified' => null,
-                        'is_visible_on_front' => null,
-                        'parent_id' => null
-                    ],
-                    [
-                        'comment' => 'Shipment-related comment-3.',
-                        'is_customer_notified' => null,
-                        'is_visible_on_front' => null,
-                        'parent_id' => null
-                    ]
-
-                ]
-            ],
-            'shipment data with multiple tracking' => [
-                'order_id' => $existingOrder->getId(),
-                'entity_id' => null,
-                'store_id' => null,
-                'total_weight' => null,
-                'total_qty' => null,
-                'email_sent' => null,
-                'customer_id' => null,
-                'shipping_address_id' => null,
-                'billing_address_id' => null,
-                'shipment_status' => null,
-                'increment_id' => null,
-                'created_at' => null,
-                'updated_at' => null,
-                'shipping_label' => null,
-                'tracks' => [
-                    [
-                        'carrier_code' => 'UPS',
-                        'order_id' => $existingOrder->getId(),
-                        'title' => 'ground',
-                        'description' => null,
-                        'track_number' => '12345678',
-                        'parent_id' => null,
-                        'created_at' => null,
-                        'updated_at' => null,
-                        'qty' => null,
-                        'weight' => null
-                    ],
-                    [
-                        'carrier_code' => 'UPS',
-                        'order_id' => $existingOrder->getId(),
-                        'title' => 'ground',
-                        'description' => null,
-                        'track_number' => '654563221',
-                        'parent_id' => null,
-                        'created_at' => null,
-                        'updated_at' => null,
-                        'qty' => null,
-                        'weight' => null
-                    ],
-                    [
-                        'carrier_code' => 'USPS',
-                        'order_id' => $existingOrder->getId(),
-                        'title' => 'ground',
-                        'description' => null,
-                        'track_number' => '789654565',
-                        'parent_id' => null,
-                        'created_at' => null,
-                        'updated_at' => null,
-                        'qty' => null,
-                        'weight' => null
-                    ]
-                ],
-                'items' => $items,
-                'comments' => []
-            ],
-            'shipment data with multiple comments' => [
-                'order_id' => $existingOrder->getId(),
-                'entity_id' => null,
-                'store_id' => null,
-                'total_weight' => null,
-                'total_qty' => null,
-                'email_sent' => null,
-                'customer_id' => null,
-                'shipping_address_id' => null,
-                'billing_address_id' => null,
-                'shipment_status' => null,
-                'increment_id' => null,
-                'created_at' => null,
-                'updated_at' => null,
-                'shipping_label' => null,
-                'tracks' => [],
-                'items' => $items,
-                'comments' => [
-                    [
-                        'comment' => 'Shipment-related comment-1.',
-                        'is_customer_notified' => null,
-                        'is_visible_on_front' => null,
-                        'parent_id' => null
-                    ],
-                    [
-                        'comment' => 'Shipment-related comment-2.',
-                        'is_customer_notified' => null,
-                        'is_visible_on_front' => null,
-                        'parent_id' => null
-                    ],
-                    [
-                        'comment' => 'Shipment-related comment-3.',
-                        'is_customer_notified' => null,
-                        'is_visible_on_front' => null,
-                        'parent_id' => null
-                    ]
-
-                ]
-            ]
-        ];
-    }
-
-    /**
-     * Returns order by increment id.
-     *
-     * @param string $incrementId
-     * @return Order
-     */
-    private function getOrder(string $incrementId): Order
-    {
-        return $this->objectManager->create(Order::class)->loadByIncrementId($incrementId);
-    }
-
-    /**
-     * @return array
-     */
-    private function getServiceInfo(): array
-    {
-        return [
+        $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH,
-                'httpMethod' => Request::HTTP_METHOD_POST,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_POST,
             ],
             'soap' => [
                 'service' => self::SERVICE_READ_NAME,
@@ -316,5 +66,46 @@ private function getServiceInfo(): array
                 'operation' => self::SERVICE_READ_NAME . 'save',
             ],
         ];
+        $data = [
+            'order_id' => $order->getId(),
+            'entity_id' => null,
+            'store_id' => null,
+            'total_weight' => null,
+            'total_qty' => null,
+            'email_sent' => null,
+            'customer_id' => null,
+            'shipping_address_id' => null,
+            'billing_address_id' => null,
+            'shipment_status' => null,
+            'increment_id' => null,
+            'created_at' => null,
+            'updated_at' => null,
+            'shipping_label' => null,
+            'tracks' => [
+                [
+                    'carrier_code' => 'UPS',
+                    'order_id' => $order->getId(),
+                    'title' => 'ground',
+                    'description' => null,
+                    'track_number' => '12345678',
+                    'parent_id' => null,
+                    'created_at' => null,
+                    'updated_at' => null,
+                    'qty' => null,
+                    'weight' => null
+                ]
+            ],
+            'items' => $items,
+            'comments' => [
+                [
+                    'comment' => 'Shipment-related comment.',
+                    'is_customer_notified' => null,
+                    'is_visible_on_front' => null,
+                    'parent_id' => null
+                ]
+            ],
+        ];
+        $result = $this->_webApiCall($serviceInfo, ['entity' => $data]);
+        $this->assertNotEmpty($result);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php b/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php
index e5f089ae9637c..b91d479cdf1ef 100644
--- a/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php
+++ b/dev/tests/integration/testsuite/Magento/Bundle/_files/order_with_bundle_shipped_separately.php
@@ -155,8 +155,6 @@
 /** @var \Magento\Sales\Model\Order\Item $orderItem */
 $orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
 $orderItem->setProductId($product->getId());
-$orderItem->setSku($product->getSku());
-$orderItem->setName($product->getName());
 $orderItem->setQtyOrdered(1);
 $orderItem->setBasePrice($product->getPrice());
 $orderItem->setPrice($product->getPrice());
@@ -174,8 +172,6 @@
     /** @var \Magento\Sales\Model\Order\Item $orderItem */
     $orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
     $orderItem->setProductId($productId);
-    $orderItem->setSku($selectedProduct->getSku());
-    $orderItem->setName($selectedProduct->getName());
     $orderItem->setQtyOrdered(1);
     $orderItem->setBasePrice($selectedProduct->getPrice());
     $orderItem->setPrice($selectedProduct->getPrice());

From 6b39ef29532e070857bae7172daf444199db8dc2 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Thu, 15 Oct 2020 09:38:03 +0300
Subject: [PATCH 542/671] MC-38269: [CLARIFICATION] [Magento Cloud] -
 Persistent Shopping cart Header Weelcome & Not you?

---
 .../Persistent/view/frontend/web/js/view/additional-welcome.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
index 2f5c42f090d18..8e69325860167 100644
--- a/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
+++ b/app/code/Magento/Persistent/view/frontend/web/js/view/additional-welcome.js
@@ -40,7 +40,7 @@ define([
 
                         $(this).attr('data-bind', html);
                         $(this).html(html);
-                        $(this).after('<span><a ' + window.notYouLink + '>' + $t('Not you?') + '</a></span>');
+                        $(this).after(' <span><a ' + window.notYouLink + '>' + $t('Not you?') + '</a></span>');
                     });
                 }
             }

From 959047dcf84fea2a9bd0af28e6aaf6b55f38ff4c Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <1408sheva@gmail.com>
Date: Thu, 15 Oct 2020 09:58:26 +0300
Subject: [PATCH 543/671] MC-36956: Create automated test for "Upload Category
 Image"

---
 .../AdminUploadCategoryImageTest.xml          |  44 ++++++++++++++++++
 .../AdminEnhancedMediaGalleryImageData.xml    |   4 ++
 .../acceptance/tests/_data/magento-logo_2.png | Bin 0 -> 3885 bytes
 3 files changed, 48 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminUploadCategoryImageTest.xml
 create mode 100644 dev/tests/acceptance/tests/_data/magento-logo_2.png

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminUploadCategoryImageTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminUploadCategoryImageTest.xml
new file mode 100644
index 0000000000000..d431a0c3e40ed
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateCategoryTest/AdminUploadCategoryImageTest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminUploadCategoryImageTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Add/remove images and videos for all product types and category"/>
+            <title value="Upload Category Image"/>
+            <description value="The test verifies uploading images including a special case of image name with spaces"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MC-26112"/>
+            <group value="catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+        </after>
+
+        <!--Go to created category admin page and upload image-->
+        <actionGroup ref="GoToAdminCategoryPageByIdActionGroup" stepKey="goToAdminCategoryPage">
+            <argument name="id" value="$createCategory.id$"/>
+        </actionGroup>
+        <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImage"/>
+        <actionGroup ref="CheckCategoryImageInAdminActionGroup" stepKey="checkCategoryImageInAdmin"/>
+        <!--Remove and upload new image-->
+        <actionGroup ref="RemoveCategoryImageActionGroup" stepKey="removeCategoryImage"/>
+        <actionGroup ref="AddCategoryImageActionGroup" stepKey="addCategoryImageAgain">
+            <argument name="image" value="ImageUploadPngTwo"/>
+        </actionGroup>
+        <actionGroup ref="CheckCategoryImageInAdminActionGroup" stepKey="checkCategoryImageInAdminAgain"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
index 4adf92b1c4c09..7948ed13be088 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdminEnhancedMediaGalleryImageData.xml
@@ -40,4 +40,8 @@
         <data key="extension">jpg</data>
         <data key="keywords">magento, mediagallerymetadata</data>
     </entity>
+    <entity name="ImageUploadPngTwo" type="image">
+        <data key="file">magento-logo_2.png</data>
+        <data key="extension">png</data>
+    </entity>
 </entities>
diff --git a/dev/tests/acceptance/tests/_data/magento-logo_2.png b/dev/tests/acceptance/tests/_data/magento-logo_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..24640e7e37e3d9a74b0cb393c570b98bc3ce3379
GIT binary patch
literal 3885
zcmaJ^2{e>#8=gUkA!;!8!Pv!+vae&yI<otynWRJ_OWF4sSu+x{FGCcPe2B_2vS&%9
zY@w_n(fhtq>L2Gj=Re;$-}nFLyyrRBbKUoS-Pg0c=e%zc-rAIdO@IvsgK?ZTGdcr<
z!I|k;pOuk5jugrc!e9*hcuRX@`cy^=^UudeU*ezSe;FuQ>n{w(N&lDpKLCh6Py<tS
z|Cs~E$pA5u|K$G{14LthaIyatrSm}4zbxlp^TAk2AW8y=I8Xz^#DEBKAY2@bl=|1?
zzmq_?D7}ha0%ckrfKXA8bmH#`f5%X!4Sh-<fk-KkeDd!hItHR75Bf$(gEuvy40E~x
zh+++dh|mELA_`Hgpj(!7{eu?C`Ug6<%%E($zeK=W#!#9GM6rM}EWw*vV1g=`W&lKD
zz;ql)QUMc`57g3(ff#8ZTmp=iJ<y4k0TR@JSVb^Nn?8jomSCb97^h6{br7X@Of>?+
zM8On2h++<s>6XmE3==5V@gPJWZ;1Sr2_|cSWR<^4=nNRIM8{x~2AFhk#2^`a5DG^F
zvGQP|3Y209kkrAOx<HaX5GMy^p8?Yi52~VN4t5|M4c*2c<R5G)8p^Vz8=zl_gM*He
z0Ar;NwvKKuQk;I-pu5gct`iU=1>HFVW#R#Plwy5gELswx*nqLpK%@lydO%rtx<e?>
zg?=tj8V<^|fO74DC^?X%2qwtUJ<t~g#LB2G4n3y70I!42SlhvdKvyo>uX*^^k8`uZ
z+lRhPT}F&u{(MpW`}3o$oSnV*#kcSwCIN;%$i|SZ-S<U`Z!MQX7})Lt89A3ZuZqMB
zC{(_F>T#$g*}PQsOr~=F<qc`skdUoYObjBZT4v`2$7-Whey!N8%dC4Lz{%T5VNpWa
zZsZN#pWFr?CF`kaE*Ru9+J)^2rI(BE_Uo>rDkgMBmx{qbqUI!FE`yBAwPBZw6>L4-
z{dw%Z(%nck3T3?JkL}Q}K496GV4P@R<$UzgV}H!$7f<{`QXKrEzr6I-t(S%K!(i;}
zr;QBkLnasVS?rOYd16?c{av{5N%paKU~%w6RDNS_+q{lJsnF|JM))|+8@!mEdaOP5
z`I*#1X!h0FFq>ht!n0OZ8F0d8^W1W=yW2vmP{On2mJ@;Z_IF<H`w3=Yd>R&tq2Uan
zvr(bc@{fJIEQwfXgHu6zNdud}4~eMTP(OC)UDT2z9XA!=(fIv}#(9`HdwBcj#>Pfg
z_kOq#XV>}%QLig{5^Nps)FaY8Y(sV>PcoV;bUJV{5l8lsh9@(dXARqt-Ie!FX|X0~
z(A4A*_do0puJe0*s9nNLs_9aLnb;nPAkhV({L+ZPbGqd*UenM(Nn-u?YAZITaS5C4
z3)>WL&a%jH!T9itUZRulhS9l}M^br`lX%)AJG%87)kLB$agC%pfhSeiq{b^omhVHG
zzkX&W1=5Aq(Io6@niT`7x2Q>bVYQcuGyfMjM4)aB&+nwh^*3%O@#qNe3>}lVN~L{I
zr$viKAi?VeepjeSy2$e};>czN2y-wo?NwqHCRZvwRAz%V8m`aP{Xix9oI6#0V^zms
zAx^<s)_AX<kr8LN_~!G?u7O@@U;!s`E=fJe&DUFnHm4-P?-A8iWlvSyXnUkoFF_s{
z$lDxzlXF%b<E>YIvO9akXrq)*vGB>XyUXQtF}R1nN_(TIqtd1XGv$O%F!+K{v%6`l
zESmduHj&mp3F$@HTru;8qCILJb!U)@okaYuui|S8XH8LV^OInkKpCN?ip!z6X#I)@
zN>j@wO3pf!O=79!c@I8L%&K;ud#p$Vi;^=!>{tgi{do=H>swgpr>8`yT7lzEh0amd
zp0wt99b;i;zJhRgI`nho2duQ#p%aFlU9JsFfUD;cQ7jSy%)h&gD{hF#T+3N}7aLb<
z*jc~!p%3Z$hX(nrV|VG!C*E{;e*B(*GFJT45f39zPMPaHog+8l@ukVc-HGPH+_;!h
z9^x)2=<4MFB)}tx-u1T>K4%{uz@jSQX%0#v_xU}Q<G4Gs%U^kg39VNV<WY@k>Z`wL
z1f+86W@}jW8wAcLf7RPvSO-SL=6S>%RyLB0CvrFhjlmn%<$PH@ML4!?-`7bH?Q&f5
zI&Ybad|Xo)+*D?NHb3UhYt!-g^8R(Dxi!tZcWtjaqqeMEk&M)w^eM8vCy}_~N<@F(
z%`NHcaCW)QnVQ<f!FczW5YBhw#zcou9V<%nVc`QFWpp6^98Fk~<0H}eYw}f<D`94&
zEx}l^tXZ+ZF{=_5V~on3@lpLk1wR&d1MP81ldprzW{0fpKa=XzjGnwx7ix%nSLs9%
z#{Mj60<X}VCLa1DoLnD92RAh}4GJ*(WeQu8NP131*`CE0gpO-(HRUJ_h%e|ejJCMn
z>rn|Vz!Y{>-?L7PVmyi>_n8UnO-Q?v#Ox0{7)g2icKh3Q``4AucP%QR$V!T8ss+cC
z-5R_7g*J84Fln-uPB1~wjI~bjqw;f}Jyt`>11Y%+w4q9&x6^O+vxM)E$$APGCaq-!
z-kVw$IS%O0U%J5cBIaU8UqhMMC$7=gQyH0YoR;wZ%GIgY3emr7svE+*XOUz%IL)PF
z^wl;X+7F&<zY0eXIE8R`B*};tK*2wFtLs^2^;O;#HcUSw?+a&2wr@!r;?ZkA>)6GB
zvi!c9i!5EHXO{yUGg>@;$e3)}rhp@=ft1C*SIM{Q^QU7{Wo9^09Vk~<*XO29y-kg7
zUS2DQaLDPf;|dfBXPbSokhto`Ng37lMb$MdVOHHv&3V(L%UAPV)Kj%WpKD0@uDQTu
z8J;6lf()+*5V38&2d9a*oRGV>L*TEf`suZy@!@Co%E>ma8{7jyMGfnRQ~s<^`O$Jx
zRe}*weaJosQ(i^w!5Y<E`UZRLV-QV1(ISeJhJtl0s-BLf{E9auo7amGbzhVmTT=|#
zp%J)Q+ukbAxYs|5C7`-Sn!D>c997<Y@0Qj2&J4$Wc@BTpCFxbc>R4HFCs<RHPxZb`
z>yV$RHn6LRnR#datkuNSKUO{{@ce>>RW%>t`&yEdrSCW=#jwM_6f!fI5z|Ic4U765
ztY9w-LqxS_&v*~B<7Tp|mJCM*oy-i4T+sOzgfA#Oxxs{=V|(Di21N}WIEND0DyYv>
zQy>c-TP|St$=LDg?2hc$W%Z$IlpU$C)eACZeNmE_F&}S-IU;;GU4R`?_sk==WHW+v
z8z1?=1*6PDjzz@-3IUqaxtJgK2)-;Xqp_Y{a%{i$DppDjlM${eSNW!k441eyea=f+
z+{qkMow%t|b_0QXQyrJ$xlAMHmGOorGAGaXcAp4xsg=dgl|RT}z2}Yp6jbTSxg9#S
zqOz%&)UL~SzC*kDX*?#iI)bx0FxUq*s_;%$b@_E*cO_e3ko)oZ4rMeO0U^%3!*&c2
z{Q%3{ej%jAt#tUCG=H|VJd6i1OUjM?V+lF=*5vH9_g3fi4K$22G@ZVxpMnHUCTuwo
zjOBQnBP-P(xE?fm*t+wti6zt|VL-mGR96x_pvw|xLN<BR@wM$VqLX0Q8gO>5gkTqy
zG9%pq8)wkRBD~5iNS$RrR1MeLtR>Q_LX;f_#3?aAC2uztamf7C@!e*1KToap4mmPr
zv&<=F!(XtqW9=-4&;jCq;0`gKdBctx3a5lUViz^845K>x9g)24d3=o8))15AUcH{x
zq#Li-qBg*4m$~w`)$NLajz{h=yQ``^gO}~qEn>xfZBV7@M0w)oQEU)5n^3&xr9Erq
zlnG86Pe9{J^W%QTk0!CiKlw%ksZ{+nG-JW5uKpqCo8=dnF3>u;NyFXCP%8XoaZ5r_
zq-J&Rd5O}Wtiu7z6*<R0$RZKBICs7mTemgMOY=SIcdaS308`zsBpX$3s&ZyRxa=R1
zww>#aeOSyFqzcn=*T<HJMgk|2Bu>}e3CAJkziEefaa`?J|FNg}vC_D)7L|&i*~}*?
zv%(qA1gniRre>qG?ce)6NvGoN@lQx$=D(_+>U^3P*2ktMD#)X2L!>@iNS5uHwK?{k
zw98Ry5o6x43_wf@aF-Vx3z+Wl%k2|FkvGE_;ykLPk?PEr1|;~)AEW^(q;-+`Z|OoX
zk($b-Z3eyaRKLf7;NJ?lckR+Omu}=bcHwL2ubtCs0~_D+(DD>Rw&9*aH8r;fiMK6h
zj;nrX((C=sL5M*n6TPnXjJS_r=hBvzF7leAgBcJkwQl(G2}tPStDSwf?JSuLrfhA?
z!*@b)&YlcPP*!4bZ|1D;R2y14A}Ln$^@@;QyO5w@!)QQs9n;<TxY!sjEShKJVTN+n
z)21%YbIfJkZyENv^3Xu>kPb6_F>>EVU(N{OZk#B^zhJZ&e^}f+=&KWQ$#K<n*J5AR
zMx^Ew>OSkuV#-Fb9jgN$KRNtt^SD(`$*KF>#)I`d5!4&)=QA$;POh7FCmDC>Belym
zo2Nu6<&NbAEuEroDh(_K3PQ<|f_*bBJcqilc-A$g-yj9CSKBklk{GVhWY(I7<>F#s
zrryVboi7J0W=Kjd<0{lCmiR|;tTg?mR1=TlX+;ep&bi9&sol^pu$UR7MZ_NE8lh~c
z$tL6p^iw{K@rga|!K8N<Bfk7PaS_H9)jU{=HOoJz;~IY&WuY5dn}Ds-*jvK%kA0&5
zE99SH%3RhH&J@BgMQmNGKr3xdn5WC`=q_-jKW{Y+aQptHQ%d2wMIlSo&@Po)z54OU
mMT>OBz*~`@P`_>VqiNz<*Bp#2wdkMyu+zrYMs<dSxc>kW=k|C2

literal 0
HcmV?d00001


From 603dba357ddaeaf3c6767595ccd22d491c351eb0 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Thu, 15 Oct 2020 10:40:58 +0300
Subject: [PATCH 544/671] MC-35783: "1 item(s) need your attention." still
 visible in mini cart after product remove

---
 .../Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
index 668d33d26f37a..dcab48dbc5368 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
@@ -39,6 +39,7 @@
         <element name="emptyMiniCart" type="text" selector="//div[@class='minicart-wrapper']//span[@class='counter qty empty']/../.."/>
         <element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
         <element name="messageEmptyCart" type="text" selector="//*[@id='minicart-content-wrapper']//*[contains(@class,'subtitle empty')]"/>
+        <element name="emptyCartMessageContent" type="text" selector="#minicart-content-wrapper .minicart.empty.text"/>
         <element name="visibleItemsCountText" type="text" selector="//div[@class='items-total']"/>
         <element name="productQuantity" type="input" selector="//*[@id='mini-cart']//a[contains(text(),'{{productName}}')]/../..//div[@class='details-qty qty']//input[@data-item-qty='{{qty}}']" parameterized="true"/>
         <element name="productImage" type="text" selector="//ol[@id='mini-cart']//img[@class='product-image-photo']"/>

From e4c227d3caf825c787d4d84dc1e25f55177d4656 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Thu, 15 Oct 2020 11:44:07 +0300
Subject: [PATCH 545/671] MC-37070: Create automated test for "Import products
 with shared images"

---
 .../Catalog/Model/Product/Gallery/UpdateHandlerTest.php      | 5 ++++-
 .../Model/Import/ImportWithSharedImagesTest.php              | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
index c5221f1ae5e76..2d94466939dbe 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Gallery/UpdateHandlerTest.php
@@ -86,12 +86,15 @@ class UpdateHandlerTest extends \PHPUnit\Framework\TestCase
      * @var StoreManagerInterface
      */
     private $storeManager;
+
     /**
      * @var int
      */
     private $currentStoreId;
 
-    /** @var MetadataPool */
+    /**
+     * @var MetadataPool
+     */
     private $metadataPool;
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php
index 4c04e5a8814e5..35d4cceb50845 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ImportWithSharedImagesTest.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product as ProductEntity;
 use Magento\Catalog\Model\Product\Media\ConfigInterface;
+use Magento\Framework\App\Bootstrap as AppBootstrap;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
@@ -82,7 +83,7 @@ protected function setUp(): void
         $this->csvFactory = $this->objectManager->get(CsvFactory::class);
         $this->importDataResource = $this->objectManager->get(Data::class);
         $this->appParams = Bootstrap::getInstance()->getBootstrap()->getApplication()
-            ->getInitParams()[\Magento\Framework\App\Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
+            ->getInitParams()[AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS];
     }
 
     /**

From 43e5b5c901f27478134fe6b2203648684498bb79 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Thu, 15 Oct 2020 11:50:32 +0300
Subject: [PATCH 546/671] MC-36960: Create automated test for "Create product
 for "all" store views using API service"

---
 .../ProductRepositoryAllStoreViewsTest.php    | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
index 2950dda4b3c52..2814a6ab05321 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
@@ -8,11 +8,13 @@
 namespace Magento\Catalog\Api;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
 use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Webapi\Rest\Request;
@@ -24,6 +26,7 @@
  * Tests for products creation for all store views.
  *
  * @magentoAppIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ProductRepositoryAllStoreViewsTest extends WebapiAbstract
 {
@@ -55,6 +58,7 @@ class ProductRepositoryAllStoreViewsTest extends WebapiAbstract
      * @var Link
      */
     private $productWebsiteLink;
+
     /**
      * @var Config
      */
@@ -87,9 +91,11 @@ protected function tearDown(): void
     {
         $this->registry->unregister('isSecureArea');
         $this->registry->register('isSecureArea', true);
-        $this->productRepository->delete(
-            $this->productRepository->get($this->productSku)
-        );
+        try {
+            $this->productRepository->deleteById($this->productSku);
+        } catch (NoSuchEntityException $e) {
+            //already deleted
+        }
         $this->registry->unregister('isSecureArea');
         $this->registry->register('isSecureArea', false);
 
@@ -98,6 +104,7 @@ protected function tearDown(): void
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/category.php
+     * @return void
      */
     public function testCreateProduct(): void
     {
@@ -110,6 +117,7 @@ public function testCreateProduct(): void
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/category.php
      * @magentoApiDataFixture Magento/Store/_files/second_website_with_store_group_and_store.php
+     * @return void
      */
     public function testCreateProductOnMultipleWebsites(): void
     {
@@ -120,12 +128,12 @@ public function testCreateProductOnMultipleWebsites(): void
     }
 
     /**
-     * Saves Product via API.
+     * Saves product via API.
      *
-     * @param $product
+     * @param array $product
      * @return array
      */
-    private function saveProduct($product): array
+    private function saveProduct(array $product): array
     {
         $serviceInfo = [
             'rest' => ['resourcePath' =>self::PRODUCTS_RESOURCE_PATH, 'httpMethod' => Request::HTTP_METHOD_POST],
@@ -146,22 +154,22 @@ private function saveProduct($product): array
      */
     private function getProductData(): array
     {
-        $setId =(int)$this->eavConfig->getEntityType(ProductAttributeInterface::ENTITY_TYPE_CODE)
+        $setId = (int)$this->eavConfig->getEntityType(ProductAttributeInterface::ENTITY_TYPE_CODE)
             ->getDefaultAttributeSetId();
 
         return [
-                'sku' => $this->productSku,
-                'name' => 'simple',
-                'type_id' => Type::TYPE_SIMPLE,
-                'weight' => 1,
-                'attribute_set_id' => $setId,
-                'price' => 10,
-                'status' => Status::STATUS_ENABLED,
-                'visibility' => Visibility::VISIBILITY_BOTH,
-                'extension_attributes' => [
+                ProductInterface::SKU => $this->productSku,
+                ProductInterface::NAME => 'simple',
+                ProductInterface::TYPE_ID => Type::TYPE_SIMPLE,
+                ProductInterface::WEIGHT => 1,
+                ProductInterface::ATTRIBUTE_SET_ID => $setId,
+                ProductInterface::PRICE => 10,
+                ProductInterface::STATUS => Status::STATUS_ENABLED,
+                ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
+                ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
                     'stock_item' => ['is_in_stock' => true, 'qty' => 1000]
                 ],
-                'custom_attributes' => [
+                ProductInterface::CUSTOM_ATTRIBUTES => [
                     ['attribute_code' => 'url_key', 'value' => 'simple'],
                     ['attribute_code' => 'tax_class_id', 'value' => 2],
                     ['attribute_code' => 'category_ids', 'value' => [333]]
@@ -219,8 +227,7 @@ private function assertProductData(array $productData, array $resultData, array
     private function getAllWebsiteIds(): array
     {
         $websiteIds = [];
-        $websites = $this->storeManager->getWebsites();
-        foreach ($websites as $website) {
+        foreach ($this->storeManager->getWebsites() as $website) {
             $websiteIds[] = $website->getId();
         }
 

From 0587310da6dd45e255df1b48aa4c6c829b166107 Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Thu, 15 Oct 2020 12:57:59 +0300
Subject: [PATCH 547/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../Catalog/Model/CategoryRepository.php      |  4 +-
 .../CategoryRepository/PopulateWithValues.php | 56 ++++++++++++-------
 .../Unit/Model/CategoryRepositoryTest.php     |  9 ++-
 .../Catalog/Api/CategoryRepositoryTest.php    | 20 +++----
 4 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index fe3ae4cc468a1..7082fa4747fdc 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -71,13 +71,13 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
      * @param CategoryFactory $categoryFactory
      * @param CategoryResource $categoryResource
      * @param StoreManagerInterface $storeManager
-     * @param PopulateWithValues $populateWithValues
+     * @param PopulateWithValues|null $populateWithValues
      */
     public function __construct(
         CategoryFactory $categoryFactory,
         CategoryResource $categoryResource,
         StoreManagerInterface $storeManager,
-        PopulateWithValues $populateWithValues
+        ?PopulateWithValues $populateWithValues
     ) {
         $this->categoryFactory = $categoryFactory;
         $this->categoryResource = $categoryResource;
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
index 410aa3db1f255..2a313119f9c8e 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
@@ -69,30 +69,46 @@ public function __construct(
     public function execute(CategoryInterface $category, array $existingData): void
     {
         $storeId = $existingData['store_id'];
-        $overriddenValues = array_filter($category->getData(), function ($key) use ($category, $storeId) {
-            /** @var Category $category */
-            return $this->scopeOverriddenValue->containsValue(
-                CategoryInterface::class,
-                $category,
-                $key,
-                $storeId
-            );
-        }, ARRAY_FILTER_USE_KEY);
+        $overriddenValues = array_filter(
+            $category->getData(),
+            function ($key) use ($category, $storeId) {
+                /** @var Category $category */
+                return $this->scopeOverriddenValue->containsValue(
+                    CategoryInterface::class,
+                    $category,
+                    $key,
+                    $storeId
+                );
+            },
+            ARRAY_FILTER_USE_KEY
+        );
         $defaultValues = array_diff_key($category->getData(), $overriddenValues);
-        array_walk($defaultValues, function (&$value, $key) {
-            $attributes = $this->getAttributes();
-            if (isset($attributes[$key]) && !$attributes[$key]->isStatic()) {
-                $value = null;
+        array_walk(
+            $defaultValues,
+            function (&$value, $key) {
+                $attributes = $this->getAttributes();
+                if (isset($attributes[$key]) && !$attributes[$key]->isStatic()) {
+                    $value = null;
+                }
             }
-        });
+        );
         $category->addData($defaultValues);
         $category->addData($existingData);
-        $useDefaultAttributes = array_filter($category->getData(), function ($attributeValue) {
-            return null === $attributeValue;
-        });
-        $category->setData('use_default', array_map(function () {
-            return true;
-        }, $useDefaultAttributes));
+        $useDefaultAttributes = array_filter(
+            $category->getData(),
+            function ($attributeValue) {
+                return null === $attributeValue;
+            }
+        );
+        $category->setData(
+            'use_default',
+            array_map(
+                function () {
+                    return true;
+                },
+                $useDefaultAttributes
+            )
+        );
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
index 61e8133da5759..8274ed9da5f32 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php
@@ -65,10 +65,13 @@ class CategoryRepositoryTest extends TestCase
     protected $metadataPoolMock;
 
     /**
-     * @var MockObject
+     * @var PopulateWithValues|MockObject
      */
-    protected $populateWithValuesMock;
+    private $populateWithValuesMock;
 
+    /**
+     * @inheridoc
+     */
     protected function setUp(): void
     {
         $this->categoryFactoryMock = $this->createPartialMock(
@@ -102,7 +105,7 @@ protected function setUp(): void
 
         $this->populateWithValuesMock = $this
             ->getMockBuilder(PopulateWithValues::class)
-            ->setMethods(['execute'])
+            ->onlyMethods(['execute'])
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
index e7d47ff64a109..6ce922eab21f1 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -12,6 +12,7 @@
 use Magento\Authorization\Model\RulesFactory;
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\Attribute\ScopeOverriddenValue;
+use Magento\Catalog\Model\Category;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\Integration\Api\AdminTokenServiceInterface;
 use Magento\Store\Model\Store;
@@ -193,7 +194,7 @@ public function testDeleteSystemOrRoot()
     public function deleteSystemOrRootDataProvider()
     {
         return [
-            [\Magento\Catalog\Model\Category::TREE_ROOT_ID],
+            [Category::TREE_ROOT_ID],
             [2] //Default root category
         ];
     }
@@ -216,8 +217,8 @@ public function testUpdate()
         ];
         $result = $this->updateCategory($categoryId, $categoryData);
         $this->assertEquals($categoryId, $result['id']);
-        /** @var \Magento\Catalog\Model\Category $model */
-        $model = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Category::class);
+        /** @var Category $model */
+        $model = Bootstrap::getObjectManager()->get(Category::class);
         $category = $model->load($categoryId);
         $this->assertFalse((bool)$category->getIsActive(), 'Category "is_active" must equal to false');
         $this->assertEquals("Update Category Test", $category->getName());
@@ -244,8 +245,8 @@ public function testUpdateWithDefaultSortByAttribute()
         ];
         $result = $this->updateCategory($categoryId, $categoryData);
         $this->assertEquals($categoryId, $result['id']);
-        /** @var \Magento\Catalog\Model\Category $model */
-        $model = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Category::class);
+        /** @var Category $model */
+        $model = Bootstrap::getObjectManager()->get(Category::class);
         $category = $model->load($categoryId);
         $this->assertTrue((bool)$category->getIsActive(), 'Category "is_active" must equal to true');
         $this->assertEquals("Update Category Test With default_sort_by Attribute", $category->getName());
@@ -288,8 +289,8 @@ public function testUpdateUrlKey()
         ];
         $result = $this->updateCategory($categoryId, $categoryData);
         $this->assertEquals($categoryId, $result['id']);
-        /** @var \Magento\Catalog\Model\Category $model */
-        $model = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Category::class);
+        /** @var Category $model */
+        $model = Bootstrap::getObjectManager()->get(Category::class);
         $category = $model->load($categoryId);
         $this->assertEquals("Update Category Test New Name", $category->getName());
 
@@ -564,7 +565,6 @@ public function testSaveDesign(): void
     /**
      * Check if repository does not override default values for attributes out of request
      *
-     * @throws \Exception
      * @magentoApiDataFixture Magento/Catalog/_files/category.php
      */
     public function testUpdateScopeAttribute()
@@ -576,8 +576,8 @@ public function testUpdateScopeAttribute()
         $result = $this->updateCategoryForSpecificStore($categoryId, $categoryData);
         $this->assertEquals($categoryId, $result['id']);
 
-        /** @var \Magento\Catalog\Model\Category $model */
-        $model = Bootstrap::getObjectManager()->get(\Magento\Catalog\Model\Category::class);
+        /** @var Category $model */
+        $model = Bootstrap::getObjectManager()->get(Category::class);
         $category = $model->load($categoryId);
 
         /** @var ScopeOverriddenValue $scopeOverriddenValue */

From 3bacacefdd32ea4665e7d185689ecd345e43c50f Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 15 Oct 2020 15:27:46 +0300
Subject: [PATCH 548/671] MC-29402: PHPStan: "Anonymous function has an unused
 use" errors

---
 .../ProductRepository/TransactionWrapperTest.php     |  2 +-
 .../Model/Resolver/TierPrices.php                    |  2 +-
 .../Magento/Customer/Controller/Adminhtml/Index.php  |  2 +-
 .../CustomerRepository/TransactionWrapperTest.php    |  2 +-
 .../Magento/Swatches/Model/AttributeCreateTest.php   |  4 ++--
 .../Swatches/Model/SwatchAttributeOptionAddTest.php  |  2 +-
 .../Magento/Framework/Setup/ExternalFKSetup.php      |  6 +++---
 .../Setup/Console/Command/AdminUserCreateCommand.php |  7 ++++---
 .../Setup/Console/Command/RollbackCommand.php        |  6 +++---
 .../Fixtures/AttributeSet/SwatchesGenerator.php      |  3 ++-
 .../Magento/Setup/Fixtures/EavVariationsFixture.php  | 12 ++++++++----
 11 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php
index c60ef266b7ebb..89243ea30c9dc 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/Plugin/ProductRepository/TransactionWrapperTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->closureMock = function () use ($productMock) {
             return $productMock;
         };
-        $this->rollbackClosureMock = function () use ($productMock) {
+        $this->rollbackClosureMock = function () {
             throw new \Exception(self::ERROR_MSG);
         };
 
diff --git a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php
index c449d0a2ba30b..675bdaa5f1db0 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php
+++ b/app/code/Magento/CatalogCustomerGraphQl/Model/Resolver/TierPrices.php
@@ -87,7 +87,7 @@ public function resolve(
         $this->tiers->addProductFilter($productId);
 
         return $this->valueFactory->create(
-            function () use ($productId, $context) {
+            function () use ($productId) {
                 $tierPrices = $this->tiers->getProductTierPrices($productId);
 
                 return $tierPrices ?? [];
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
index 51dc39a2fc658..f03f55b16e0c7 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -291,7 +291,7 @@ protected function _addSessionErrorMessages($messages)
         $messages = (array)$messages;
         $session = $this->_getSession();
 
-        $callback = function ($error) use ($session) {
+        $callback = function ($error) {
             if (!$error instanceof Error) {
                 $error = new Error($error);
             }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
index c00b5cce02146..634b0d73219db 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void
         $this->closureMock = function () use ($customerMock) {
             return $customerMock;
         };
-        $this->rollbackClosureMock = function () use ($customerMock) {
+        $this->rollbackClosureMock = function () {
             throw new \Exception(self::ERROR_MSG);
         };
 
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
index 98297cd43041f..b9ec091003267 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Model/AttributeCreateTest.php
@@ -52,7 +52,7 @@ function ($values, $index) use ($optionsPerAttribute) {
         );
         $data['optionvisual']['value'] = array_reduce(
             range(1, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values['option_' . $index] = ['option ' . $index];
                 return $values;
             },
@@ -61,7 +61,7 @@ function ($values, $index) use ($optionsPerAttribute) {
 
         $data['options']['option'] = array_reduce(
             range(1, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values[] = [
                     'label' => 'option ' . $index,
                     'value' => 'option_' . $index
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php b/dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php
index ccf25fd15c529..06ba28932eeb5 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/Model/SwatchAttributeOptionAddTest.php
@@ -40,7 +40,7 @@ public function testSwatchOptionAdd()
 
         $data['options']['option'] = array_reduce(
             range(10, $optionsPerAttribute),
-            function ($values, $index) use ($optionsPerAttribute) {
+            function ($values, $index) {
                 $values[] = [
                     'label' => 'option ' . $index,
                     'value' => 'option_' . $index
diff --git a/lib/internal/Magento/Framework/Setup/ExternalFKSetup.php b/lib/internal/Magento/Framework/Setup/ExternalFKSetup.php
index 4247b7b1aab2f..3d3bb5b6578a9 100644
--- a/lib/internal/Magento/Framework/Setup/ExternalFKSetup.php
+++ b/lib/internal/Magento/Framework/Setup/ExternalFKSetup.php
@@ -92,10 +92,10 @@ protected function execute()
     /**
      * Get foreign keys for tables and columns
      *
-     * @param string $refTable
-     * @param string $refColumn
      * @param string $targetTable
      * @param string $targetColumn
+     * @param string $refTable
+     * @param string $refColumn
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -110,7 +110,7 @@ protected function getForeignKeys(
         );
         $foreignKeys = array_filter(
             $foreignKeys,
-            function ($key) use ($targetColumn, $refTable, $refColumn) {
+            function ($key) use ($targetColumn, $refTable) {
                 return $key['COLUMN_NAME'] == $targetColumn
                 && $key['REF_TABLE_NAME'] == $refTable;
             }
diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
index 173ea9e49a8a4..8e64aae20573c 100644
--- a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
@@ -7,6 +7,7 @@
 namespace Magento\Setup\Console\Command;
 
 use Magento\Framework\Setup\ConsoleLogger;
+use Magento\Framework\Validation\ValidationException;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Setup\Model\InstallerFactory;
 use Magento\User\Model\UserValidationRules;
@@ -81,7 +82,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
             $question = new Question('<question>Admin password:</question> ', '');
             $question->setHidden(true);
 
-            $question->setValidator(function ($value) use ($output) {
+            $question->setValidator(function ($value) {
                 $user = new \Magento\Framework\DataObject();
                 $user->setPassword($value);
 
@@ -90,7 +91,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
                 $validator->isValid($user);
                 foreach ($validator->getMessages() as $message) {
-                    throw new \Exception($message);
+                    throw new ValidationException(__($message));
                 }
 
                 return $value;
@@ -143,7 +144,7 @@ private function addNotEmptyValidator(Question $question)
     {
         $question->setValidator(function ($value) {
             if (trim($value) == '') {
-                throw new \Exception('The value cannot be empty');
+                throw new ValidationException(__('The value cannot be empty'));
             }
 
             return $value;
diff --git a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
index a9138b9faefa1..e4616ae5e271b 100644
--- a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
@@ -80,7 +80,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function configure()
     {
@@ -111,7 +111,7 @@ protected function configure()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -123,7 +123,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
         $returnValue = $this->maintenanceModeEnabler->executeInMaintenanceMode(
-            function () use ($input, $output, &$returnValue) {
+            function () use ($input, $output) {
                 try {
                     $helper = $this->getHelper('question');
                     $question = new ConfirmationQuestion(
diff --git a/setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php b/setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php
index 26e7857703b4f..56263d0ec0adb 100644
--- a/setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php
+++ b/setup/src/Magento/Setup/Fixtures/AttributeSet/SwatchesGenerator.php
@@ -91,7 +91,7 @@ function ($values, $index) use ($optionCount, $data, $type) {
         );
         $attribute['optionvisual']['value'] = array_reduce(
             range(1, $optionCount),
-            function ($values, $index) use ($optionCount) {
+            function ($values, $index) {
                 $values['option_' . $index] = ['option ' . $index];
                 return $values;
             },
@@ -129,6 +129,7 @@ private function generateSwatchImage($data)
             $this->imagesGenerator = $this->imagesGeneratorFactory->create();
         }
 
+        // phpcs:ignore Magento2.Security.InsecureFunction
         $imageName = md5($data) . '.jpg';
         $this->imagesGenerator->generate([
             'image-width' => self::GENERATED_SWATCH_WIDTH,
diff --git a/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php b/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
index f143685f1903d..671627bcea8a9 100644
--- a/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
+++ b/setup/src/Magento/Setup/Fixtures/EavVariationsFixture.php
@@ -77,7 +77,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function execute()
     {
@@ -93,7 +93,7 @@ public function execute()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function getActionTitle()
     {
@@ -101,7 +101,7 @@ public function getActionTitle()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function introduceParamLabels()
     {
@@ -109,6 +109,8 @@ public function introduceParamLabels()
     }
 
     /**
+     * Generate Attribute
+     *
      * @param int $optionCount
      * @return void
      */
@@ -169,7 +171,7 @@ function ($values, $index) use ($optionCount) {
         );
         $data['optionvisual']['value'] = array_reduce(
             range(1, $optionCount),
-            function ($values, $index) use ($optionCount) {
+            function ($values, $index) {
                 $values['option_' . $index] = ['option ' . $index];
                 return $values;
             },
@@ -194,6 +196,8 @@ function ($values, $index) use ($optionCount) {
     }
 
     /**
+     * Get attribute code
+     *
      * @return string
      */
     private function getAttributeCode()

From 64978b41efdaf05ef59961278b0c882ac87c209b Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Thu, 15 Oct 2020 15:12:27 +0200
Subject: [PATCH 549/671] MC-37896: Create automated test for "Reset Widget"

---
 .../AdminSaveAndContinueWidgetActionGroup.xml  |  2 +-
 .../AdminSetWidgetNameAndStoreActionGroup.xml  |  7 ++++---
 ...AdminSetWidgetTypeAndDesignActionGroup.xml} |  5 +++--
 .../Mftf/Section/AdminNewWidgetSection.xml     |  6 +++---
 .../Test/Mftf/Test/AdminResetWidgetTest.xml    | 18 +++++++++---------
 5 files changed, 20 insertions(+), 18 deletions(-)
 rename app/code/Magento/Widget/Test/Mftf/ActionGroup/{AdminSetInputTypeAndDesignActionGroup.xml => AdminSetWidgetTypeAndDesignActionGroup.xml} (77%)

diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
index cd9774f3b13ba..6d17a5c687b1a 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
@@ -13,7 +13,7 @@
         </annotations>
         <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <click selector="{{AdminNewWidgetSection.saveAndContinue}}" stepKey="clickSaveWidget"/>
-        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessageAppeared"/>
         <see selector="{{AdminMessagesSection.success}}" userInput="The widget instance has been saved" stepKey="seeSuccess"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
index f1faadb1e434e..ce19c1b086328 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
@@ -10,14 +10,15 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSetWidgetNameAndStoreActionGroup">
         <annotations>
-            <description>On the widget creation page page set widget name, store add sort order.</description>
+            <description>Set widget name, store IDs and sort order on Widget edit page</description>
         </annotations>
         <arguments>
-            <argument name="widgetName" defaultValue="{{ProductsListWidget.name}}" type="string"/>
+            <argument name="widgetTitle" defaultValue="{{ProductsListWidget.name}}" type="string"/>
             <argument name="widgetStoreIds" defaultValue="{{ProductsListWidget.store_ids}}"  type="string"/>
             <argument name="widgetSortOrder" defaultValue="{{ProductsListWidget.sort_order}}" type="string"/>
         </arguments>
-        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetName}}" stepKey="fillTitle"/>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="waitForWidgetTitleInputVisible"/>
+        <fillField selector="{{AdminNewWidgetSection.widgetTitle}}" userInput="{{widgetTitle}}" stepKey="fillTitle"/>
         <selectOption selector="{{AdminNewWidgetSection.widgetStoreIds}}" parameterArray="{{widgetStoreIds}}" stepKey="setWidgetStoreId"/>
         <fillField selector="{{AdminNewWidgetSection.widgetSortOrder}}" userInput="{{widgetSortOrder}}" stepKey="fillSortOrder"/>
     </actionGroup>
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml
similarity index 77%
rename from app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.xml
rename to app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml
index 3071f60bbc9d6..3a9b4c53572c7 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetInputTypeAndDesignActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml
@@ -8,14 +8,15 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AdminSetInputTypeAndDesignActionGroup">
+    <actionGroup name="AdminSetWidgetTypeAndDesignActionGroup">
         <annotations>
-            <description>On the widget_instance page select widget type and design</description>
+            <description>Select type and design on Widget edit page</description>
         </annotations>
         <arguments>
             <argument name="widgetType" defaultValue="{{ProductsListWidget.type}}" type="string"/>
             <argument name="widgetDesign" defaultValue="{{ProductsListWidget.design_theme}}" type="string"/>
         </arguments>
+        <waitForElementVisible selector="{{AdminNewWidgetSection.widgetType}}" stepKey="waitForTypeInputVisible"/>
         <selectOption selector="{{AdminNewWidgetSection.widgetType}}" userInput="{{widgetType}}" stepKey="setWidgetType"/>
         <selectOption selector="{{AdminNewWidgetSection.widgetDesignTheme}}" userInput="{{widgetDesign}}" stepKey="setWidgetDesignTheme"/>
     </actionGroup>
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 2e455f4a3470b..805c55f34ce9a 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -12,7 +12,7 @@
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
         <element name="continue" type="button" timeout="30" selector="#continue_button"/>
-        <element name="resetBtn" type="button" selector="#reset" timeout="30"/>
+        <element name="resetBtn" type="button" selector="//*[@class='page-actions-buttons']/button[@id='reset']" timeout="30"/>
         <element name="widgetTitle" type="input" selector="#title"/>
         <element name="widgetStoreIds" type="select" selector="#store_ids"/>
         <element name="widgetSortOrder" type="input" selector="#sort_order"/>
@@ -39,11 +39,11 @@
         <element name="searchBlock" type="button" selector="//div[@class='admin__filter-actions']/button[@title='Search']"/>
         <element name="blockStatus" type="select" selector="//select[@name='chooser_is_active']"/>
         <element name="searchedBlock" type="button" selector="//*[@class='magento-message']//tbody/tr/td[1]"/>
-        <element name="saveWidget" type="button" selector="#save"/>
+        <element name="saveWidget" type="button" selector="#save" timeout="30"/>
         <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
         <element name="restrictTypes" type="select" selector="select[id*='types']"/>
         <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
-        <element name="widgetInstanceType" type="select" selector="#instance_code" />
+        <element name="widgetInstanceType" type="select" selector="//*[@class='admin__field-control control']/select[@id='instance_code']" />
         <!-- Catalog Product List Widget Options -->
         <element name="title" type="input" selector="[name='parameters[title]']"/>
         <element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
index 88610d9143bb4..fd9ce8f3c37e9 100644
--- a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
@@ -11,8 +11,8 @@
     <test name="AdminResetWidgetTest">
         <annotations>
             <features value="Widget"/>
-            <stories value="Reset widget"/>
-            <title value="[CMS Widgets] Reset Widget"/>
+            <stories value="CMS Widgets"/>
+            <title value="Reset Widget"/>
             <description value="Check that admin user can reset widget form after filling out all information"/>
             <severity value="MAJOR"/>
             <testCaseId value="MC-37892"/>
@@ -23,25 +23,25 @@
         </before>
         <after>
             <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidget">
-                <argument name="widget" value="ProductsListWidget"/>
+                <argument name="widget" value="{{ProductsListWidget}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
         <amOnPage url="{{AdminNewWidgetPage.url}}" stepKey="amOnAdminNewWidgetPage"/>
-        <actionGroup ref="AdminSetInputTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign">
+        <actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="firstSetTypeAndDesign">
             <argument name="widgetType" value="{{ProductsListWidget.type}}"/>
             <argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
         </actionGroup>
         <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetInstance"/>
         <dontSeeInField userInput="{{ProductsListWidget.type}}" selector="{{AdminNewWidgetSection.widgetType}}" stepKey="dontSeeTypeAfterReset"/>
         <dontSeeInField userInput="{{ProductsListWidget.design_theme}}" selector="{{AdminNewWidgetSection.widgetDesignTheme}}" stepKey="dontSeeDesignAfterReset"/>
-        <actionGroup ref="AdminSetInputTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset">
+        <actionGroup ref="AdminSetWidgetTypeAndDesignActionGroup" stepKey="setTypeAndDesignAfterReset">
             <argument name="widgetType" value="{{ProductsListWidget.type}}"/>
             <argument name="widgetDesign" value="{{ProductsListWidget.design_theme}}"/>
         </actionGroup>
         <click selector="{{AdminNewWidgetSection.continue}}" stepKey="clickContinue"/>
         <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStore">
-            <argument name="widgetName" value="{{ProductsListWidget.name}}"/>
+            <argument name="widgetTitle" value="{{ProductsListWidget.name}}"/>
             <argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
             <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
         </actionGroup>
@@ -50,12 +50,12 @@
         <dontSeeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="dontSeeStoreAfterReset"/>
         <dontSeeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="dontSeeSortOrderAfterReset"/>
         <actionGroup ref="AdminSetWidgetNameAndStoreActionGroup" stepKey="setNameAndStoreAfterReset">
-            <argument name="widgetName" value="{{ProductsListWidget.name}}"/>
+            <argument name="widgetTitle" value="{{ProductsListWidget.name}}"/>
             <argument name="widgetStoreIds" value="{{ProductsListWidget.store_ids}}"/>
             <argument name="widgetSortOrder" value="{{ProductsListWidget.sort_order}}"/>
         </actionGroup>
-        <actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidget"/>
-        <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidget"/>
+        <actionGroup ref="AdminSaveAndContinueWidgetActionGroup" stepKey="saveWidgetAndContinue"/>
+        <click selector="{{AdminNewWidgetSection.resetBtn}}" stepKey="resetWidgetForm"/>
         <seeInField userInput="{{ProductsListWidget.name}}" selector="{{AdminNewWidgetSection.widgetTitle}}" stepKey="seeNameAfterReset"/>
         <seeInField userInput="{{ProductsListWidget.store_ids[0]}}" selector="{{AdminNewWidgetSection.widgetStoreIds}}" stepKey="seeStoreAfterReset"/>
         <seeInField userInput="{{ProductsListWidget.sort_order}}" selector="{{AdminNewWidgetSection.widgetSortOrder}}" stepKey="seeSortOrderAfterReset"/>

From e133e1f5ae6ba3dcc660da8fe823dfef46f69f33 Mon Sep 17 00:00:00 2001
From: Mykhailo Matiola <mykhailo.matiola@transoftgroup.com>
Date: Thu, 15 Oct 2020 17:52:32 +0300
Subject: [PATCH 550/671] MC-36960: Create automated test for "Create product
 for "all" store views using API service"

---
 .../ProductRepositoryAllStoreViewsTest.php    | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
index 2814a6ab05321..fd815c6d2241b 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryAllStoreViewsTest.php
@@ -13,6 +13,7 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Website\Link;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\Eav\Model\Config;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\ObjectManagerInterface;
@@ -167,7 +168,31 @@ private function getProductData(): array
                 ProductInterface::STATUS => Status::STATUS_ENABLED,
                 ProductInterface::VISIBILITY => Visibility::VISIBILITY_BOTH,
                 ProductInterface::EXTENSION_ATTRIBUTES_KEY => [
-                    'stock_item' => ['is_in_stock' => true, 'qty' => 1000]
+                    'stock_item' => [
+                        StockItemInterface::IS_IN_STOCK => 1,
+                        StockItemInterface::QTY => 1000,
+                        StockItemInterface::IS_QTY_DECIMAL => 0,
+                        StockItemInterface::SHOW_DEFAULT_NOTIFICATION_MESSAGE => 0,
+                        StockItemInterface::USE_CONFIG_MIN_QTY => 0,
+                        StockItemInterface::USE_CONFIG_MIN_SALE_QTY => 0,
+                        StockItemInterface::MIN_QTY => 1,
+                        StockItemInterface::MIN_SALE_QTY => 1,
+                        StockItemInterface::MAX_SALE_QTY => 100,
+                        StockItemInterface::USE_CONFIG_MAX_SALE_QTY => 0,
+                        StockItemInterface::USE_CONFIG_BACKORDERS => 0,
+                        StockItemInterface::BACKORDERS => 0,
+                        StockItemInterface::USE_CONFIG_NOTIFY_STOCK_QTY => 0,
+                        StockItemInterface::NOTIFY_STOCK_QTY => 0,
+                        StockItemInterface::USE_CONFIG_QTY_INCREMENTS => 0,
+                        StockItemInterface::QTY_INCREMENTS => 0,
+                        StockItemInterface::USE_CONFIG_ENABLE_QTY_INC => 0,
+                        StockItemInterface::ENABLE_QTY_INCREMENTS => 0,
+                        StockItemInterface::USE_CONFIG_MANAGE_STOCK => 1,
+                        StockItemInterface::MANAGE_STOCK => 1,
+                        StockItemInterface::LOW_STOCK_DATE => null,
+                        StockItemInterface::IS_DECIMAL_DIVIDED => 0,
+                        StockItemInterface::STOCK_STATUS_CHANGED_AUTO => 0,
+                    ],
                 ],
                 ProductInterface::CUSTOM_ATTRIBUTES => [
                     ['attribute_code' => 'url_key', 'value' => 'simple'],
@@ -211,6 +236,10 @@ private function assertProductData(array $productData, array $resultData, array
                 $resultData['custom_attributes'],
                 $attribute['attribute_code']
             );
+            if ($attribute['attribute_code'] == 'category_ids') {
+                $this->assertEquals(array_values($attribute['value']), array_values($resultAttribute['value']));
+                continue;
+            }
             $this->assertEquals($attribute['value'], $resultAttribute['value']);
         }
         foreach ($productData['extension_attributes']['stock_item'] as $key => $value) {

From 5cec5498d29d23e1a19d66f69e085eed9896e935 Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Thu, 15 Oct 2020 17:13:46 +0200
Subject: [PATCH 551/671] MC-37896: Create automated test for "Reset Widget"

---
 .../Widget/Test/Mftf/Section/AdminNewWidgetSection.xml       | 5 +++--
 .../Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 805c55f34ce9a..49eaf6b377859 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -12,7 +12,7 @@
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
         <element name="continue" type="button" timeout="30" selector="#continue_button"/>
-        <element name="resetBtn" type="button" selector="//*[@class='page-actions-buttons']/button[@id='reset']" timeout="30"/>
+        <element name="resetBtn" type="button" selector=".page-actions-buttons .reset" timeout="30"/>
         <element name="widgetTitle" type="input" selector="#title"/>
         <element name="widgetStoreIds" type="select" selector="#store_ids"/>
         <element name="widgetSortOrder" type="input" selector="#sort_order"/>
@@ -43,7 +43,7 @@
         <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
         <element name="restrictTypes" type="select" selector="select[id*='types']"/>
         <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
-        <element name="widgetInstanceType" type="select" selector="//*[@class='admin__field-control control']/select[@id='instance_code']" />
+        <element name="widgetInstanceType" type="select" selector=".admin__field-control .admin__control-select" />
         <!-- Catalog Product List Widget Options -->
         <element name="title" type="input" selector="[name='parameters[title]']"/>
         <element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>
@@ -51,3 +51,4 @@
         <element name="cacheLifetime" type="input" selector="[name='parameters[cache_lifetime]']"/>
     </section>
 </sections>
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
index fd9ce8f3c37e9..5e053778fe7ed 100644
--- a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
@@ -23,7 +23,7 @@
         </before>
         <after>
             <actionGroup ref="AdminDeleteWidgetActionGroup" stepKey="deleteWidget">
-                <argument name="widget" value="{{ProductsListWidget}}"/>
+                <argument name="widget" value="ProductsListWidget"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>

From 1ff20ba12e960d937b7ebe49592a9b5619cb4035 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <1408sheva@gmail.com>
Date: Thu, 15 Oct 2020 18:27:31 +0300
Subject: [PATCH 552/671] MC-37546: Create automated test for "Create new
 Category Update"

---
 ...torefrontCheckPresentSubCategoryActionGroup.xml |  6 +++---
 .../Test/Mftf/Page/AdminCategoryEditPage.xml       |  1 +
 .../AdminCategoryScheduleDesingUpdateSection.xml   | 14 ++++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
index 7cb3287614433..1799f6339a84d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckPresentSubCategoryActionGroup.xml
@@ -16,8 +16,8 @@
             <argument name="childCategoryName" type="string"/>
         </arguments>
 
-        <waitForElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(parenCategoryName)}}" stepKey="waitForTopMenuLoaded"/>
-        <moveMouseOver selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(parenCategoryName)}}" stepKey="moveMouseToParentCategory"/>
-        <seeElement selector="{{AdminCategorySidebarTreeSection.categoryHighlighted(childCategoryName)}}" stepKey="seeSubcategoryInTree"/>
+        <waitForElementVisible selector="{{StorefrontHeaderSection.NavigationCategoryByName(parenCategoryName)}}" stepKey="waitForTopMenuLoaded"/>
+        <moveMouseOver selector="{{StorefrontHeaderSection.NavigationCategoryByName(parenCategoryName)}}" stepKey="moveMouseToParentCategory"/>
+        <seeElement selector="{{StorefrontHeaderSection.NavigationCategoryByName(childCategoryName)}}" stepKey="seeSubcategoryInTree"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
index e1c8e5c75e9ac..5c5dfe8901563 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
@@ -19,5 +19,6 @@
         <section name="AdminCategoryModalSection"/>
         <section name="AdminCategoryMessagesSection"/>
         <section name="AdminCategoryContentSection"/>
+        <section name="AdminCategoryScheduleDesingUpdateSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml
new file mode 100644
index 0000000000000..e1b66b3c18260
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCategoryScheduleDesingUpdateSection">
+        <element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/>
+        <element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/>
+    </section>
+</sections>

From 6f8021aef1a1cebc2c9ab5d0799dfc13a9638940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=BCnig?= <jhuenig@maxcluster.de>
Date: Thu, 15 Oct 2020 20:01:53 +0200
Subject: [PATCH 553/671] add --no-tablespaces parameters to mysqldump

---
 .../integration/framework/Magento/TestFramework/Db/Mysql.php  | 3 ++-
 .../Framework/Crontab/Test/Unit/CrontabManagerTest.php        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
index 7627d78df12dc..017669cba7e13 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
@@ -123,8 +123,9 @@ public function storeDbDump()
         }
 
         $format = sprintf(
-            '%s %s %s',
+            '%s %s %s %s',
             'mysqldump --defaults-file=%s --host=%s --port=%s',
+            '--no-tablespaces'
             $additionalArguments,
             '%s > %s'
         );
diff --git a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
index 904b76a1285e6..f990566f612a1 100644
--- a/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
+++ b/lib/internal/Magento/Framework/Crontab/Test/Unit/CrontabManagerTest.php
@@ -375,13 +375,13 @@ public function saveTasksDataProvider(): array
             ],
             [
                 'tasks' => [
-                    ['command' => '{magentoRoot}run.php mysqldump db > db-$(date +%F).sql']
+                    ['command' => '{magentoRoot}run.php mysqldump --no-tablespaces db > db-$(date +%F).sql']
                 ],
                 'content' => '* * * * * /bin/php /var/www/cron.php',
                 'contentToSave' => '* * * * * /bin/php /var/www/cron.php' . PHP_EOL
                     . CrontabManagerInterface::TASKS_BLOCK_START . ' ' . hash("sha256", BP) . PHP_EOL
                     . '* * * * * ' . PHP_BINARY . ' /var/www/magento2/run.php'
-                    . ' mysqldump db > db-\$(date +%%F).sql' . PHP_EOL
+                    . ' mysqldump --no-tablespaces db > db-\$(date +%%F).sql' . PHP_EOL
                     . CrontabManagerInterface::TASKS_BLOCK_END . ' ' . hash("sha256", BP) . PHP_EOL,
             ],
         ];

From 2bc78ad309c0f5b22d65dbfe260abfb739ca3e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20H=C3=BCnig?= <jonas@huenig.name>
Date: Thu, 15 Oct 2020 22:33:20 +0200
Subject: [PATCH 554/671] Update Mysql.php

add missing colon
---
 .../integration/framework/Magento/TestFramework/Db/Mysql.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
index 017669cba7e13..54ae3dcb27a58 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php
@@ -125,7 +125,7 @@ public function storeDbDump()
         $format = sprintf(
             '%s %s %s %s',
             'mysqldump --defaults-file=%s --host=%s --port=%s',
-            '--no-tablespaces'
+            '--no-tablespaces',
             $additionalArguments,
             '%s > %s'
         );

From 7dcd8e31a54ddd4c7fa9a7dfa887f27c28b8e6a1 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Thu, 15 Oct 2020 15:54:38 -0500
Subject: [PATCH 555/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 lib/internal/Magento/Framework/Mail/EmailMessage.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index 5083d5475465e..2bebf6d5f0ae2 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -222,7 +222,11 @@ private function convertAddressArrayToAddressList(array $arrayList): AddressList
     {
         $laminasAddressList = new AddressList();
         foreach ($arrayList as $address) {
-            $laminasAddressList->add($address->getEmail(), $address->getName());
+            try {
+                $laminasAddressList->add($address->getEmail(), $address->getName());
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            }
         }
 
         return $laminasAddressList;

From ab41eb8864b6c2980d71b4ee8b3d8e2c4ed93fd8 Mon Sep 17 00:00:00 2001
From: DmytroPaidych <dimonovp@gmail.com>
Date: Fri, 16 Oct 2020 09:04:54 +0200
Subject: [PATCH 556/671] MC-37896: Create automated test for "Reset Widget"

---
 .../Widget/Test/Mftf/Section/AdminNewWidgetSection.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 49eaf6b377859..4064f8eb394ca 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -12,7 +12,7 @@
         <element name="widgetType" type="select" selector="#code"/>
         <element name="widgetDesignTheme" type="select" selector="#theme_id"/>
         <element name="continue" type="button" timeout="30" selector="#continue_button"/>
-        <element name="resetBtn" type="button" selector=".page-actions-buttons .reset" timeout="30"/>
+        <element name="resetBtn" type="button" selector=".page-actions-buttons button#reset" timeout="30"/>
         <element name="widgetTitle" type="input" selector="#title"/>
         <element name="widgetStoreIds" type="select" selector="#store_ids"/>
         <element name="widgetSortOrder" type="input" selector="#sort_order"/>
@@ -43,7 +43,7 @@
         <element name="displayMode" type="select" selector="select[id*='display_mode']"/>
         <element name="restrictTypes" type="select" selector="select[id*='types']"/>
         <element name="saveAndContinue" type="button" selector="#save_and_edit_button" timeout="30"/>
-        <element name="widgetInstanceType" type="select" selector=".admin__field-control .admin__control-select" />
+        <element name="widgetInstanceType" type="select" selector=".admin__field-control select#instance_code" />
         <!-- Catalog Product List Widget Options -->
         <element name="title" type="input" selector="[name='parameters[title]']"/>
         <element name="displayPageControl" type="select" selector="[name='parameters[show_pager]']"/>

From be5dbb9c032daa38628fafbbe3600af6cb4641e2 Mon Sep 17 00:00:00 2001
From: Bohdan Shevchenko <1408sheva@gmail.com>
Date: Fri, 16 Oct 2020 10:55:38 +0300
Subject: [PATCH 557/671] MC-37546: Create automated test for "Create new
 Category Update"

---
 .../Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml    | 2 +-
 ...Section.xml => AdminCategoryScheduleDesignUpdateSection.xml} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/code/Magento/Catalog/Test/Mftf/Section/{AdminCategoryScheduleDesingUpdateSection.xml => AdminCategoryScheduleDesignUpdateSection.xml} (90%)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
index 5c5dfe8901563..15fcf5f7d4000 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Page/AdminCategoryEditPage.xml
@@ -19,6 +19,6 @@
         <section name="AdminCategoryModalSection"/>
         <section name="AdminCategoryMessagesSection"/>
         <section name="AdminCategoryContentSection"/>
-        <section name="AdminCategoryScheduleDesingUpdateSection"/>
+        <section name="AdminCategoryScheduleDesignUpdateSection"/>
     </page>
 </pages>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
similarity index 90%
rename from app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml
rename to app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
index e1b66b3c18260..a65d2c9e63bef 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesingUpdateSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
@@ -7,7 +7,7 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
-    <section name="AdminCategoryScheduleDesingUpdateSection">
+    <section name="AdminCategoryScheduleDesignUpdateSection">
         <element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/>
         <element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/>
     </section>

From 56fff4c5a8cf90c0d8914590fde7bd315b504c75 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 16 Oct 2020 11:22:37 +0300
Subject: [PATCH 558/671] MC-29405: PHPStan: "Class does not have a constructor
 and must be instantiated without any parameters" errors

---
 .../Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php | 1 -
 .../Unit/Model/Customer/Attribute/Backend/ShippingTest.php     | 1 -
 .../Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php | 3 ---
 3 files changed, 5 deletions(-)

diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
index 4f318948097cc..65f9b62b426c0 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
@@ -12,7 +12,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class BillingTest extends TestCase
 {
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
index 6270905ca2e85..1f5485309cc19 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
@@ -12,7 +12,6 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
 
 class ShippingTest extends TestCase
 {
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
index 0ce450df39b59..b7f2def1c0fbd 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
@@ -7,10 +7,7 @@
 
 namespace Magento\Theme\Test\Unit\Block\Adminhtml\Design\Config\Edit;
 
-use Magento\Backend\Block\Widget\Context;
-use Magento\Framework\UrlInterface;
 use Magento\Theme\Block\Adminhtml\Design\Config\Edit\SaveButton;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class SaveButtonTest extends TestCase

From 0a02873d0aa0889df7eb53ef5d4834c6c1fdedfd Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Fri, 16 Oct 2020 11:50:18 +0300
Subject: [PATCH 559/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../CategoryRepository/PopulateWithValues.php | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
index 2a313119f9c8e..847400ba77c26 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
@@ -15,6 +15,7 @@
 use Magento\Eav\Model\Entity\Attribute\ScopedAttributeInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Store\Model\Store;
 
 /**
  * Add data to category entity and populate with default values
@@ -68,31 +69,34 @@ public function __construct(
      */
     public function execute(CategoryInterface $category, array $existingData): void
     {
-        $storeId = $existingData['store_id'];
-        $overriddenValues = array_filter(
-            $category->getData(),
-            function ($key) use ($category, $storeId) {
-                /** @var Category $category */
-                return $this->scopeOverriddenValue->containsValue(
-                    CategoryInterface::class,
-                    $category,
-                    $key,
-                    $storeId
-                );
-            },
-            ARRAY_FILTER_USE_KEY
-        );
-        $defaultValues = array_diff_key($category->getData(), $overriddenValues);
-        array_walk(
-            $defaultValues,
-            function (&$value, $key) {
-                $attributes = $this->getAttributes();
-                if (isset($attributes[$key]) && !$attributes[$key]->isStatic()) {
-                    $value = null;
+        $storeId = $existingData['store_id'] ?? Store::DEFAULT_STORE_ID;
+        if ((int)$storeId !== Store::DEFAULT_STORE_ID) {
+            $overriddenValues = array_filter(
+                $category->getData(),
+                function ($key) use ($category, $storeId) {
+                    /** @var Category $category */
+                    return $this->scopeOverriddenValue->containsValue(
+                        CategoryInterface::class,
+                        $category,
+                        $key,
+                        $storeId
+                    );
+                },
+                ARRAY_FILTER_USE_KEY
+            );
+            $defaultValues = array_diff_key($category->getData(), $overriddenValues);
+            array_walk(
+                $defaultValues,
+                function (&$value, $key) {
+                    $attributes = $this->getAttributes();
+                    if (isset($attributes[$key]) && !$attributes[$key]->isStatic()) {
+                        $value = null;
+                    }
                 }
-            }
-        );
-        $category->addData($defaultValues);
+            );
+            $category->addData($defaultValues);
+        }
+
         $category->addData($existingData);
         $useDefaultAttributes = array_filter(
             $category->getData(),

From 8d97104395928f7e328be329c46188992a616a2c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 16 Oct 2020 14:43:20 +0300
Subject: [PATCH 560/671] MC-29402: PHPStan: "Anonymous function has an unused
 use" errors

---
 app/code/Magento/Customer/Controller/Adminhtml/Index.php    | 1 -
 setup/src/Magento/Setup/Console/Command/RollbackCommand.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
index f03f55b16e0c7..9595e473c1869 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -289,7 +289,6 @@ protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Resul
     protected function _addSessionErrorMessages($messages)
     {
         $messages = (array)$messages;
-        $session = $this->_getSession();
 
         $callback = function ($error) {
             if (!$error instanceof Error) {
diff --git a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
index e4616ae5e271b..e114c84ba79bc 100644
--- a/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
+++ b/setup/src/Magento/Setup/Console/Command/RollbackCommand.php
@@ -122,7 +122,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // we must have an exit code higher than zero to indicate something was wrong
             return \Magento\Framework\Console\Cli::RETURN_FAILURE;
         }
-        $returnValue = $this->maintenanceModeEnabler->executeInMaintenanceMode(
+
+        return $this->maintenanceModeEnabler->executeInMaintenanceMode(
             function () use ($input, $output) {
                 try {
                     $helper = $this->getHelper('question');
@@ -152,7 +153,6 @@ function () use ($input, $output) {
             $output,
             false
         );
-        return $returnValue;
     }
 
     /**

From b09239f9750289ea63880933f0296332445f5d8c Mon Sep 17 00:00:00 2001
From: Buba Suma <soumah@adobe.com>
Date: Thu, 15 Oct 2020 14:30:26 -0500
Subject: [PATCH 561/671] MC-38309: [CLOUD] empty cart after login

- Fix guest session is destroyed after password reset
---
 .../Customer/Api/SessionCleanerInterface.php  |   2 +-
 .../Customer/Controller/Account/EditPost.php  |  10 +-
 .../Controller/Account/ResetPasswordPost.php  |   9 +-
 .../Customer/Model/Session/SessionCleaner.php |   9 +-
 .../Customer/Model/AccountManagementTest.php  | 134 ++++++++++++++++--
 5 files changed, 143 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/Customer/Api/SessionCleanerInterface.php b/app/code/Magento/Customer/Api/SessionCleanerInterface.php
index eb24712105f96..d8534f8b34e83 100644
--- a/app/code/Magento/Customer/Api/SessionCleanerInterface.php
+++ b/app/code/Magento/Customer/Api/SessionCleanerInterface.php
@@ -13,7 +13,7 @@
 interface SessionCleanerInterface
 {
     /**
-     * Destroy all active customer sessions related to given customer id, including current session.
+     * Destroy all active customer sessions related to given customer except current session.
      *
      * @param int $customerId
      * @return void
diff --git a/app/code/Magento/Customer/Controller/Account/EditPost.php b/app/code/Magento/Customer/Controller/Account/EditPost.php
index 04b5b72ae776b..6b59986f8ec5f 100644
--- a/app/code/Magento/Customer/Controller/Account/EditPost.php
+++ b/app/code/Magento/Customer/Controller/Account/EditPost.php
@@ -33,7 +33,8 @@
 use Magento\Framework\Phrase;
 
 /**
- * Class EditPost
+ * Customer edit account information controller
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EditPost extends AbstractAccount implements CsrfAwareActionInterface, HttpPostActionInterface
@@ -185,6 +186,7 @@ public function validateForCsrf(RequestInterface $request): ?bool
      * Change customer email or password action
      *
      * @return \Magento\Framework\Controller\Result\Redirect
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
@@ -217,6 +219,12 @@ public function execute()
                 );
                 $this->dispatchSuccessEvent($customerCandidateDataObject);
                 $this->messageManager->addSuccessMessage(__('You saved the account information.'));
+                // logout from current session if password changed.
+                if ($isPasswordChanged) {
+                    $this->session->logout();
+                    $this->session->start();
+                    return $resultRedirect->setPath('customer/account/login');
+                }
                 return $resultRedirect->setPath('customer/account');
             } catch (InvalidEmailOrPasswordException $e) {
                 $this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
index a127f2acf538f..1bb5aea9b1dc9 100644
--- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
@@ -14,9 +14,7 @@
 use Magento\Customer\Model\Customer\CredentialsValidator;
 
 /**
- * Class ResetPasswordPost
- *
- * @package Magento\Customer\Controller\Account
+ * Customer reset password controller
  */
 class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface
 {
@@ -91,6 +89,11 @@ public function execute()
                 $resetPasswordToken,
                 $password
             );
+            // logout from current session if password changed.
+            if ($this->session->isLoggedIn()) {
+                $this->session->logout();
+                $this->session->start();
+            }
             $this->session->unsRpToken();
             $this->messageManager->addSuccessMessage(__('You updated your password.'));
             $resultRedirect->setPath('*/*/login');
diff --git a/app/code/Magento/Customer/Model/Session/SessionCleaner.php b/app/code/Magento/Customer/Model/Session/SessionCleaner.php
index 1423c94782535..5118c20329aaa 100644
--- a/app/code/Magento/Customer/Model/Session/SessionCleaner.php
+++ b/app/code/Magento/Customer/Model/Session/SessionCleaner.php
@@ -71,13 +71,6 @@ public function __construct(
      */
     public function clearFor(int $customerId): void
     {
-        if ($this->sessionManager->isSessionExists()) {
-            //delete old session and move data to the new session
-            //use this instead of $this->sessionManager->regenerateId because last one doesn't delete old session
-            // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            session_regenerate_id(true);
-        }
-
         $sessionLifetime = $this->scopeConfig->getValue(
             Config::XML_PATH_COOKIE_LIFETIME,
             ScopeInterface::SCOPE_STORE
@@ -89,6 +82,8 @@ public function clearFor(int $customerId): void
         $visitorCollection = $this->visitorCollectionFactory->create();
         $visitorCollection->addFieldToFilter('customer_id', $customerId);
         $visitorCollection->addFieldToFilter('last_visit_at', ['from' => $activeSessionsTime]);
+        $visitorCollection->addFieldToFilter('session_id', ['neq' => $this->sessionManager->getSessionId()]);
+
         /** @var \Magento\Customer\Model\Visitor $visitor */
         foreach ($visitorCollection->getItems() as $visitor) {
             $sessionId = $visitor->getSessionId();
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
index 6f2cf2d76bd11..3a16d3eafd6ce 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Url as UrlBuilder;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
@@ -113,6 +114,10 @@ protected function tearDown(): void
         $customerRegistry->remove(1);
         $addressRegistry->remove(1);
         $addressRegistry->remove(2);
+        /** @var \Magento\Customer\Model\ResourceModel\Visitor $resourceModel */
+        $resourceModel = $this->objectManager->get(\Magento\Customer\Model\ResourceModel\Visitor::class);
+        $resourceModel->getConnection()->delete($resourceModel->getMainTable());
+        parent::tearDown();
     }
 
     /**
@@ -158,19 +163,52 @@ public function testChangePassword()
     {
         /** @var SessionManagerInterface $session */
         $session = $this->objectManager->get(SessionManagerInterface::class);
-        $oldSessionId = $session->getSessionId();
-        $session->setTestData('test');
+        $time = time();
+
+        $session->start();
+        $guessSessionId = $session->getSessionId();
+        $this->createVisitorSession($guessSessionId);
+        $session->setTestData('guest_session_data');
+
+        // open new session
+        $activeSessionId = uniqid("active-$time-");
+        $this->startNewSession($activeSessionId);
+        $this->createVisitorSession($activeSessionId, 1);
+        $session->setTestData('customer_session_data_1');
+
+        // open new session
+        $currentSessionId = uniqid("current-$time-");
+        $this->startNewSession($currentSessionId);
+        $this->createVisitorSession($currentSessionId, 1);
+        $session->setTestData('customer_session_data_current');
+
+        // change password
         $this->accountManagement->changePassword('customer@example.com', 'password', 'new_Password123');
-
-        $this->assertTrue(
-            $oldSessionId !== $session->getSessionId(),
-            'Customer session id wasn\'t regenerated after change password'
+        $this->assertEquals(
+            $currentSessionId,
+            $session->getSessionId(),
+            'Current session was renewed'
         );
 
-        $session->destroy();
-        $session->setSessionId($oldSessionId);
+        // open customer active session
+        $this->startNewSession($activeSessionId);
+        $this->assertNull($session->getTestData(), 'Customer active session data wasn\'t cleaned up');
+
+        // open customer current session
+        $this->startNewSession($currentSessionId);
+        $this->assertEquals(
+            'customer_session_data_current',
+            $session->getTestData(),
+            'Customer current session data was cleaned up'
+        );
 
-        $this->assertNull($session->getTestData(), 'Customer session data wasn\'t cleaned');
+        // open guess session
+        $this->startNewSession($guessSessionId);
+        $this->assertEquals(
+            'guest_session_data',
+            $session->getTestData(),
+            'Guest session data was cleaned up'
+        );
 
         $this->accountManagement->authenticate('customer@example.com', 'new_Password123');
     }
@@ -392,11 +430,58 @@ public function testValidateResetPasswordLinkTokenAmbiguous()
      */
     public function testResetPassword()
     {
+        /** @var SessionManagerInterface $session */
+        $session = $this->objectManager->get(SessionManagerInterface::class);
+        $time = time();
+
+        $session->start();
+        $guessSessionId = $session->getSessionId();
+        $this->createVisitorSession($guessSessionId);
+        $session->setTestData('guest_session_data');
+
+        // open new session
+        $activeSessionId = uniqid("active-$time-");
+        $this->startNewSession($activeSessionId);
+        $this->createVisitorSession($activeSessionId, 1);
+        $session->setTestData('customer_session_data_1');
+
+        // open new session
+        $currentSessionId = uniqid("current-$time-");
+        $this->startNewSession($currentSessionId);
+        $this->createVisitorSession($currentSessionId, 1);
+        $session->setTestData('customer_session_data_current');
+
         $resetToken = 'lsdj579slkj5987slkj595lkj';
         $password = 'new_Password123';
 
         $this->setResetPasswordData($resetToken, 'Y-m-d H:i:s');
         $this->assertTrue($this->accountManagement->resetPassword('customer@example.com', $resetToken, $password));
+
+        $this->assertEquals(
+            $currentSessionId,
+            $session->getSessionId(),
+            'Current session was renewed'
+        );
+
+        // open customer active session
+        $this->startNewSession($activeSessionId);
+        $this->assertNull($session->getTestData(), 'Customer active session data wasn\'t cleaned up');
+
+        // open customer current session
+        $this->startNewSession($currentSessionId);
+        $this->assertEquals(
+            'customer_session_data_current',
+            $session->getTestData(),
+            'Customer current session data was cleaned up'
+        );
+
+        // open guess session
+        $this->startNewSession($guessSessionId);
+        $this->assertEquals(
+            'guest_session_data',
+            $session->getTestData(),
+            'Guest session data was cleaned up'
+        );
     }
 
     /**
@@ -727,4 +812,35 @@ protected function setResetPasswordData(
         $customerModel->setRpTokenCreatedAt(date($date));
         $customerModel->save();
     }
+
+    /**
+     * @param string $sessionId
+     */
+    private function startNewSession(string $sessionId): void
+    {
+        /** @var SessionManagerInterface $session */
+        $session = $this->objectManager->get(SessionManagerInterface::class);
+        // close session and cleanup session variable
+        $session->writeClose();
+        $session->clearStorage();
+        // open new session
+        $session->setSessionId($sessionId);
+        $session->start();
+    }
+
+    /**
+     * @param string $sessionId
+     * @param int|null $customerId
+     * @return Visitor
+     */
+    private function createVisitorSession(string $sessionId, ?int $customerId = null): Visitor
+    {
+        /** @var Visitor $visitor */
+        $visitor = Bootstrap::getObjectManager()->create(Visitor::class);
+        $visitor->setCustomerId($customerId);
+        $visitor->setSessionId($sessionId);
+        $visitor->setLastVisitAt((new \DateTime())->format(DateTime::DATETIME_PHP_FORMAT));
+        $visitor->save();
+        return $visitor;
+    }
 }

From eaa08eef94eabd569ab29fb476df28591ae65e1a Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Fri, 16 Oct 2020 15:32:29 +0300
Subject: [PATCH 562/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../CategoryRepository/PopulateWithValues.php  | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
index 847400ba77c26..c6feb049e1a10 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository/PopulateWithValues.php
@@ -42,6 +42,11 @@ class PopulateWithValues
      */
     private $filterBuilder;
 
+    /**
+     * @var AttributeInterface[]
+     */
+    private $attributes;
+
     /**
      * @param ScopeOverriddenValue $scopeOverriddenValue
      * @param AttributeRepository $attributeRepository
@@ -120,8 +125,12 @@ function () {
      *
      * @return AttributeInterface[]
      */
-    private function getAttributes()
+    private function getAttributes(): array
     {
+        if ($this->attributes) {
+            return $this->attributes;
+        }
+
         $searchResult = $this->attributeRepository->getList(
             $this->searchCriteriaBuilder->addFilters(
                 [
@@ -133,11 +142,12 @@ private function getAttributes()
                 ]
             )->create()
         );
-        $result = [];
+
+        $this->attributes = [];
         foreach ($searchResult->getItems() as $attribute) {
-            $result[$attribute->getAttributeCode()] = $attribute;
+            $this->attributes[$attribute->getAttributeCode()] = $attribute;
         }
 
-        return $result;
+        return $this->attributes;
     }
 }

From 40134a616f101df6e98283259810de813d4f66e7 Mon Sep 17 00:00:00 2001
From: TuNa <ladiesman9x@gmail.com>
Date: Fri, 16 Oct 2020 21:49:51 +0700
Subject: [PATCH 563/671] Fix missing escape less calc

up


update


up
---
 .../web/css/source/module/order/_payment-shipping.less     | 7 ++++++-
 .../Magento/backend/web/css/source/forms/_fields.less      | 6 ++++--
 .../Magento/luma/Magento_Sales/web/css/source/_module.less | 6 +++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
index 2c55d243ebe07..121de6e7b6d8a 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
+++ b/app/design/adminhtml/Magento/backend/Magento_Sales/web/css/source/module/order/_payment-shipping.less
@@ -9,13 +9,15 @@
 
 .admin__payment-method-wrapper {
     margin: 0;
-    width: calc(50% - @indent__l);
+    width: ~'calc(50% - @{indent__l})';
+
     .admin__field {
         margin-left: 0;
         &:first-child {
             margin-top: 1.5rem;
         }
     }
+
     .admin__payment-methods {
         margin: 0;
     }
@@ -62,6 +64,7 @@
     position: absolute;
     right: 0;
     top: 0;
+
     span {
         background-color: @color-white;
         display: block;
@@ -71,6 +74,7 @@
         position: absolute;
         top: 43px;
     }
+
     .order-shipping-address & {
         span {
             top: 0;
@@ -102,6 +106,7 @@
     + .order-payment-currency {
         margin-top: @indent__s;
     }
+    
     .admin__table-secondary {
         margin-top: @indent__s;
         &:extend(.abs-admin__table-secondary-edit-order all);
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
index 256ac453578df..b86b0005e88fb 100644
--- a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
+++ b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -163,6 +163,7 @@
         .admin__field-control {
             padding-top: 7px;
         }
+        
         .admin__field-option {
             padding-top: 0;
         }
@@ -361,6 +362,7 @@
         cursor: inherit;
         opacity: 1;
         outline: inherit;
+
         .admin__action-multiselect-wrap {
             .admin__action-multiselect {
                 .__form-control-pattern__disabled();
@@ -433,7 +435,7 @@
             font-size: 1.7rem;
             font-weight: @font-weight__bold;
             padding: 1.7rem 0;
-            width: calc(100% - @indent__l);
+            width: ~'calc(100% - @{indent__l})';
         }
 
         .admin__field-option {
@@ -704,6 +706,7 @@
                 width: 100%;
             }
         }
+
         & > .admin__field-label {
             text-align: left;
         }
@@ -819,4 +822,3 @@
         overflow: hidden;
     }
 }
-
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
index bab8a2abb9b93..f8ab8ddb088ec 100644
--- a/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
+++ b/app/design/frontend/Magento/luma/Magento_Sales/web/css/source/_module.less
@@ -210,6 +210,7 @@
 
         .items-qty {
             &:extend(.abs-reset-list all);
+            
             .item {
                 white-space: nowrap;
             }
@@ -347,13 +348,15 @@
 
         .product-item-name {
             float: left;
-            width: calc(100% - 20px);
+            width: calc(~'100% - 20px');
         }
+
         .product-item::after {
             clear: both;
             content: '';
             display: table;
         }
+
         .product-item {
             .label {
                 &:extend(.abs-visually-hidden all);
@@ -491,6 +494,7 @@
 
         .data.table .col.options {
             padding: 0 10px 15px;
+
             &:before {
                 display: none;
             }

From f882de3751ca673841eba17cfc7b7ea458314b2c Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 16 Oct 2020 10:17:18 -0500
Subject: [PATCH 564/671] 29251 revert is_available_for_selection

---
 .../Model/Options/Collection.php              | 83 +------------------
 .../etc/schema.graphqls                       |  2 -
 2 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
index 7a27964897828..5e3666407a383 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Collection.php
@@ -10,14 +10,10 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
-use Magento\Catalog\Model\ProductRepository;
-use Magento\ConfigurableProduct\Helper\Data;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection
     as AttributeCollection;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
-use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\EntityManager\MetadataPool;
 
 /**
@@ -35,36 +31,11 @@ class Collection
      */
     private $productFactory;
 
-    /**
-     * @var ProductRepository
-     */
-    private $productRepository;
-
     /**
      * @var MetadataPool
      */
     private $metadataPool;
 
-    /**
-     * @var Data
-     */
-    private $configurableProductHelper;
-
-    /**
-     * @var Metadata
-     */
-    private $optionsMetadata;
-
-    /**
-     * @var SelectionUidFormatter
-     */
-    private $selectionUidFormatter;
-
-    /**
-     * @var SearchCriteriaBuilder
-     */
-    private $searchCriteriaBuilder;
-
     /**
      * @var int[]
      */
@@ -78,32 +49,16 @@ class Collection
     /**
      * @param CollectionFactory $attributeCollectionFactory
      * @param ProductFactory $productFactory
-     * @param ProductRepository $productRepository
      * @param MetadataPool $metadataPool
-     * @param Data $configurableProductHelper
-     * @param Metadata $optionsMetadata
-     * @param SelectionUidFormatter $selectionUidFormatter
-     * @param SearchCriteriaBuilder $searchCriteriaBuilder
      */
     public function __construct(
         CollectionFactory $attributeCollectionFactory,
         ProductFactory $productFactory,
-        ProductRepository $productRepository,
-        MetadataPool $metadataPool,
-        Data $configurableProductHelper,
-        Metadata $optionsMetadata,
-        SelectionUidFormatter $selectionUidFormatter,
-        SearchCriteriaBuilder $searchCriteriaBuilder
+        MetadataPool $metadataPool
     ) {
         $this->attributeCollectionFactory = $attributeCollectionFactory;
         $this->productFactory = $productFactory;
-        $this->productRepository = $productRepository;
         $this->metadataPool = $metadataPool;
-        $this->configurableProductHelper = $configurableProductHelper;
-        $this->optionsMetadata = $optionsMetadata;
-        $this->selectionUidFormatter = $selectionUidFormatter;
-        $this->searchCriteriaBuilder = $searchCriteriaBuilder ??
-            ObjectManager::getInstance()->get(SearchCriteriaBuilder::class);
     }
 
     /**
@@ -156,8 +111,6 @@ private function fetch() : array
             $attributeCollection->setProductFilter($product);
         }
 
-        $products = $this->getProducts($this->productIds);
-
         /** @var Attribute $attribute */
         foreach ($attributeCollection->getItems() as $attribute) {
             $productId = (int)$attribute->getProductId();
@@ -175,42 +128,8 @@ private function fetch() : array
             $this->attributeMap[$productId][$attribute->getId()]['values'] = $attributeData['options'];
             $this->attributeMap[$productId][$attribute->getId()]['label']
                 = $attribute->getProductAttribute()->getStoreLabel();
-
-            if (isset($products[$productId])) {
-                $options = $this->configurableProductHelper->getOptions(
-                    $products[$productId],
-                    $this->optionsMetadata->getAllowProducts($products[$productId])
-                );
-                foreach ($attributeData['options'] as $index => $value) {
-                    $this->attributeMap[$productId][$attribute->getId()]['values'][$index]['uid']
-                        = $this->selectionUidFormatter->encode((int)$attribute->getId(), (int)$value['value_index']);
-                    $this->attributeMap[$productId][$attribute->getId()]['values'][$index]
-                        ['is_available_for_selection'] =
-                        isset($options[$attribute->getAttributeId()][$value['value_index']])
-                        && $options[$attribute->getAttributeId()][$value['value_index']];
-                }
-            }
         }
 
         return $this->attributeMap;
     }
-
-    /**
-     * Load products by link field ids
-     *
-     * @param int[] $productIds
-     * @return ProductInterface[]
-     */
-    private function getProducts($productIds)
-    {
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
-        $this->searchCriteriaBuilder->addFilter($linkField, $productIds, 'in');
-        $searchCriteria = $this->searchCriteriaBuilder->create();
-        $products = $this->productRepository->getList($searchCriteria)->getItems();
-        $productsLinkFieldMap = [];
-        foreach ($products as $product) {
-            $productsLinkFieldMap[$product->getData($linkField)] = $product;
-        }
-        return $productsLinkFieldMap;
-    }
 }
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
index 88d0f8e212acf..6a58f7a77dfe2 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/schema.graphqls
@@ -35,8 +35,6 @@ type ConfigurableProductOptions @doc(description: "ConfigurableProductOptions de
 }
 
 type ConfigurableProductOptionsValues @doc(description: "ConfigurableProductOptionsValues contains the index number assigned to a configurable product option") {
-    uid: ID!
-    is_available_for_selection: Boolean!
     value_index: Int @doc(description: "A unique index number assigned to the configurable product option")
     label: String @doc(description: "The label of the product")
     default_label: String @doc(description: "The label of the product on the default store")

From ab0f3177ab48775b6de76cc2be4d7b89b593dfdc Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Fri, 16 Oct 2020 11:55:32 -0500
Subject: [PATCH 565/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 .../Framework/Mail/TransportBuilderTest.php   | 80 +++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
index 9dc8aa91237d8..47c8da84902d4 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Mail/TransportBuilderTest.php
@@ -116,4 +116,84 @@ public function emailDataProvider(): array
             ]
         ];
     }
+
+    /**
+     * Test if invalid email in the queue will not fail the entire queue from being sent
+     *
+     * @magentoDataFixture Magento/Email/Model/_files/email_template.php
+     * @magentoDbIsolation enabled
+     *
+     * @param string|array $emails
+     * @dataProvider invalidEmailDataProvider
+     * @throws LocalizedException
+     */
+    public function testAddToInvalidEmailInTheQueue($emails)
+    {
+        $template = $this->template->load('email_exception_fixture', 'template_code');
+        $templateId = $template->getId();
+
+        switch ($template->getType()) {
+            case TemplateTypesInterface::TYPE_TEXT:
+                $templateType = MimeInterface::TYPE_TEXT;
+                break;
+
+            case TemplateTypesInterface::TYPE_HTML:
+                $templateType = MimeInterface::TYPE_HTML;
+                break;
+
+            default:
+                $templateType = '';
+                $this->fail('Unsupported Mime Type');
+        }
+
+        $this->builder->setTemplateModel(BackendTemplate::class);
+
+        $vars = ['reason' => 'Reason', 'customer' => 'Customer'];
+        $options = ['area' => 'frontend', 'store' => 1];
+        $this->builder->setTemplateIdentifier($templateId)->setTemplateVars($vars)->setTemplateOptions($options);
+
+        $allEmails = $emails[0];
+        $validOnlyEmails = $emails[1];
+
+        foreach ($allEmails as $email) {
+            $this->builder->addTo($email);
+        }
+
+        /** @var EmailMessage $emailMessage */
+        $emailMessage = $this->builder->getTransport()->getMessage();
+        $this->assertStringContainsStringIgnoringCase($templateType, $emailMessage->getHeaders()['Content-Type']);
+
+        $resultEmails = [];
+        /** @var Address $toAddress */
+        foreach ($emailMessage->getTo() as $address) {
+            $resultEmails[] = $address->getEmail();
+        }
+
+        $this->assertEquals($validOnlyEmails, $resultEmails);
+    }
+
+    /**
+     * @return array
+     */
+    public function invalidEmailDataProvider(): array
+    {
+        return [
+            [
+                [
+                    [
+                        'billy.everything@someserver.com',
+                        'billy.everythingsomeserver.com',
+                        'billy.everything2@someserver.com',
+                        'billy.everythin2gsomeserver.com',
+                        'billy.everything3@someserver.com'
+                    ],
+                    [
+                        'billy.everything@someserver.com',
+                        'billy.everything2@someserver.com',
+                        'billy.everything3@someserver.com'
+                    ]
+                ]
+            ]
+        ];
+    }
 }

From d0249eecfd93e9d5725c77b31c76f31c3f08c6c9 Mon Sep 17 00:00:00 2001
From: Andrii Kasian <akasian@magento.com>
Date: Fri, 16 Oct 2020 17:25:51 -0500
Subject: [PATCH 566/671] MessageValidator fails on hash arrays that dont have
 0 element
 Magento\Framework\MessageQueue\Test\Unit\MessageValidatorTest::testInvalidMessageType
 with data set #11 (array('object_interface',
 'Magento\Customer\Api\Data\Cus...face[]'), array(23, 545), 'Data in topic
 "topic" must be...e[]". ') PHPUnit\Framework\Exception: Notice: Undefined
 offset: 0 in
 /magento/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php:157.

---
 .../Magento/Framework/MessageQueue/MessageValidator.php   | 4 ++--
 .../MessageQueue/Test/Unit/MessageValidatorTest.php       | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
index 45ce351ed97bb..ffa980c882640 100644
--- a/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
+++ b/lib/internal/Magento/Framework/MessageQueue/MessageValidator.php
@@ -119,7 +119,7 @@ protected function validatePrimitiveType($message, $messageType, $topic)
         $realType = $this->getRealType($message);
         if ($realType == 'array' && count($message) == 0) {
             return;
-        } elseif ($realType == 'array' && count($message) > 0) {
+        } elseif ($realType == 'array' && isset($message[0])) {
             $realType = $this->getRealType($message[0]);
             $compareType = preg_replace('/\[\]/', '', $messageType);
         }
@@ -153,7 +153,7 @@ protected function validateClassType($message, $messageType, $topic)
         $realType = $this->getRealType($message);
         if ($realType == 'array' && count($message) == 0) {
             return;
-        } elseif ($realType == 'array' && count($message) > 0) {
+        } elseif ($realType == 'array' && isset($message[0])) {
             $message = $message[0];
             $compareType = preg_replace('/\[\]/', '', $messageType);
         }
diff --git a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
index d324a9dbcfda9..c7d3e35aee3de 100644
--- a/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
+++ b/lib/internal/Magento/Framework/MessageQueue/Test/Unit/MessageValidatorTest.php
@@ -255,6 +255,14 @@ public function getQueueConfigRequestType()
                 $customerMock,
                 'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". '
             ],
+            [
+                [
+                    CommunicationConfig::TOPIC_REQUEST_TYPE => CommunicationConfig::TOPIC_REQUEST_TYPE_CLASS,
+                    CommunicationConfig::TOPIC_REQUEST => 'Magento\Customer\Api\Data\CustomerInterface[]'
+                ],
+                [1=>23, 3=>545],
+                'Data in topic "topic" must be of type "Magento\Customer\Api\Data\CustomerInterface[]". '
+            ],
         ];
     }
 }

From f4d2ff81c74a62007cf6430b8371d06a54a0caa3 Mon Sep 17 00:00:00 2001
From: mage2pratik <magepratik@gmail.com>
Date: Sun, 18 Oct 2020 01:30:55 +0530
Subject: [PATCH 567/671] XSD URN format

---
 .../TestModuleDefaultHydrator/etc/extension_attributes.xml      | 2 +-
 .../_files/Magento/TestModuleDefaultHydrator/etc/module.xml     | 2 +-
 .../Magento/Framework/View/_files/UiComponent/theme/theme.xml   | 2 +-
 .../Magento/Framework/View/_files/static/theme/theme.xml        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/extension_attributes.xml b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/extension_attributes.xml
index 96dd60809754a..e1154f407e857 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/extension_attributes.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/extension_attributes.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Api/etc/extension_attributes.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
     <extension_attributes for="Magento\Customer\Api\Data\CustomerInterface">
         <attribute code="extension_attribute" type="Magento\TestModuleDefaultHydrator\Api\Data\ExtensionAttributeInterface" />
     </extension_attributes>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml
index ca4ded8ff3190..a8acf9c4acc77 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleDefaultHydrator/etc/module.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Magento_TestModuleDefaultHydrator">
     </module>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/UiComponent/theme/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/UiComponent/theme/theme.xml
index 532670df30dfe..f1360542ff011 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/UiComponent/theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/UiComponent/theme/theme.xml
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 -->
-<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
+<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
     <title>Test theme</title>
 </theme>
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/theme.xml b/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/theme.xml
index 532670df30dfe..f1360542ff011 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/theme.xml
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/_files/static/theme/theme.xml
@@ -4,6 +4,6 @@
  * See COPYING.txt for license details.
  */
 -->
-<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Config/etc/theme.xsd">
+<theme xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/theme.xsd">
     <title>Test theme</title>
 </theme>

From 3132e0ae2bceeb2de38c357b3072f927ea0f94a0 Mon Sep 17 00:00:00 2001
From: Kate Kyzyma <kate@atwix.com>
Date: Mon, 19 Oct 2020 09:53:31 +0300
Subject: [PATCH 568/671] fix minor code style issues

---
 .../AdminOpenCmsBlocksGridActionGroup.xml     | 27 +++++++++----------
 ...dminSelectCMSBlockStoreViewActionGroup.xml |  3 ++-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
index fca85651f7fda..4b57e0c1274f6 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-        <!--
-         /**
-          * Copyright © Magento, Inc. All rights reserved.
-          * See COPYING.txt for license details.
-          */
-        -->
+<!--
+ /**
+  * 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="AdminOpenCmsBlocksGridActionGroup">
-    <annotations>
-        <description>Goes to the Cms Blocks grid page.</description>
-    </annotations>
-
-    <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
-    <waitForPageLoad stepKey="waitForPageLoad"/>
-</actionGroup>
+    <actionGroup name="AdminOpenCmsBlocksGridActionGroup">
+        <annotations>
+            <description>Goes to the Cms Blocks grid page.</description>
+        </annotations>
+        <amOnPage url="{{CmsBlocksPage.url}}" stepKey="navigateToCMSBlocksGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
index 8c543e29c1ed7..e5b8caf1e209f 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
@@ -5,6 +5,7 @@
   * 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="AdminSelectCMSBlockStoreViewActionGroup">
@@ -12,6 +13,6 @@
             <argument name="storeViewName" type="string"/>
         </arguments>
 
-        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView" />
+        <selectOption selector="{{BlockNewPageBasicFieldsSection.storeView}}" userInput="{{storeViewName}}" stepKey="selectStoreView"/>
     </actionGroup>
 </actionGroups>

From b0a3cf71e5809ac1037ab803736126e0039b4460 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Mon, 19 Oct 2020 11:12:58 +0300
Subject: [PATCH 569/671] MC-35783: "1 item(s) need your attention." still
 visible in mini cart after product remove

---
 .../Test/Mftf/Data/NonexistentProductData.xml | 19 +++++++++++++++++++
 .../Section/StorefrontMinicartSection.xml     |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/NonexistentProductData.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/NonexistentProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/NonexistentProductData.xml
new file mode 100644
index 0000000000000..73b0765394333
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/NonexistentProductData.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="NonexistentProduct" type="product">
+        <data key="sku">NonexistentProductSku</data>
+        <data key="qty">1</data>
+    </entity>
+    <entity name="SecondNonexistentProduct" type="product">
+        <data key="sku">SecondNonexistentProductSku</data>
+        <data key="qty">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
index dcab48dbc5368..1ecf97c50c81a 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StorefrontMinicartSection.xml
@@ -39,7 +39,7 @@
         <element name="emptyMiniCart" type="text" selector="//div[@class='minicart-wrapper']//span[@class='counter qty empty']/../.."/>
         <element name="minicartContent" type="block" selector="#minicart-content-wrapper"/>
         <element name="messageEmptyCart" type="text" selector="//*[@id='minicart-content-wrapper']//*[contains(@class,'subtitle empty')]"/>
-        <element name="emptyCartMessageContent" type="text" selector="#minicart-content-wrapper .minicart.empty.text"/>
+        <element name="emptyCartMessageContent" type="text" selector="#minicart-content-wrapper .minicart.empty.text" timeout="30"/>
         <element name="visibleItemsCountText" type="text" selector="//div[@class='items-total']"/>
         <element name="productQuantity" type="input" selector="//*[@id='mini-cart']//a[contains(text(),'{{productName}}')]/../..//div[@class='details-qty qty']//input[@data-item-qty='{{qty}}']" parameterized="true"/>
         <element name="productImage" type="text" selector="//ol[@id='mini-cart']//img[@class='product-image-photo']"/>

From 937295074db740e43fe83c3622300af176a4a6ba Mon Sep 17 00:00:00 2001
From: Namrata Vora <namrata@seepossible.com>
Date: Mon, 19 Oct 2020 14:06:38 +0530
Subject: [PATCH 570/671] Removed sortOrder from messages, authentication,
 progressBar, estimation, and sidebar checkout components as they are already
 been rendered without those sortOrders and individual getRegions at
 app/code/Magento/Checkout/view/frontend/web/template/onepage.html

---
 .../Checkout/view/frontend/layout/checkout_index_index.xml   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
index 192f20653f8c3..9b2497efb12d0 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -32,12 +32,10 @@
                                 </item>
                                 <item name="children" xsi:type="array">
                                     <item name="errors" xsi:type="array">
-                                        <item name="sortOrder" xsi:type="string">0</item>
                                         <item name="component" xsi:type="string">Magento_Ui/js/view/messages</item>
                                         <item name="displayArea" xsi:type="string">messages</item>
                                     </item>
                                     <item name="authentication" xsi:type="array">
-                                        <item name="sortOrder" xsi:type="string">1</item>
                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/authentication</item>
                                         <item name="displayArea" xsi:type="string">authentication</item>
                                         <item name="children" xsi:type="array">
@@ -50,7 +48,6 @@
                                         </item>
                                     </item>
                                     <item name="progressBar" xsi:type="array">
-                                        <item name="sortOrder" xsi:type="string">0</item>
                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/progress-bar</item>
                                         <item name="displayArea" xsi:type="string">progressBar</item>
                                         <item name="config" xsi:type="array">
@@ -61,7 +58,6 @@
                                         </item>
                                     </item>
                                     <item name="estimation" xsi:type="array">
-                                        <item name="sortOrder" xsi:type="string">10</item>
                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/estimation</item>
                                         <item name="displayArea" xsi:type="string">estimation</item>
                                         <item name="config" xsi:type="array">
@@ -335,7 +331,6 @@
                                         </item>
                                     </item>
                                     <item name="sidebar" xsi:type="array">
-                                        <item name="sortOrder" xsi:type="string">50</item>
                                         <item name="component" xsi:type="string">Magento_Checkout/js/view/sidebar</item>
                                         <item name="displayArea" xsi:type="string">sidebar</item>
                                         <item name="config" xsi:type="array">

From 59b6780dc888fe4bd8015de7d98c64eede46e8f8 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Mon, 19 Oct 2020 12:32:06 +0300
Subject: [PATCH 571/671] MC-36966: Create automated test for "The type of the
 State input field for the multistore is incorrect when restricted by country"

---
 ...stomer_for_second_website_with_address.php | 49 +++++++++++++++++++
 ...r_second_website_with_address_rollback.php | 37 ++++++++++++++
 .../Adminhtml/Order/Address/FormTest.php      | 32 ++++++++++++
 .../order_with_customer_on_second_website.php | 35 +++++++++++++
 ...th_customer_on_second_website_rollback.php | 13 +++++
 5 files changed, 166 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address_rollback.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address.php
new file mode 100644
index 0000000000000..1c2782dbe675b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\CustomerMetadataInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Model\Data\CustomerFactory;
+use Magento\Customer\Model\GroupManagement;
+use Magento\Eav\Model\AttributeRepository;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websiteId = $websiteRepository->get('test')->getId();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$store = $storeManager->getStore('fixture_third_store');
+/** @var AccountManagementInterface $accountManagment */
+$accountManagment = $objectManager->get(AccountManagementInterface::class);
+/** @var CustomerFactory $customerFactory */
+$customerFactory = $objectManager->get(CustomerFactory::class);
+/** @var AttributeRepository $attributeRepository */
+$attributeRepository = $objectManager->get(AttributeRepository::class);
+$gender = $attributeRepository->get(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, CustomerInterface::GENDER)
+    ->getSource()->getOptionId('Male');
+$defaultGroupId = $objectManager->get(GroupManagement::class)->getDefaultGroup($store->getStoreId())->getId();
+
+$customer = $customerFactory->create();
+$customer->setWebsiteId($websiteId)
+    ->setEmail('customer_second_ws_with_addr@example.com')
+    ->setGroupId($defaultGroupId)
+    ->setStoreId($store->getStoreId())
+    ->setFirstname('John')
+    ->setLastname('Smith')
+    ->setDefaultBilling(1)
+    ->setDefaultShipping(1)
+    ->setGender($gender);
+
+$accountManagment->createAccount($customer, 'Apassword1');
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address_rollback.php b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address_rollback.php
new file mode 100644
index 0000000000000..48e6f56d83442
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/customer_for_second_website_with_address_rollback.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Registry;
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$websiteId = $websiteRepository->get('test')->getId();
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $customer = $customerRepository->get('customer_second_ws_with_addr@example.com', $websiteId);
+    $customerRepository->delete($customer);
+} catch (NoSuchEntityException $e) {
+    //customer already deleted
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Address/FormTest.php b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Address/FormTest.php
index 493bf7ec37ec3..8657e62eb267e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Address/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Block/Adminhtml/Order/Address/FormTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Sales\Block\Adminhtml\Order\Address;
 
+use Magento\Directory\Model\ResourceModel\Country\CollectionFactory;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\View\LayoutInterface;
@@ -15,6 +16,7 @@
 use Magento\Sales\Api\Data\OrderInterfaceFactory;
 use Magento\TestFramework\App\Config;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Helper\Xpath;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -38,6 +40,9 @@ class FormTest extends TestCase
     /** @var OrderInterfaceFactory */
     private $orderFactory;
 
+    /** @var CollectionFactory */
+    private $countryCollectionFactory;
+
     /**
      * @inheritdoc
      */
@@ -50,6 +55,7 @@ protected function setUp(): void
         $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
         $this->registry = $this->objectManager->get(Registry::class);
         $this->objectManager->removeSharedInstance(Config::class);
+        $this->countryCollectionFactory = $this->objectManager->get(CollectionFactory::class);
     }
 
     /**
@@ -110,6 +116,32 @@ public function testCountryIdInNotAllowedList(): void
         $this->assertCountryField('CA');
     }
 
+    /**
+     * @magentoDbIsolation disabled
+     *
+     * @magentoDataFixture Magento/Sales/_files/order_with_customer_on_second_website.php
+     *
+     * @magentoConfigFixture default_store general/country/default UA
+     * @magentoConfigFixture default_store general/country/allow UA
+     *
+     * @return void
+     */
+    public function testFormRenderedWithSelectRegionInput(): void
+    {
+        $address = $this->getOrderAddress('100000001');
+        $this->registerOrderAddress($address);
+        $form = $this->block->getForm();
+        $countryElement = $form->getElement('country_id');
+        $this->assertNotNull($countryElement);
+        $this->assertEquals('US', $countryElement->getEscapedValue());
+        $html = $form->toHtml();
+        $regionIdSelectXpath = '//select[@id=\'region_id\']';
+        $this->assertEquals(1, Xpath::getElementsCountForXpath($regionIdSelectXpath, $html));
+        $countryOptionsXpath = '//select[@id=\'country_id\']/option';
+        $allowedCountriesCount = count($this->countryCollectionFactory->create()->loadByStore());
+        $this->assertEquals($allowedCountriesCount, Xpath::getElementsCountForXpath($countryOptionsXpath, $html));
+    }
+
     /**
      * Prepares address edit from block.
      *
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website.php
new file mode 100644
index 0000000000000..2433d8bd26281
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
+use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order.php');
+Resolver::getInstance()->requireDataFixture('Magento/Customer/_files/customer_for_second_website_with_address.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+$storeId = (int)$storeManager->getStore('fixture_third_store')->getId();
+$websiteId = (int)$storeManager->getWebsite('test')->getId();
+/** @var CustomerRepositoryInterface $customerRepository */
+$customerRepository = $objectManager->get(CustomerRepositoryInterface::class);
+$customerId = $customerRepository->get(
+    'customer_second_ws_with_addr@example.com',
+    $websiteId
+)->getId();
+/** @var OrderRepositoryInterface $orderRepository */
+$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+/** @var OrderInterface $order */
+$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
+$order->setCustomerId((int)$customerId)->setCustomerIsGuest(false)->setStoreId($storeId);
+$orderRepository->save($order);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website_rollback.php
new file mode 100644
index 0000000000000..b3a396e69164f
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_with_customer_on_second_website_rollback.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_rollback.php');
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Customer/_files/customer_for_second_website_with_address_rollback.php'
+);

From e5759ee020b5d33b242cb3b112d91ff1980d5538 Mon Sep 17 00:00:00 2001
From: Roman Zhupanyn <roma.dj.elf@gmail.com>
Date: Mon, 19 Oct 2020 16:53:20 +0300
Subject: [PATCH 572/671] MC-36956: Create automated test for "Upload Category
 Image"

---
 .../Catalog/Model/ImageUploaderTest.php       |  91 +++++++-----
 .../Model/ResourceModel/CategoryTest.php      | 129 ++++++++++++++++++
 .../magento_image with space in name.jpg      | Bin 0 -> 4025 bytes
 3 files changed, 189 insertions(+), 31 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image with space in name.jpg

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
index 51ebc4b03310e..09d08d23cf3e3 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ImageUploaderTest.php
@@ -8,47 +8,61 @@
 namespace Magento\Catalog\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Tests for the \Magento\Catalog\Model\ImageUploader class
  */
-class ImageUploaderTest extends \PHPUnit\Framework\TestCase
+class ImageUploaderTest extends TestCase
 {
+    private const BASE_TMP_PATH = 'catalog/tmp/category';
+
+    private const BASE_PATH = 'catalog/category';
+
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
     /**
-     * @var \Magento\Catalog\Model\ImageUploader
+     * @var ImageUploader
      */
     private $imageUploader;
 
     /**
-     * @var \Magento\Framework\Filesystem
+     * @var Filesystem
      */
     private $filesystem;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     * @var WriteInterface
      */
     private $mediaDirectory;
 
+    /**
+     * @var WriteInterface
+     */
+    private $tmpDirectory;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
-        $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $this->filesystem = $this->objectManager->get(\Magento\Framework\Filesystem::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-        /** @var $uploader \Magento\MediaStorage\Model\File\Uploader */
+        $this->tmpDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::SYS_TMP);
         $this->imageUploader = $this->objectManager->create(
-            \Magento\Catalog\Model\ImageUploader::class,
+            ImageUploader::class,
             [
-                'baseTmpPath' => 'catalog/tmp/category',
-                'basePath' => 'catalog/category',
+                'baseTmpPath' => self::BASE_TMP_PATH,
+                'basePath' => self::BASE_PATH,
                 'allowedExtensions' => ['jpg', 'jpeg', 'gif', 'png'],
                 'allowedMimeTypes' => ['image/jpg', 'image/jpeg', 'image/gif', 'image/png']
             ]
@@ -56,14 +70,15 @@ protected function setUp(): void
     }
 
     /**
+     * @dataProvider saveFileToTmpDirProvider
+     * @param string $fileName
+     * @param string $expectedName
      * @return void
      */
-    public function testSaveFileToTmpDir(): void
+    public function testSaveFileToTmpDir(string $fileName, string $expectedName): void
     {
-        $fileName = 'magento_small_image.jpg';
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
         $fixtureDir = realpath(__DIR__ . '/../_files');
-        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $filePath = $this->tmpDirectory->getAbsolutePath($fileName);
         copy($fixtureDir . DIRECTORY_SEPARATOR . $fileName, $filePath);
 
         $_FILES['image'] = [
@@ -75,10 +90,27 @@ public function testSaveFileToTmpDir(): void
         ];
 
         $this->imageUploader->saveFileToTmpDir('image');
-        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR . $expectedName;
         $this->assertTrue(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
     }
 
+    /**
+     * @return array
+     */
+    public function saveFileToTmpDirProvider(): array
+    {
+        return [
+            'image_default_name' => [
+                'file_name' => 'magento_small_image.jpg',
+                'expected_name' => 'magento_small_image.jpg',
+            ],
+            'image_with_space_in_name' => [
+                'file_name' => 'magento_image with space in name.jpg',
+                'expected_name' => 'magento_image_with_space_in_name.jpg',
+            ],
+        ];
+    }
+
     /**
      * Test that method rename files when move it with the same name into base directory.
      *
@@ -90,7 +122,7 @@ public function testMoveFileFromTmp(): void
     {
         $expectedFilePath = $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . 'magento_small_image_1.jpg';
 
-        $this->assertFileNotExists($this->mediaDirectory->getAbsolutePath($expectedFilePath));
+        $this->assertFileDoesNotExist($this->mediaDirectory->getAbsolutePath($expectedFilePath));
 
         $this->imageUploader->moveFileFromTmp('magento_small_image.jpg');
 
@@ -102,12 +134,11 @@ public function testMoveFileFromTmp(): void
      */
     public function testSaveFileToTmpDirWithWrongExtension(): void
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage('File validation failed.');
 
         $fileName = 'text.txt';
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
-        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $filePath = $this->tmpDirectory->getAbsolutePath($fileName);
         $file = fopen($filePath, "wb");
         fwrite($file, 'just a text');
 
@@ -120,7 +151,7 @@ public function testSaveFileToTmpDirWithWrongExtension(): void
         ];
 
         $this->imageUploader->saveFileToTmpDir('image');
-        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR . $fileName;
         $this->assertFalse(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
     }
 
@@ -129,12 +160,11 @@ public function testSaveFileToTmpDirWithWrongExtension(): void
      */
     public function testSaveFileToTmpDirWithWrongFile(): void
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage('File validation failed.');
 
         $fileName = 'file.gif';
-        $tmpDirectory = $this->filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::SYS_TMP);
-        $filePath = $tmpDirectory->getAbsolutePath($fileName);
+        $filePath = $this->tmpDirectory->getAbsolutePath($fileName);
         $file = fopen($filePath, "wb");
         fwrite($file, 'just a text');
 
@@ -147,7 +177,7 @@ public function testSaveFileToTmpDirWithWrongFile(): void
         ];
 
         $this->imageUploader->saveFileToTmpDir('image');
-        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR. $fileName;
+        $filePath = $this->imageUploader->getBaseTmpPath() . DIRECTORY_SEPARATOR . $fileName;
         $this->assertFalse(is_file($this->mediaDirectory->getAbsolutePath($filePath)));
     }
 
@@ -157,11 +187,10 @@ public function testSaveFileToTmpDirWithWrongFile(): void
     public static function tearDownAfterClass(): void
     {
         parent::tearDownAfterClass();
-        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Filesystem::class
-        );
-        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
+        $filesystem = Bootstrap::getObjectManager()->get(Filesystem::class);
+        /** @var WriteInterface $mediaDirectory */
         $mediaDirectory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
-        $mediaDirectory->delete('tmp');
+        $mediaDirectory->delete(self::BASE_TMP_PATH);
+        $mediaDirectory->delete(self::BASE_PATH);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php
new file mode 100644
index 0000000000000..0a3944bbb36fd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\ResourceModel;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\Category as CategoryModel;
+use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\UrlInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests category resource model
+ *
+ * @see \Magento\Catalog\Model\ResourceModel\Category
+ */
+class CategoryTest extends TestCase
+{
+    private const BASE_TMP_PATH = 'catalog/tmp/category';
+
+    private const BASE_PATH = 'catalog/category';
+
+    /** @var ObjectManagerInterface */
+    private $objectManager;
+
+    /** @var CategoryRepositoryInterface */
+    private $categoryRepository;
+
+    /** @var CategoryResource */
+    private $categoryResource;
+
+    /** @var StoreManagerInterface */
+    private $storeManager;
+
+    /** @var CategoryCollection */
+    private $categoryCollection;
+
+    /** @var Filesystem */
+    private $filesystem;
+
+    /** @var WriteInterface */
+    private $mediaDirectory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
+        $this->categoryResource = $this->objectManager->get(CategoryResource::class);
+        $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $this->categoryCollection = $this->objectManager->get(CategoryCollection::class);
+        $this->filesystem = $this->objectManager->get(Filesystem::class);
+        $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown(): void
+    {
+        $this->mediaDirectory->delete(self::BASE_PATH);
+
+        parent::tearDown();
+    }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/category.php
+     * @magentoDataFixture Magento/Catalog/_files/catalog_tmp_category_image.php
+     * @magentoDbIsolation disabled
+     * @return void
+     */
+    public function testAddImageForCategory(): void
+    {
+        $dataImage = [
+            'name' => 'magento_small_image.jpg',
+            'type' => 'image/jpg',
+            'tmp_name' => '/tmp/phpDstnAx',
+            'file' => 'magento_small_image.jpg',
+        ];
+        $this->prepareDataImageUrl($dataImage);
+        $imageRelativePath = self::BASE_PATH . DIRECTORY_SEPARATOR . $dataImage['file'];
+        $expectedImage = DIRECTORY_SEPARATOR . $this->storeManager->getStore()->getBaseMediaDir()
+            . DIRECTORY_SEPARATOR . $imageRelativePath;
+        /** @var CategoryModel $category */
+        $category = $this->categoryRepository->get(333);
+        $category->setImage([$dataImage]);
+
+        $this->categoryResource->save($category);
+
+        $categoryModel = $this->categoryCollection
+            ->addAttributeToSelect('image')
+            ->addIdFilter([$category->getId()])
+            ->getFirstItem();
+        $this->assertEquals(
+            $expectedImage,
+            $categoryModel->getImage(),
+            'The path of the expected image does not match the path to the actual image.'
+        );
+        $this->assertFileExists($this->mediaDirectory->getAbsolutePath($imageRelativePath));
+    }
+
+    /**
+     * Add image url to image data
+     *
+     * @param array $dataImage
+     * @return void
+     */
+    private function prepareDataImageUrl(array &$dataImage): void
+    {
+        $dataImage['url'] = $this->storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA)
+            . self::BASE_TMP_PATH . DIRECTORY_SEPARATOR . $dataImage['file'];
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image with space in name.jpg b/dev/tests/integration/testsuite/Magento/Catalog/_files/magento_image with space in name.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..bed66dfbcb1c336ea02db176ce9b36f2e3e82261
GIT binary patch
literal 4025
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

literal 0
HcmV?d00001


From c643d79b37f9501c7ab24451956c5e906bfd128c Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Mon, 19 Oct 2020 17:00:39 +0300
Subject: [PATCH 573/671] MC-37665: Updating a category through the REST API
 will uncheck "Use Default Value" on a bunch of attributes

---
 .../Catalog/Api/CategoryRepositoryTest.php    | 46 +++++++------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
index 6ce922eab21f1..5623edca62b9a 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php
@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 use Magento\Authorization\Model\Role;
@@ -157,7 +158,7 @@ public function testDelete()
             UrlRewrite::ENTITY_ID => $categoryId,
             UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE
         ];
-        /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite $urlRewrite*/
+        /** @var \Magento\UrlRewrite\Service\V1\Data\UrlRewrite $urlRewrite */
         $urlRewrite = $storage->findOneByData($data);
 
         // Assert that a url rewrite is auto-generated for the category created from the data fixture
@@ -432,14 +433,9 @@ protected function updateCategory($id, $data, ?string $token = null)
         if ($token) {
             $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
         }
+        $data['id'] = $id;
 
-        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            $data['id'] = $id;
-            return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data]);
-        } else {
-            $data['id'] = $id;
-            return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data]);
-        }
+        return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data]);
     }
 
     /**
@@ -619,31 +615,23 @@ protected function updateCategoryForSpecificStore(
         ?string $token = null,
         string $storeCode = 'default'
     ) {
-        $serviceInfo =
-            [
-                'rest' => [
-                    'resourcePath' => self::RESOURCE_PATH . '/' . $id,
-                    'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
-                ],
-                'soap' => [
-                    'service' => self::SERVICE_NAME,
-                    'serviceVersion' => 'V1',
-                    'operation' => self::SERVICE_NAME . 'Save',
-                ],
-            ];
+        $serviceInfo = [
+            'rest' => [
+                'resourcePath' => self::RESOURCE_PATH . '/' . $id,
+                'httpMethod' => \Magento\Framework\Webapi\Rest\Request::HTTP_METHOD_PUT,
+            ],
+            'soap' => [
+                'service' => self::SERVICE_NAME,
+                'serviceVersion' => 'V1',
+                'operation' => self::SERVICE_NAME . 'Save',
+            ],
+        ];
         if ($token) {
             $serviceInfo['rest']['token'] = $serviceInfo['soap']['token'] = $token;
         }
+        $data['id'] = $id;
 
-        if (TESTS_WEB_API_ADAPTER == self::ADAPTER_SOAP) {
-            $data['id'] = $id;
-
-            return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data], null, $storeCode);
-        } else {
-            $data['id'] = $id;
-
-            return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data], null, $storeCode);
-        }
+        return $this->_webApiCall($serviceInfo, ['id' => $id, 'category' => $data], null, $storeCode);
     }
 
     /**

From 3de90f72bcfc208e07fa58f79e6be7579a73bc60 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Mon, 19 Oct 2020 12:14:35 -0500
Subject: [PATCH 574/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 .../Magento/Framework/Mail/EmailMessage.php   | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index 2bebf6d5f0ae2..184f64e902bc9 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -7,10 +7,12 @@
 
 namespace Magento\Framework\Mail;
 
+use Laminas\Mail\Exception\InvalidArgumentException as LaminasInvalidArgumentException;
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 use Laminas\Mail\Address as LaminasAddress;
 use Laminas\Mail\AddressList;
 use Laminas\Mime\Message as LaminasMimeMessage;
+use Psr\Log\LoggerInterface;
 
 /**
  * Magento Framework Email message
@@ -27,6 +29,11 @@ class EmailMessage extends Message implements EmailMessageInterface
      */
     private $addressFactory;
 
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @param MimeMessageInterface $body
      * @param array $to
@@ -39,8 +46,7 @@ class EmailMessage extends Message implements EmailMessageInterface
      * @param Address|null $sender
      * @param string|null $subject
      * @param string|null $encoding
-     * @throws InvalidArgumentException
-     *
+     * @param LoggerInterface $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -56,10 +62,12 @@ public function __construct(
         ?array $replyTo = null,
         ?Address $sender = null,
         ?string $subject = '',
-        ?string $encoding = 'utf-8'
+        ?string $encoding = 'utf-8',
+        LoggerInterface $logger
     ) {
         parent::__construct($encoding);
         $mimeMessage = new LaminasMimeMessage();
+        $this->logger = $logger;
         $mimeMessage->setParts($body->getParts());
         $this->zendMessage->setBody($mimeMessage);
         if ($subject) {
@@ -224,7 +232,11 @@ private function convertAddressArrayToAddressList(array $arrayList): AddressList
         foreach ($arrayList as $address) {
             try {
                 $laminasAddressList->add($address->getEmail(), $address->getName());
-            } catch (\InvalidArgumentException $e) {
+            } catch (LaminasInvalidArgumentException $e) {
+                $this->logger->warning(
+                    'Could not add an invalid email address to the mailing queue',
+                    ['exception' => $e]
+                );
                 continue;
             }
         }

From 9d4c1e55f4ff581a7eb51542b5e1fcd50aff3663 Mon Sep 17 00:00:00 2001
From: sdzhepa <sdzhepa@adobe.com>
Date: Mon, 19 Oct 2020 13:59:56 -0500
Subject: [PATCH 575/671] Fix mistake in stale.yml file formatting

---
 .github/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index 10589b97ea9b3..0a89a432699e0 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,7 +1,7 @@
 # Configuration for probot-stale - https://github.com/probot/stale
 
 # Number of days of inactivity before an Issue or Pull Request becomes stale
- daysUntilStale: 76
+daysUntilStale: 76
 
 # Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
 # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.

From a63cf9e824a9bf3d8ec14c409d9ac00e354e5640 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 19 Oct 2020 14:24:43 -0500
Subject: [PATCH 576/671] 28550 fix static

---
 .../ConfigurableProduct/Test/Unit/Helper/DataTest.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
index 963322e2f2c57..87357d3c927da 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
         $objectManager->setBackwardCompatibleProperty($this->_model, 'imageUrlBuilder', $this->imageUrlBuilder);
     }
 
-    public function testGetAllowAttributes()
+    public function testGetAllowAttributes(): void
     {
         $typeInstanceMock = $this->createMock(Configurable::class);
         $typeInstanceMock->expects($this->once())
@@ -82,7 +82,7 @@ public function testGetAllowAttributes()
      * @param array $data
      * @dataProvider getOptionsDataProvider
      */
-    public function testGetOptions(array $expected, array $data)
+    public function testGetOptions(array $expected, array $data): array
     {
         if (count($data['allowed_products'])) {
             $imageHelper1 = $this->getMockBuilder(Image::class)
@@ -118,8 +118,9 @@ public function testGetOptions(array $expected, array $data)
 
     /**
      * @return array
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function getOptionsDataProvider()
+    public function getOptionsDataProvider(): array
     {
         $currentProductMock = $this->createPartialMock(
             Product::class,
@@ -225,7 +226,7 @@ public function getOptionsDataProvider()
      * @param string $key
      * @return string
      */
-    public function getDataCallback($key)
+    public function getDataCallback($key): string
     {
         $map = [];
         for ($k = 1; $k < 3; $k++) {
@@ -289,7 +290,7 @@ public function testGetGalleryImages()
     /**
      * @return Collection
      */
-    private function getImagesCollection()
+    private function getImagesCollection(): MockObject
     {
         $collectionMock = $this->getMockBuilder(Collection::class)
             ->disableOriginalConstructor()

From ceb44748510f39c4782220c9f907d77247a2e31e Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Mon, 19 Oct 2020 15:11:15 -0500
Subject: [PATCH 577/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 lib/internal/Magento/Framework/Mail/EmailMessage.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index 184f64e902bc9..f2c4856af4909 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -8,6 +8,7 @@
 namespace Magento\Framework\Mail;
 
 use Laminas\Mail\Exception\InvalidArgumentException as LaminasInvalidArgumentException;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Mail\Exception\InvalidArgumentException;
 use Laminas\Mail\Address as LaminasAddress;
 use Laminas\Mail\AddressList;
@@ -30,7 +31,7 @@ class EmailMessage extends Message implements EmailMessageInterface
     private $addressFactory;
 
     /**
-     * @var LoggerInterface
+     * @var LoggerInterface|null
      */
     private $logger;
 
@@ -46,7 +47,7 @@ class EmailMessage extends Message implements EmailMessageInterface
      * @param Address|null $sender
      * @param string|null $subject
      * @param string|null $encoding
-     * @param LoggerInterface $logger
+     * @param LoggerInterface|null $logger
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
@@ -63,11 +64,11 @@ public function __construct(
         ?Address $sender = null,
         ?string $subject = '',
         ?string $encoding = 'utf-8',
-        LoggerInterface $logger
+        ?LoggerInterface $logger = null
     ) {
         parent::__construct($encoding);
         $mimeMessage = new LaminasMimeMessage();
-        $this->logger = $logger;
+        $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
         $mimeMessage->setParts($body->getParts());
         $this->zendMessage->setBody($mimeMessage);
         if ($subject) {

From 6384b9668752a3918cd22f3bfadb0e307055bcb1 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Mon, 19 Oct 2020 15:42:47 -0500
Subject: [PATCH 578/671] 29251 fix static

---
 .../Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
index 87357d3c927da..d1cd57e59ffe6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Helper/DataTest.php
@@ -59,7 +59,7 @@ protected function setUp(): void
         $objectManager->setBackwardCompatibleProperty($this->_model, 'imageUrlBuilder', $this->imageUrlBuilder);
     }
 
-    public function testGetAllowAttributes(): void
+    public function testGetAllowAttributes()
     {
         $typeInstanceMock = $this->createMock(Configurable::class);
         $typeInstanceMock->expects($this->once())
@@ -82,7 +82,7 @@ public function testGetAllowAttributes(): void
      * @param array $data
      * @dataProvider getOptionsDataProvider
      */
-    public function testGetOptions(array $expected, array $data): array
+    public function testGetOptions(array $expected, array $data)
     {
         if (count($data['allowed_products'])) {
             $imageHelper1 = $this->getMockBuilder(Image::class)

From 0d40b6c42b589ea8310a153680f0dda4224056ce Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Mon, 19 Oct 2020 15:48:09 -0500
Subject: [PATCH 579/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 lib/internal/Magento/Framework/Mail/EmailMessage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index f2c4856af4909..46ba8c118232b 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -51,6 +51,7 @@ class EmailMessage extends Message implements EmailMessageInterface
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function __construct(
         MimeMessageInterface $body,

From c66199ceb55d5f338c6950315e00ed6c681e63d9 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Mon, 19 Oct 2020 15:57:40 -0500
Subject: [PATCH 580/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 lib/internal/Magento/Framework/Mail/EmailMessage.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index 46ba8c118232b..726c76ee96850 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -48,6 +48,7 @@ class EmailMessage extends Message implements EmailMessageInterface
      * @param string|null $subject
      * @param string|null $encoding
      * @param LoggerInterface|null $logger
+     * @throws InvalidArgumentException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)

From 37d086856e3dbd0169ea8c3d7c38db944b3b34c4 Mon Sep 17 00:00:00 2001
From: Roman Flowers <flowers@adobe.com>
Date: Mon, 19 Oct 2020 17:54:15 -0500
Subject: [PATCH 581/671] MC-38337: [Magento Cloud] Repeat Email Reminders only
 go to a limited number of customers

---
 lib/internal/Magento/Framework/Mail/EmailMessage.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Mail/EmailMessage.php b/lib/internal/Magento/Framework/Mail/EmailMessage.php
index 726c76ee96850..53ea805889db2 100644
--- a/lib/internal/Magento/Framework/Mail/EmailMessage.php
+++ b/lib/internal/Magento/Framework/Mail/EmailMessage.php
@@ -17,6 +17,8 @@
 
 /**
  * Magento Framework Email message
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class EmailMessage extends Message implements EmailMessageInterface
 {
@@ -52,7 +54,6 @@ class EmailMessage extends Message implements EmailMessageInterface
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
      */
     public function __construct(
         MimeMessageInterface $body,

From 8fa4cf589a08bcbf9d1da9accb67f5694c25bef9 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Tue, 20 Oct 2020 09:46:15 +0300
Subject: [PATCH 582/671] MC-37891: Create automated test for "Delete Widget"

---
 .../Adminhtml/Widget/Instance/DeleteTest.php  | 56 +++++++++++++++++++
 .../Widget/_files/new_widget_rollback.php     | 21 +++++++
 2 files changed, 77 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Widget/_files/new_widget_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php
new file mode 100644
index 0000000000000..46ea322953278
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Widget\Controller\Adminhtml\Widget\Instance;
+
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Message\MessageInterface;
+use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory;
+
+/**
+ * Test for delete widget controller
+ *
+ * @see \Magento\Widget\Controller\Adminhtml\Widget\Instance\Delete
+ * @magentoAppArea adminhtml
+ * @magentoDbIsolation enabled
+ */
+class DeleteTest extends AbstractBackendController
+{
+    /** @var CollectionFactory */
+    private $collectionFactory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->collectionFactory = $this->_objectManager->get(CollectionFactory::class);
+    }
+
+    /**
+     * @magentoDataFixture Magento/Widget/_files/new_widget.php
+     *
+     * @return void
+     */
+    public function testDeleteWidget(): void
+    {
+        $widget = $this->collectionFactory->create()
+            ->addFieldToFilter('title', 'New Sample widget title')->getFirstItem();
+        $this->assertNotNull($widget->getInstanceId());
+        $this->getRequest()->setMethod(Http::METHOD_POST);
+        $this->getRequest()->setParams(['instance_id' => $widget->getInstanceId()]);
+        $this->dispatch('backend/admin/widget_instance/delete');
+        $this->assertSessionMessages(
+            $this->containsEqual((string)__('The widget instance has been deleted.')),
+            MessageInterface::TYPE_SUCCESS
+        );
+        $this->assertRedirect($this->stringContains('admin/widget_instance/index'));
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Widget/_files/new_widget_rollback.php b/dev/tests/integration/testsuite/Magento/Widget/_files/new_widget_rollback.php
new file mode 100644
index 0000000000000..5e729472070ba
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Widget/_files/new_widget_rollback.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Widget\Model\ResourceModel\Widget\Instance;
+use Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CollectionFactory $collectionFactory */
+$collectionFactory = $objectManager->get(CollectionFactory::class);
+/** @var Instance $widgetResourceModel */
+$widgetResourceModel = $objectManager->get(Instance::class);
+
+$widget = $collectionFactory->create()->addFieldToFilter('title', 'New Sample widget title')->getFirstItem();
+if ($widget->getInstanceId()) {
+    $widgetResourceModel->delete($widget);
+}

From fcaa729c390c4a2a4d62bd59a8c14bf21c24e8f1 Mon Sep 17 00:00:00 2001
From: Sudheer S <sudheers@kensium.com>
Date: Tue, 20 Oct 2020 12:17:00 +0530
Subject: [PATCH 583/671] 30349: Product filter with category_id does not work
 as expected - added API functional test

---
 .../GraphQl/Catalog/ProductSearchTest.php       | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index f755a1a1e0282..3b2febe44b215 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -1448,11 +1448,12 @@ public function testFilterProductsForExactMatchingName()
      */
     public function testFilteringForProductsFromMultipleCategories()
     {
+        $categoriesIds = ["4","5","12"];
         $query
             = <<<QUERY
 {
    products(filter:{
-          category_id :{in:["4","5","12"]}
+          category_id :{in:["{$categoriesIds[0]}","{$categoriesIds[1]}","{$categoriesIds[2]}"]}
          })
  {
     items
@@ -1478,6 +1479,20 @@ public function testFilteringForProductsFromMultipleCategories()
         $response = $this->graphQlQuery($query);
         /** @var ProductRepositoryInterface $productRepository */
         $this->assertEquals(3, $response['products']['total_count']);
+        $actualProducts = [];
+        foreach ($categoriesIds as $categoriesId) {
+            /** @var CategoryLinkManagement $productLinks */
+            $productLinks = ObjectManager::getInstance()->get(CategoryLinkManagement::class);
+            $links = $productLinks->getAssignedProducts($categoriesId);
+            $links = array_reverse($links);
+            foreach ($links as $linkProduct) {
+                $productRepository = ObjectManager::getInstance()->get(ProductRepositoryInterface::class);
+                /** @var ProductInterface $product */
+                $product = $productRepository->get($linkProduct->getSku());
+                $actualProducts[$linkProduct->getSku()] = $product->getName();
+            }
+        }
+        $this->assertEquals(array_column($response['products']['items'],"name","sku"), $actualProducts);
     }
 
     /**

From 5448cbc77b74f0badac9dd9c187caf83e49ad4c3 Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 20 Oct 2020 09:49:52 +0300
Subject: [PATCH 584/671] MC-38476: Can not register customer with correct
 postal code for Argentina

---
 app/code/Magento/Directory/etc/zip_codes.xml  |  1 +
 .../Country/Postcode/Config/ReaderTest.php    | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
index 14d250656d28c..de6c064815d7a 100644
--- a/app/code/Magento/Directory/etc/zip_codes.xml
+++ b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -19,6 +19,7 @@
     <zip countryCode="AR">
         <codes>
             <code id="pattern_1" active="true" example="1234">^[0-9]{4}$</code>
+            <code id="pattern_2" active="true" example="A1234BCD">^[a-zA-z]{1}[0-9]{4}[a-zA-z]{3}$</code>
         </codes>
     </zip>
     <zip countryCode="AM">
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php
index 740afcda11386..9146535ed5181 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php
@@ -6,18 +6,20 @@
 
 namespace Magento\Directory\Model\Country\Postcode\Config;
 
-class ReaderTest extends \PHPUnit\Framework\TestCase
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+class ReaderTest extends TestCase
 {
     /**
-     * @var \Magento\Directory\Model\Country\Postcode\Config\Reader
+     * @var Reader
      */
     private $reader;
 
     protected function setUp(): void
     {
-        $this->reader = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Directory\Model\Country\Postcode\Config\Reader::class
-        );
+        $this->reader = Bootstrap::getObjectManager()
+            ->create(Reader::class);
     }
 
     public function testRead()
@@ -39,5 +41,13 @@ public function testRead()
 
         $this->assertEquals('test1', $result['NL_NEW']['pattern_1']['example']);
         $this->assertEquals('^[0-2]{4}[A-Z]{2}$', $result['NL_NEW']['pattern_1']['pattern']);
+
+        $this->assertArrayHasKey('AR', $result);
+        $this->assertArrayHasKey('pattern_1', $result['AR']);
+        $this->assertArrayHasKey('pattern_2', $result['AR']);
+        $this->assertEquals('1234', $result['AR']['pattern_1']['example']);
+        $this->assertEquals('^[0-9]{4}$', $result['AR']['pattern_1']['pattern']);
+        $this->assertEquals('A1234BCD', $result['AR']['pattern_2']['example']);
+        $this->assertEquals('^[a-zA-z]{1}[0-9]{4}[a-zA-z]{3}$', $result['AR']['pattern_2']['pattern']);
     }
 }

From fa2e1bcd49a28e2ed9498c1b1cd6f400d9005df6 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 20 Oct 2020 12:38:21 +0300
Subject: [PATCH 585/671] MC-38306: [Cloud] Adding new disabled products to
 Magento flushes categories cache

---
 .../Category/Product/PositionResolver.php     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
index 44bf153f83697..f7c0ea608123e 100644
--- a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
+++ b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
@@ -49,4 +49,30 @@ public function getPositions(int $categoryId): array
 
         return array_flip($connection->fetchCol($select));
     }
+
+    /**
+     * Get category product positions
+     *
+     * @param int $categoryId
+     * @return int
+     */
+    public function getLastPosition(int $categoryId): int
+    {
+        $connection = $this->getConnection();
+
+        $select = $connection->select()->from(
+            ['cpe' => $this->getTable('catalog_product_entity')],
+            ['position' => new \Zend_Db_Expr('MAX(position)')]
+        )->joinLeft(
+            ['ccp' => $this->getTable('catalog_category_product')],
+            'ccp.product_id=cpe.entity_id'
+        )->where(
+            'ccp.category_id = ?',
+            $categoryId
+        )->order(
+            'ccp.product_id ' . \Magento\Framework\DB\Select::SQL_DESC
+        );
+
+        return (int)$connection->fetchOne($select);
+    }
 }

From b07c48320f301e6c166266ba437413161b6cc7d9 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Tue, 20 Oct 2020 12:59:52 +0300
Subject: [PATCH 586/671] MC-38488: [MFTF]
 AdminMediaGalleryAssertUsedInLinkBlocksGridTest failed because of bad design

---
 ...eryAssertImageUsedInLinkBlocksGridTest.xml | 90 +++++++++++++++++++
 ...aGalleryAssertUsedInLinkBlocksGridTest.xml |  4 +-
 ...nhancedMediaGalleryImageActionsSection.xml |  2 +-
 3 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml

diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
new file mode 100644
index 0000000000000..c25e55cd30461
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest">
+        <annotations>
+            <features value="AdminMediaGalleryUsedInBlocksFilter"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <title value="Used in blocks link"/>
+            <stories value="Story 58: User sees entities where asset is used in" />
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
+            <description value="User filters assets used in blocks"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultBlock" stepKey="block" />
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTest">
+                <argument name="tags" value="block_html"/>
+            </actionGroup>
+        </after>
+
+        <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
+            <argument name="CMSBlockPage" value="$$block$$"/>
+        </actionGroup>
+        <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
+        <waitForPageLoad stepKey="waitForInitialPageLoad" />
+        <waitForPageLoad stepKey="waitForSecondaryPageLoad" />
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
+            <argument name="name" value="blockImage"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
+            <argument name="name" value="blockImage"/>
+        </actionGroup>
+        <waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
+        <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
+            <argument name="name" value="blockImage"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInBlocks">
+            <argument name="entityName" value="Blocks"/>
+        </actionGroup>
+        <wait time="5" stepKey="waitForAssertLoads"/>
+        <reloadPage stepKey="reloadBlocksGridPage"/>
+        <waitForPageLoad stepKey="waitForBlocksGridPageLoad"/>
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterInBlocksGrid"/>
+
+        <deleteData createDataKey="block" stepKey="deleteBlock"/>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolderAgain">
+            <argument name="name" value="blockImage"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeImageDetails"/>
+
+        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
+            <argument name="name" value="blockImage"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
index c850d09cd8a03..69d0c191fd146 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
@@ -7,11 +7,11 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryAssertUsedInLinkBlocksGridTest">
+    <test name="AdminMediaGalleryAssertUsedInLinkBlocksGridTest" deprecated="Use AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest instead">
         <annotations>
             <features value="AdminMediaGalleryUsedInBlocksFilter"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
-            <title value="Used in blocks link"/>
+            <title value="Deprecated. Used in blocks link"/>
             <stories value="Story 58: User sees entities where asset is used in" />
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
             <description value="User filters assets used in blocks"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
index f36fca88dc760..fb813bd65c9bf 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -10,7 +10,7 @@
     <section name="AdminEnhancedMediaGalleryImageActionsSection">
         <element name="openContextMenu" type="button" selector=".three-dots"/>
         <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
-        <element name="viewDetails" type="button" selector="[data-ui-id='action-image-details']"/>
+        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[@class='action-menu-item' and contains(text(), 'View Details')]"/>
         <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
         <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
         <element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>

From 606292dc833efdda124f211488a838d9d4746110 Mon Sep 17 00:00:00 2001
From: hanna_hnida <hanna.hnida@vaimo.com>
Date: Tue, 20 Oct 2020 12:07:09 +0200
Subject: [PATCH 587/671] magento/magento2-page-builder#558: Developer can
 style content types output differently per viewport - Added body id in
 Storefront, in tinymce4 in admin

---
 app/code/Magento/Theme/view/frontend/layout/default.xml    | 1 +
 lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 8eaac4aa3e794..bf76933b356c0 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -8,6 +8,7 @@
 <page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <update handle="default_head_blocks"/>
     <body>
+        <attribute name="id" value="html-body"/>
         <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::page/js/require_js.phtml" />
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index 4393b6c882039..7e4d4f532f8d3 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -205,6 +205,7 @@ define([
                 plugins: this.config.tinymce4.plugins,
                 toolbar: this.config.tinymce4.toolbar,
                 adapter: this,
+                body_id: "html-body",
 
                 /**
                  * @param {Object} editor

From 09cd013f4f58d2541b61af3e67f5486ad89b2872 Mon Sep 17 00:00:00 2001
From: Sudheer S <sudheers@kensium.com>
Date: Tue, 20 Oct 2020 16:35:29 +0530
Subject: [PATCH 588/671] 30349: Product filter with category_id does not work
 as expected - added API functional test

---
 .../testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index 3b2febe44b215..1fecc1a76c176 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -1492,7 +1492,8 @@ public function testFilteringForProductsFromMultipleCategories()
                 $actualProducts[$linkProduct->getSku()] = $product->getName();
             }
         }
-        $this->assertEquals(array_column($response['products']['items'],"name","sku"), $actualProducts);
+        $expectedProducts = array_column($response['products']['items'],"name","sku");
+        $this->assertEquals($expectedProducts, $actualProducts);
     }
 
     /**

From 46239525dde56e3fed909a895f04d34c8d86c4de Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Tue, 20 Oct 2020 15:06:01 +0300
Subject: [PATCH 589/671] MC-38342: [B2B] Multiple identical warning messages
 are displayed when adding an unconfigured Product with Customizable Options
 to a Requisition List from a Category page

---
 .../Model/Product/Type/AbstractType.php       |   3 +-
 .../Model/Product/Type/AbstractTypeTest.php   | 204 +++++++++++-------
 2 files changed, 129 insertions(+), 78 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index eb4a71cb90a8c..bfdafacb11aad 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Type;
 
@@ -620,7 +621,7 @@ protected function _prepareOptions(\Magento\Framework\DataObject $buyRequest, $p
                 }
             }
             if (count($results) > 0) {
-                throw new LocalizedException(__(implode("\n", $results)));
+                throw new LocalizedException(__(implode("\n", array_unique($results))));
             }
         }
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
index c72e7e0e1d078..4cd9d74e58418 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Type/AbstractTypeTest.php
@@ -3,41 +3,60 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model\Product\Type;
 
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Option;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ProductRepository;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
+use Magento\Eav\Model\Config;
+use Magento\Framework\DataObject;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Registry;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\MediaStorage\Helper\File\Storage\Database;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class AbstractTypeTest extends \PHPUnit\Framework\TestCase
+class AbstractTypeTest extends TestCase
 {
     /**
-     * @var \Magento\Catalog\Model\Product\Type\AbstractType
+     * @var AbstractType
      */
     protected $_model;
 
     protected function setUp(): void
     {
-        $productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Api\ProductRepositoryInterface::class
+        $productRepository = Bootstrap::getObjectManager()->get(
+            ProductRepositoryInterface::class
         );
-        $catalogProductOption = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Model\Product\Option::class
+        $catalogProductOption = Bootstrap::getObjectManager()->get(
+            Option::class
         );
-        $catalogProductType = $this->createMock(\Magento\Catalog\Model\Product\Type::class);
-        $eventManager = $this->createPartialMock(\Magento\Framework\Event\ManagerInterface::class, ['dispatch']);
-        $fileStorageDb = $this->createMock(\Magento\MediaStorage\Helper\File\Storage\Database::class);
-        $filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
-        $registry = $this->createMock(\Magento\Framework\Registry::class);
-        $logger = $this->createMock(\Psr\Log\LoggerInterface::class);
-        $serializer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\Serialize\Serializer\Json::class
+        $catalogProductType = $this->createMock(Type::class);
+        $eventManager = $this->createPartialMock(ManagerInterface::class, ['dispatch']);
+        $fileStorageDb = $this->createMock(Database::class);
+        $filesystem = $this->createMock(Filesystem::class);
+        $registry = $this->createMock(Registry::class);
+        $logger = $this->createMock(LoggerInterface::class);
+        $serializer = Bootstrap::getObjectManager()->get(
+            Json::class
         );
         $this->_model = $this->getMockForAbstractClass(
-            \Magento\Catalog\Model\Product\Type\AbstractType::class,
+            AbstractType::class,
             [
                 $catalogProductOption,
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class),
+                Bootstrap::getObjectManager()->get(Config::class),
                 $catalogProductType,
                 $eventManager,
                 $fileStorageDb,
@@ -53,7 +72,7 @@ protected function setUp(): void
     public function testGetRelationInfo()
     {
         $info = $this->_model->getRelationInfo();
-        $this->assertInstanceOf(\Magento\Framework\DataObject::class, $info);
+        $this->assertInstanceOf(DataObject::class, $info);
         $this->assertNotSame($info, $this->_model->getRelationInfo());
     }
 
@@ -72,8 +91,8 @@ public function testGetParentIdsByChild()
      */
     public function testGetSetAttributes()
     {
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         // fixture
@@ -85,7 +104,7 @@ public function testGetSetAttributes()
         $this->assertArrayHasKey('name', $attributes);
         $isTypeExists = false;
         foreach ($attributes as $attribute) {
-            $this->assertInstanceOf(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class, $attribute);
+            $this->assertInstanceOf(Attribute::class, $attribute);
             $applyTo = $attribute->getApplyTo();
             if (count($applyTo) > 0 && !in_array('simple', $applyTo)) {
                 $isTypeExists = true;
@@ -97,9 +116,9 @@ public function testGetSetAttributes()
 
     public function testAttributesCompare()
     {
-        $attribute[1] = new \Magento\Framework\DataObject(['group_sort_path' => 1, 'sort_path' => 10]);
-        $attribute[2] = new \Magento\Framework\DataObject(['group_sort_path' => 1, 'sort_path' => 5]);
-        $attribute[3] = new \Magento\Framework\DataObject(['group_sort_path' => 2, 'sort_path' => 10]);
+        $attribute[1] = new DataObject(['group_sort_path' => 1, 'sort_path' => 10]);
+        $attribute[2] = new DataObject(['group_sort_path' => 1, 'sort_path' => 5]);
+        $attribute[3] = new DataObject(['group_sort_path' => 2, 'sort_path' => 10]);
         $this->assertEquals(1, $this->_model->attributesCompare($attribute[1], $attribute[2]));
         $this->assertEquals(-1, $this->_model->attributesCompare($attribute[2], $attribute[1]));
         $this->assertEquals(-1, $this->_model->attributesCompare($attribute[1], $attribute[3]));
@@ -110,9 +129,9 @@ public function testAttributesCompare()
 
     public function testGetAttributeById()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         )->load(
             1
         );
@@ -120,8 +139,8 @@ public function testGetAttributeById()
         $this->assertNull($this->_model->getAttributeById(-1, $product));
         $this->assertNull($this->_model->getAttributeById(null, $product));
 
-        $sku = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Eav\Model\Config::class
+        $sku = Bootstrap::getObjectManager()->get(
+            Config::class
         )->getAttribute(
             'catalog_product',
             'sku'
@@ -140,8 +159,8 @@ public function testGetAttributeById()
      */
     public function testIsVirtual()
     {
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $this->assertFalse($this->_model->isVirtual($product));
     }
@@ -151,8 +170,8 @@ public function testIsVirtual()
      */
     public function testIsSalable()
     {
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $this->assertTrue($this->_model->isSalable($product));
 
@@ -169,20 +188,20 @@ public function testIsSalable()
      */
     public function testPrepareForCart()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $product->load(10);
         // fixture
         $this->assertEmpty($product->getCustomOption('info_buyRequest'));
 
         $requestData = ['qty' => 5];
-        $result = $this->_model->prepareForCart(new \Magento\Framework\DataObject($requestData), $product);
+        $result = $this->_model->prepareForCart(new DataObject($requestData), $product);
         $this->assertArrayHasKey(0, $result);
         $this->assertSame($product, $result[0]);
         $buyRequest = $product->getCustomOption('info_buyRequest');
-        $this->assertInstanceOf(\Magento\Framework\DataObject::class, $buyRequest);
+        $this->assertInstanceOf(DataObject::class, $buyRequest);
         $this->assertEquals($product->getId(), $buyRequest->getProductId());
         $this->assertSame($product, $buyRequest->getProduct());
         $this->assertEquals(json_encode($requestData), $buyRequest->getValue());
@@ -193,15 +212,15 @@ public function testPrepareForCart()
      */
     public function testPrepareForCartOptionsException()
     {
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         // fixture
 
         $this->assertStringContainsString(
             "The product's required option(s) weren't entered. Make sure the options are entered and try again.",
-            $this->_model->prepareForCart(new \Magento\Framework\DataObject(), $product)
+            $this->_model->prepareForCart(new DataObject(), $product)
         );
     }
 
@@ -215,9 +234,9 @@ public function testGetSpecifyOptionMessage()
 
     public function testCheckProductBuyState()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $product->setSkipCheckRequiredOption('_');
         $this->_model->checkProductBuyState($product);
@@ -228,10 +247,10 @@ public function testCheckProductBuyState()
      */
     public function testCheckProductBuyStateException()
     {
-        $this->expectException(\Magento\Framework\Exception\LocalizedException::class);
+        $this->expectException(LocalizedException::class);
 
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         // fixture
@@ -243,9 +262,9 @@ public function testCheckProductBuyStateException()
      */
     public function testGetOrderOptions()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $this->assertEquals([], $this->_model->getOrderOptions($product));
 
@@ -283,8 +302,8 @@ public function testGetOrderOptions()
      */
     public function testBeforeSave()
     {
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         // fixture
@@ -299,8 +318,8 @@ public function testBeforeSave()
      */
     public function testGetSku()
     {
-        $repository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ProductRepository::class
+        $repository = Bootstrap::getObjectManager()->create(
+            ProductRepository::class
         );
         $product = $repository->get('simple');
         // fixture
@@ -312,9 +331,9 @@ public function testGetSku()
      */
     public function testGetOptionSku()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        /** @var $product Product */
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $this->assertEmpty($this->_model->getOptionSku($product));
 
@@ -336,7 +355,7 @@ public function testGetOptionSku()
 
     public function testGetWeight()
     {
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $this->assertEmpty($this->_model->getWeight($product));
         $product->setWeight('value');
         $this->assertEquals('value', $this->_model->getWeight($product));
@@ -346,16 +365,16 @@ public function testHasOptions()
     {
         $this->markTestIncomplete('Bug MAGE-2814');
 
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $this->assertFalse($this->_model->hasOptions($product));
 
-        $product = new \Magento\Framework\DataObject(['has_options' => true]);
+        $product = new DataObject(['has_options' => true]);
         $this->assertTrue($this->_model->hasOptions($product));
     }
 
     public function testHasRequiredOptions()
     {
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $this->assertFalse($this->_model->hasRequiredOptions($product));
         $product->setRequiredOptions(1);
         $this->assertTrue($this->_model->hasRequiredOptions($product));
@@ -363,7 +382,7 @@ public function testHasRequiredOptions()
 
     public function testGetSetStoreFilter()
     {
-        $product = new \Magento\Framework\DataObject();
+        $product = new DataObject();
         $this->assertNull($this->_model->getStoreFilter($product));
         $store = new \StdClass();
         $this->_model->setStoreFilter($store, $product);
@@ -374,8 +393,8 @@ public function testGetForceChildItemQtyChanges()
     {
         $this->assertFalse(
             $this->_model->getForceChildItemQtyChanges(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                    \Magento\Catalog\Model\Product::class
+                Bootstrap::getObjectManager()->create(
+                    Product::class
                 )
             )
         );
@@ -387,8 +406,8 @@ public function testPrepareQuoteItemQty()
             3.0,
             $this->_model->prepareQuoteItemQty(
                 3,
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                    \Magento\Catalog\Model\Product::class
+                Bootstrap::getObjectManager()->create(
+                    Product::class
                 )
             )
         );
@@ -396,12 +415,12 @@ public function testPrepareQuoteItemQty()
 
     public function testAssignProductToOption()
     {
-        $product = new \Magento\Framework\DataObject();
-        $option = new \Magento\Framework\DataObject();
+        $product = new DataObject();
+        $option = new DataObject();
         $this->_model->assignProductToOption($product, $option, $product);
         $this->assertSame($product, $option->getProduct());
 
-        $option = new \Magento\Framework\DataObject();
+        $option = new DataObject();
         $this->_model->assignProductToOption(null, $option, $product);
         $this->assertSame($product, $option->getProduct());
     }
@@ -415,8 +434,8 @@ public function testSetConfig()
     {
         $this->assertFalse(
             $this->_model->isComposite(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                    \Magento\Catalog\Model\Product::class
+                Bootstrap::getObjectManager()->create(
+                    Product::class
                 )
             )
         );
@@ -425,8 +444,8 @@ public function testSetConfig()
         $this->_model->setConfig($config);
         $this->assertTrue(
             $this->_model->isComposite(
-                \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                    \Magento\Catalog\Model\Product::class
+                Bootstrap::getObjectManager()->create(
+                    Product::class
                 )
             )
         );
@@ -438,8 +457,8 @@ public function testSetConfig()
      */
     public function testGetSearchableData()
     {
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
         $product->load(1);
         // fixture
@@ -467,10 +486,41 @@ public function testProcessBuyRequest()
 
     public function testCheckProductConfiguration()
     {
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
         );
-        $buyRequest = new \Magento\Framework\DataObject(['qty' => 5]);
+        $buyRequest = new DataObject(['qty' => 5]);
         $this->_model->checkProductConfiguration($product, $buyRequest);
     }
+
+    /**
+     * Test that only one exception appears instead of multiple identical exceptions
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     *
+     * @return void
+     */
+    public function testPrepareOptions(): void
+    {
+        $exceptionMessage =
+            "The product's required option(s) weren't entered. Make sure the options are entered and try again.";
+        $product = Bootstrap::getObjectManager()->create(
+            Product::class
+        );
+        $product->load(1);
+        $buyRequest = new DataObject(['product' => 1]);
+        $method = new \ReflectionMethod(
+            AbstractType::class,
+            '_prepareOptions'
+        );
+        $method->setAccessible(true);
+        $exceptionIsThrown = false;
+        try {
+            $method->invoke($this->_model, $buyRequest, $product, 'full');
+        } catch (LocalizedException $exception) {
+            $this->assertEquals($exceptionMessage, $exception->getMessage());
+            $exceptionIsThrown = true;
+        }
+        $this->assertTrue($exceptionIsThrown);
+    }
 }

From 2c3b5b994dc94adfcf5051df84039f4d0eec4bc1 Mon Sep 17 00:00:00 2001
From: hanna_hnida <hanna.hnida@vaimo.com>
Date: Tue, 20 Oct 2020 15:32:34 +0200
Subject: [PATCH 590/671] magento/magento2-page-builder#558: Developer can
 style content types output differently per viewport - Fixed quote marks

---
 lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
index 7e4d4f532f8d3..d74838b0c26bf 100644
--- a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
+++ b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -205,7 +205,7 @@ define([
                 plugins: this.config.tinymce4.plugins,
                 toolbar: this.config.tinymce4.toolbar,
                 adapter: this,
-                body_id: "html-body",
+                'body_id': 'html-body',
 
                 /**
                  * @param {Object} editor

From e3789f0906f45b565fdb8d13d28c305917cca1bd Mon Sep 17 00:00:00 2001
From: Pieter Hoste <hoste.pieter@gmail.com>
Date: Tue, 20 Oct 2020 15:36:01 +0200
Subject: [PATCH 591/671] Make sure the depends definition works for custom
 widgets. Also converted code from PrototypeJS to jQuery.

---
 lib/web/mage/adminhtml/form.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/web/mage/adminhtml/form.js b/lib/web/mage/adminhtml/form.js
index eae359c4b26a4..054594ff9e9f2 100644
--- a/lib/web/mage/adminhtml/form.js
+++ b/lib/web/mage/adminhtml/form.js
@@ -496,10 +496,15 @@ define([
             }
 
             // toggle target row
-            headElement = $(idTo + '-head');
+            headElement = jQuery('#' + idTo + '-head');
             isInheritCheckboxChecked = $(idTo + '_inherit') && $(idTo + '_inherit').checked;
             target = $(idTo);
 
+            // Account for the chooser style parameters.
+            if (target === null && headElement.length === 0 && idTo.substring(0, 16) === 'options_fieldset') {
+                headElement = jQuery('.field-' + idTo).add('.field-chooser' + idTo);
+            }
+
             // Target won't always exist (for example, if field type is "label")
             if (target) {
                 inputs = target.up(this._config['levels_up']).select('input', 'select', 'td');
@@ -529,10 +534,10 @@ define([
                     });
                 }
 
-                if (headElement) {
+                if (headElement.length > 0) {
                     headElement.show();
 
-                    if (headElement.hasClassName('open') && target) {
+                    if (headElement.hasClass('open') && target) {
                         target.show();
                     } else if (target) {
                         target.hide();
@@ -567,7 +572,7 @@ define([
                     });
                 }
 
-                if (headElement) {
+                if (headElement.length > 0) {
                     headElement.hide();
                 }
 

From 754eb5a168e6b2bd78b972e482988fa0b695a612 Mon Sep 17 00:00:00 2001
From: hanna_hnida <hanna.hnida@vaimo.com>
Date: Tue, 20 Oct 2020 18:11:04 +0200
Subject: [PATCH 592/671] magento/magento2-page-builder#558: Developer can
 style content types output differently per viewport - Fixed tinymce image
 selector

---
 .../CmsNewBlockBlockActionsSection/BlockContentSection.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
index 1d5e8541dd497..f4e26938d9008 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
@@ -9,7 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BlockContentSection">
         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
-        <element name="image" type="file" selector="#tinymce img"/>
+        <element name="image" type="file" selector=".mce-content-body img"/>
         <element name="contentIframe" type="iframe" selector="cms_block_form_content_ifr"/>
     </section>
 </sections>

From 7683dece30de99d5df537507487e1129cd85c023 Mon Sep 17 00:00:00 2001
From: hanna_hnida <hanna.hnida@vaimo.com>
Date: Tue, 20 Oct 2020 18:12:21 +0200
Subject: [PATCH 593/671] magento/magento2-page-builder#558: Developer can
 style content types output differently per viewport - Fixed tinymce image
 selector

---
 .../CmsNewBlockBlockActionsSection/BlockContentSection.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
index 1d5e8541dd497..f4e26938d9008 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
@@ -9,7 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BlockContentSection">
         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
-        <element name="image" type="file" selector="#tinymce img"/>
+        <element name="image" type="file" selector=".mce-content-body img"/>
         <element name="contentIframe" type="iframe" selector="cms_block_form_content_ifr"/>
     </section>
 </sections>

From 0ab061a5da09ba5fc95a6cd3a1d87454c1f2a8d0 Mon Sep 17 00:00:00 2001
From: hanna_hnida <hanna.hnida@vaimo.com>
Date: Tue, 20 Oct 2020 18:15:23 +0200
Subject: [PATCH 594/671] Revert "magento/magento2-page-builder#558: Developer
 can style content types output differently per viewport - Fixed tinymce image
 selector"

This reverts commit 754eb5a168e6b2bd78b972e482988fa0b695a612.
---
 .../CmsNewBlockBlockActionsSection/BlockContentSection.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
index f4e26938d9008..1d5e8541dd497 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/CmsNewBlockBlockActionsSection/BlockContentSection.xml
@@ -9,7 +9,7 @@
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BlockContentSection">
         <element name="TextArea" type="input" selector="#cms_block_form_content"/>
-        <element name="image" type="file" selector=".mce-content-body img"/>
+        <element name="image" type="file" selector="#tinymce img"/>
         <element name="contentIframe" type="iframe" selector="cms_block_form_content_ifr"/>
     </section>
 </sections>

From 5543a9f31b13bddba7918f200636c8dc0935a319 Mon Sep 17 00:00:00 2001
From: "rostyslav.hymon" <rostyslav.hymon@transoftgroup.com>
Date: Tue, 20 Oct 2020 19:15:36 +0300
Subject: [PATCH 595/671] MC-38306: [Cloud] Adding new disabled products to
 Magento flushes categories cache

---
 .../Catalog/Model/Category/Product/PositionResolver.php     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
index f7c0ea608123e..320a253a9a1dd 100644
--- a/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
+++ b/app/code/Magento/Catalog/Model/Category/Product/PositionResolver.php
@@ -51,18 +51,18 @@ public function getPositions(int $categoryId): array
     }
 
     /**
-     * Get category product positions
+     * Get category product minimum position
      *
      * @param int $categoryId
      * @return int
      */
-    public function getLastPosition(int $categoryId): int
+    public function getMinPosition(int $categoryId): int
     {
         $connection = $this->getConnection();
 
         $select = $connection->select()->from(
             ['cpe' => $this->getTable('catalog_product_entity')],
-            ['position' => new \Zend_Db_Expr('MAX(position)')]
+            ['position' => new \Zend_Db_Expr('MIN(position)')]
         )->joinLeft(
             ['ccp' => $this->getTable('catalog_category_product')],
             'ccp.product_id=cpe.entity_id'

From bc3d88a026e178162b547dfe933378a8119e9121 Mon Sep 17 00:00:00 2001
From: Sergii Ivashchenko <serg.ivashchenko@gmail.com>
Date: Tue, 20 Oct 2020 17:22:49 +0100
Subject: [PATCH 596/671] Removed extra spaces

---
 .github/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/stale.yml b/.github/stale.yml
index 0a89a432699e0..0b9283fde06c7 100644
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -18,7 +18,7 @@ exemptLabels:
   - "Progress: dev in progress"
   - "Progress: PR in progress"
   - "Progress: done"
-  - "B2B: GraphQL"   
+  - "B2B: GraphQL"
   - "Progress: PR Created"
   - "PAP"
   - "Project: Login as Customer"

From f0ea57ee4d879380a1cd8dcb4c738ae84b9a2aef Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 20 Oct 2020 21:34:50 -0500
Subject: [PATCH 597/671] 29251 test web-api test fix

---
 .../etc/graphql/di.xml                        |  6 ++--
 ...gurableProductToCartSingleMutationTest.php | 35 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
index dc672b02e2f96..ace37b54a2bf6 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -48,7 +48,7 @@
         <plugin name="used_products_cache_graphql" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
     </type>
 
-    <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
-        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder_GraphQl" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
-    </type>
+<!--    <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">-->
+<!--        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder_GraphQl" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>-->
+<!--    </type>-->
 </config>
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
index a2b7b54fb875a..fb6b36b883e77 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/AddConfigurableProductToCartSingleMutationTest.php
@@ -8,9 +8,13 @@
 namespace Magento\GraphQl\ConfigurableProduct;
 
 use Exception;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\GraphQl\Quote\GetMaskedQuoteIdByReservedOrderId;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\CatalogInventory\Model\Configuration;
 
 /**
  * Add configurable product to cart testcases
@@ -22,6 +26,21 @@ class AddConfigurableProductToCartSingleMutationTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @var Config $config
+     */
+    private $resourceConfig;
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @var ReinitableConfigInterface
+     */
+    private $reinitConfig;
+
     /**
      * @inheritdoc
      */
@@ -29,6 +48,9 @@ protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->getMaskedQuoteIdByReservedOrderId = $objectManager->get(GetMaskedQuoteIdByReservedOrderId::class);
+        $this->resourceConfig = $objectManager->get(Config::class);
+        $this->scopeConfig = $objectManager->get(ScopeConfigInterface::class);
+        $this->reinitConfig = $objectManager->get(ReinitableConfigInterface::class);
     }
 
     /**
@@ -166,9 +188,20 @@ public function testAddNonExistentConfigurableProductParentToCart()
      */
     public function testOutOfStockVariationToCart()
     {
+        $showOutOfStock = $this->scopeConfig->getValue(Configuration::XML_PATH_SHOW_OUT_OF_STOCK);
+
+        // Changing SHOW_OUT_OF_STOCK to show the out of stock option, otherwise graphql won't display it.
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, 1);
+        $this->reinitConfig->reinit();
+
         $product = $this->getConfigurableProductInfo();
         $attributeId = (int) $product['configurable_options'][0]['attribute_id'];
         $valueIndex = $product['configurable_options'][0]['values'][0]['value_index'];
+        // Asserting that the first value is the right option we want to add to cart
+        $this->assertEquals(
+            $product['configurable_options'][0]['values'][0]['label'],
+            'Option 1'
+        );
         $parentSku = $product['sku'];
 
         $configurableOptionsQuery = $this->generateSuperAttributesUIDQuery($attributeId, $valueIndex);
@@ -191,6 +224,8 @@ public function testOutOfStockVariationToCart()
             $response['addProductsToCart']['user_errors'][0]['message'],
             $expectedErrorMessages
         );
+        $this->resourceConfig->saveConfig(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, $showOutOfStock);
+        $this->reinitConfig->reinit();
     }
 
     /**

From 0eb8848fa1d67201d97726f701b7edc6f237e21c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 21 Oct 2020 09:13:21 +0300
Subject: [PATCH 598/671] MC-34444: Configurable shows simple products which
 are no longer assigned to the website

---
 .../Frontend/UsedProductsWebsiteFilter.php    | 34 +++++++++++++++++++
 .../ConfigurableProduct/etc/frontend/di.xml   |  1 +
 .../Product/View/Type/ConfigurableTest.php    | 25 ++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php

diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php
new file mode 100644
index 0000000000000..9e1f3482d3c0f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ConfigurableProduct\Model\Plugin\Frontend;
+
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+
+/**
+ * Filter configurable options by current store plugin.
+ */
+class UsedProductsWebsiteFilter
+{
+    /**
+     * Filter configurable options not assigned to current website.
+     *
+     * @param Configurable $subject
+     * @param ProductInterface $product
+     * @param array|null $requiredAttributeIds
+     * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeGetUsedProducts(
+        Configurable $subject,
+        ProductInterface $product,
+        array $requiredAttributeIds = null
+    ): void {
+        $subject->setStoreFilter($product->getStore(), $product);
+    }
+}
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index f60234453dc60..3942ec52cbb8b 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -12,5 +12,6 @@
     </type>
     <type name="Magento\ConfigurableProduct\Model\Product\Type\Configurable">
         <plugin name="used_products_cache" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
+        <plugin name="used_products_website_filter" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsWebsiteFilter" />
     </type>
 </config>
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
index 0344d467a3cc2..214613821afb6 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Block/Product/View/Type/ConfigurableTest.php
@@ -19,6 +19,8 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\LayoutInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
@@ -126,6 +128,29 @@ public function testGetAllowProducts(): void
         }
     }
 
+    /**
+     * Verify configurable option not assigned to current website won't be visible.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_product_two_websites.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea frontend
+     *
+     * @return void
+     */
+    public function testGetAllowProductsNonDefaultWebsite(): void
+    {
+        // Set current website to non-default.
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $storeManager->setCurrentStore('fixture_second_store');
+        // Un-assign simple product from non-default website.
+        $simple = $this->productRepository->get('simple_Option_1');
+        $simple->setWebsiteIds([1]);
+        $this->productRepository->save($simple);
+        // Verify only one configurable option will be visible.
+        $products = $this->block->getAllowProducts();
+        $this->assertEquals(1, count($products));
+    }
+
     /**
      * @return void
      */

From afe3cd9d4c7f97a8097d08f4636cd99fa50c5671 Mon Sep 17 00:00:00 2001
From: Sudheer S <sudheers@kensium.com>
Date: Wed, 21 Oct 2020 11:59:28 +0530
Subject: [PATCH 599/671] 30349: Product filter with category_id does not work
 as expected - added API functional test

---
 .../testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index 1fecc1a76c176..b0d7141d55589 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -1492,7 +1492,7 @@ public function testFilteringForProductsFromMultipleCategories()
                 $actualProducts[$linkProduct->getSku()] = $product->getName();
             }
         }
-        $expectedProducts = array_column($response['products']['items'],"name","sku");
+        $expectedProducts = array_column($response['products']['items'], "name", "sku");
         $this->assertEquals($expectedProducts, $actualProducts);
     }
 

From 5df1d69445c7dd3a4d56e6cff66fecd824d93620 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Wed, 21 Oct 2020 10:20:46 +0300
Subject: [PATCH 600/671] MC-38488: [MFTF]
 AdminMediaGalleryAssertUsedInLinkBlocksGridTest failed because of bad design

---
 .../Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml   | 3 +++
 .../Section/AdminEnhancedMediaGalleryImageActionsSection.xml   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
index 69d0c191fd146..b360d958aee33 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
@@ -17,6 +17,9 @@
             <description value="User filters assets used in blocks"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <createData entity="_defaultBlock" stepKey="block" />
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
index fb813bd65c9bf..a8e9feaa2d623 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -10,7 +10,7 @@
     <section name="AdminEnhancedMediaGalleryImageActionsSection">
         <element name="openContextMenu" type="button" selector=".three-dots"/>
         <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
-        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[@class='action-menu-item' and contains(text(), 'View Details')]"/>
+        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[@class='action-menu-item' and contains(text(), 'View Details')]" timeout="30" />
         <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
         <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
         <element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>

From 320fae74b0edb284d1d430155cf2b798dd1e0a27 Mon Sep 17 00:00:00 2001
From: Serhii Voloshkov <serhii.voloshkov@transoftgroup.com>
Date: Wed, 21 Oct 2020 11:00:35 +0300
Subject: [PATCH 601/671] MC-36768: Custom attribute value created in
 integration tests fixtures product not appears in elasticsearch

---
 .../Indexer/Fulltext/Action/DataProvider.php  |  96 ++++---
 .../Indexer/Fulltext/Plugin/Attribute.php     |  18 +-
 .../Indexer/Fulltext/Plugin/AttributeTest.php |  35 ++-
 .../FieldMapper/Product/AttributeProvider.php |  20 +-
 .../Plugin/Category/Product/Attribute.php     |  12 +-
 .../Catalog/ProductSearchAggregationsTest.php |   6 +-
 .../GraphQl/Catalog/ProductSearchTest.php     |  25 +-
 .../Swatches/ProductSwatchDataTest.php        |  10 +-
 .../Magento/Catalog/Helper/ProductTest.php    | 147 ++++++-----
 .../Magento/Catalog/_files/categories.php     | 141 +++++-----
 ...th_custom_attribute_layered_navigation.php |  27 +-
 .../_files/product_boolean_attribute.php      |  85 +++---
 ...ucts_with_layered_navigation_attribute.php | 242 +++++++++---------
 ..._layered_navigation_attribute_rollback.php |  58 +++--
 ...th_layered_navigation_custom_attribute.php | 218 ++++++++--------
 .../_files/configurable_attribute.php         | 106 ++++----
 .../_files/configurable_products.php          |  68 ++---
 .../Indexer/_files/reindex_all_invalid.php    |  13 +
 .../order_configurable_product_rollback.php   |   1 +
 ..._with_visual_swatch_attribute_rollback.php |   7 +-
 ...e_with_different_options_type_rollback.php |  17 +-
 21 files changed, 758 insertions(+), 594 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Indexer/_files/reindex_all_invalid.php

diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
index 8c4690f044764..3a67025230430 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/DataProvider.php
@@ -6,10 +6,24 @@
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Action;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory;
+use Magento\CatalogSearch\Model\ResourceModel\EngineInterface;
+use Magento\CatalogSearch\Model\ResourceModel\EngineProvider;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DataObject;
+use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityMetadata;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Event\ManagerInterface;
 use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Zend_Db;
 
 /**
  * Catalog search full test search data provider.
@@ -24,7 +38,7 @@ class DataProvider
     /**
      * Searchable attributes cache
      *
-     * @var \Magento\Eav\Model\Entity\Attribute[]
+     * @var Attribute[]
      */
     private $searchableAttributes;
 
@@ -50,40 +64,40 @@ class DataProvider
     private $productEmulators = [];
 
     /**
-     * @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory
+     * @var CollectionFactory
      */
     private $productAttributeCollectionFactory;
 
     /**
      * Eav config
      *
-     * @var \Magento\Eav\Model\Config
+     * @var Config
      */
     private $eavConfig;
 
     /**
      * Catalog product type
      *
-     * @var \Magento\Catalog\Model\Product\Type
+     * @var Type
      */
     private $catalogProductType;
 
     /**
      * Core event manager proxy
      *
-     * @var \Magento\Framework\Event\ManagerInterface
+     * @var ManagerInterface
      */
     private $eventManager;
 
     /**
      * Store manager
      *
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
     /**
-     * @var \Magento\CatalogSearch\Model\ResourceModel\EngineInterface
+     * @var EngineInterface
      */
     private $engine;
 
@@ -93,12 +107,12 @@ class DataProvider
     private $resource;
 
     /**
-     * @var \Magento\Framework\DB\Adapter\AdapterInterface
+     * @var AdapterInterface
      */
     private $connection;
 
     /**
-     * @var \Magento\Framework\EntityManager\EntityMetadata
+     * @var EntityMetadata
      */
     private $metadata;
 
@@ -126,24 +140,24 @@ class DataProvider
 
     /**
      * @param ResourceConnection $resource
-     * @param \Magento\Catalog\Model\Product\Type $catalogProductType
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $prodAttributeCollectionFactory
-     * @param \Magento\CatalogSearch\Model\ResourceModel\EngineProvider $engineProvider
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
+     * @param Type $catalogProductType
+     * @param Config $eavConfig
+     * @param CollectionFactory $prodAttributeCollectionFactory
+     * @param EngineProvider $engineProvider
+     * @param ManagerInterface $eventManager
+     * @param StoreManagerInterface $storeManager
+     * @param MetadataPool $metadataPool
      * @param int $antiGapMultiplier
      */
     public function __construct(
         ResourceConnection $resource,
-        \Magento\Catalog\Model\Product\Type $catalogProductType,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $prodAttributeCollectionFactory,
-        \Magento\CatalogSearch\Model\ResourceModel\EngineProvider $engineProvider,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\EntityManager\MetadataPool $metadataPool,
+        Type $catalogProductType,
+        Config $eavConfig,
+        CollectionFactory $prodAttributeCollectionFactory,
+        EngineProvider $engineProvider,
+        ManagerInterface $eventManager,
+        StoreManagerInterface $storeManager,
+        MetadataPool $metadataPool,
         int $antiGapMultiplier = 5
     ) {
         $this->resource = $resource;
@@ -224,7 +238,7 @@ private function getSelectForSearchableProducts(
         $batch
     ) {
         $websiteId = (int)$this->storeManager->getStore($storeId)->getWebsiteId();
-        $lastProductId = (int) $lastProductId;
+        $lastProductId = (int)$lastProductId;
 
         $select = $this->connection->select()
             ->useStraightJoin(true)
@@ -242,7 +256,7 @@ private function getSelectForSearchableProducts(
         $this->joinAttribute($select, 'status', $storeId, [Status::STATUS_ENABLED]);
 
         if ($productIds !== null) {
-            $select->where('e.entity_id IN (?)', $productIds, \Zend_Db::INT_TYPE);
+            $select->where('e.entity_id IN (?)', $productIds, Zend_Db::INT_TYPE);
         }
         $select->where('e.entity_id > ?', $lastProductId);
         $select->order('e.entity_id');
@@ -308,14 +322,17 @@ private function joinAttribute(Select $select, $attributeCode, $storeId, array $
      */
     public function getSearchableAttributes($backendType = null)
     {
+        /** TODO: Remove this block in the next minor release and add a new public method instead */
+        if ($this->eavConfig->getEntityType(Product::ENTITY)->getNeedRefreshSearchAttributesList()) {
+            $this->clearSearchableAttributesList();
+        }
         if (null === $this->searchableAttributes) {
             $this->searchableAttributes = [];
 
-            /** @var \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection $productAttributes */
             $productAttributes = $this->productAttributeCollectionFactory->create();
             $productAttributes->addToIndexFilter(true);
 
-            /** @var \Magento\Eav\Model\Entity\Attribute[] $attributes */
+            /** @var Attribute[] $attributes */
             $attributes = $productAttributes->getItems();
 
             /** @deprecated */
@@ -329,7 +346,7 @@ public function getSearchableAttributes($backendType = null)
                 ['engine' => $this->engine, 'attributes' => $attributes]
             );
 
-            $entity = $this->eavConfig->getEntityType(\Magento\Catalog\Model\Product::ENTITY)->getEntity();
+            $entity = $this->eavConfig->getEntityType(Product::ENTITY)->getEntity();
 
             foreach ($attributes as $attribute) {
                 $attribute->setEntity($entity);
@@ -355,6 +372,18 @@ public function getSearchableAttributes($backendType = null)
         return $this->searchableAttributes;
     }
 
+    /**
+     * Remove searchable attributes list.
+     *
+     * @return void
+     */
+    private function clearSearchableAttributesList(): void
+    {
+        $this->searchableAttributes = null;
+        $this->searchableAttributesByBackendType = [];
+        $this->eavConfig->getEntityType(Product::ENTITY)->unsNeedRefreshSearchAttributesList();
+    }
+
     /**
      * Retrieve searchable attribute by Id or code
      *
@@ -369,7 +398,7 @@ public function getSearchableAttribute($attribute)
             return $attributes[$attribute];
         }
 
-        return $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attribute);
+        return $this->eavConfig->getAttribute(Product::ENTITY, $attribute);
     }
 
     /**
@@ -386,6 +415,7 @@ private function unifyField($field, $backendType = 'varchar')
         } else {
             $expr = $field;
         }
+
         return $expr;
     }
 
@@ -411,7 +441,7 @@ public function getProductAttributes($storeId, array $productIds, array $attribu
             )->where(
                 'cpe.entity_id IN (?)',
                 $productIds,
-                \Zend_Db::INT_TYPE
+                Zend_Db::INT_TYPE
             )
         );
         foreach ($attributeTypes as $backendType => $attributeIds) {
@@ -479,6 +509,7 @@ private function getProductTypeInstance($typeId)
 
             $this->productTypes[$typeId] = $this->catalogProductType->factory($productEmulator);
         }
+
         return $this->productTypes[$typeId];
     }
 
@@ -513,6 +544,7 @@ public function getProductChildIds($productId, $typeId)
             if ($relation->getWhere() !== null) {
                 $select->where($relation->getWhere());
             }
+
             return $this->connection->fetchCol($select);
         }
 
@@ -528,10 +560,11 @@ public function getProductChildIds($productId, $typeId)
     private function getProductEmulator($typeId)
     {
         if (!isset($this->productEmulators[$typeId])) {
-            $productEmulator = new \Magento\Framework\DataObject();
+            $productEmulator = new DataObject();
             $productEmulator->setTypeId($typeId);
             $this->productEmulators[$typeId] = $productEmulator;
         }
+
         return $this->productEmulators[$typeId];
     }
 
@@ -660,6 +693,7 @@ function ($value) {
                 $attributeOptionValue .= $this->attributeOptions[$optionKey][$attrValueId] . ' ';
             }
         }
+
         return empty($attributeOptionValue) ? null : trim($attributeOptionValue);
     }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
index 7b5d43ece922d..3f0046b918f28 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Plugin/Attribute.php
@@ -5,12 +5,15 @@
  */
 namespace Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
+use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\ResourceModel\Attribute as AttributeResourceModel;
 use Magento\Framework\Search\Request\Config;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Catalog\Api\Data\EavAttributeInterface;
+use Magento\Eav\Model\Config as EavConfig;
 
 /**
  * Catalog search indexer plugin for catalog attribute.
@@ -37,16 +40,24 @@ class Attribute extends AbstractPlugin
      */
     private $saveIsNew;
 
+    /**
+     * @var EavConfig
+     */
+    private $eavConfig;
+
     /**
      * @param IndexerRegistry $indexerRegistry
      * @param Config $config
+     * @param EavConfig $eavConfig
      */
     public function __construct(
         IndexerRegistry $indexerRegistry,
-        Config $config
+        Config $config,
+        EavConfig $eavConfig
     ) {
         parent::__construct($indexerRegistry);
         $this->config = $config;
+        $this->eavConfig = $eavConfig;
     }
 
     /**
@@ -84,6 +95,11 @@ public function afterSave(
         }
         if ($this->saveIsNew || $this->saveNeedInvalidation) {
             $this->config->reset();
+            /**
+             * TODO: Remove this in next minor release and use public method instead.
+             * @see DataProvider::getSearchableAttributes
+             */
+            $this->eavConfig->getEntityType(Product::ENTITY)->setNeedRefreshSearchAttributesList(true);
         }
 
         return $result;
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/AttributeTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/AttributeTest.php
index befe462184af6..4d8a7de391356 100644
--- a/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/AttributeTest.php
+++ b/app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/Fulltext/Plugin/AttributeTest.php
@@ -7,8 +7,10 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Indexer\Fulltext\Plugin;
 
+use Magento\Catalog\Model\Product;
 use Magento\CatalogSearch\Model\Indexer\Fulltext;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute;
+use Magento\Eav\Model\Config as EavConfig;
 use Magento\Framework\Indexer\IndexerInterface;
 use Magento\Framework\Indexer\IndexerRegistry;
 use Magento\Framework\Search\Request\Config;
@@ -16,6 +18,9 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Unit tests for @see \Magento\CatalogSearch\Model\Indexer\Fulltext\Plugin\Attribute.
+ */
 class AttributeTest extends TestCase
 {
     /**
@@ -53,6 +58,14 @@ class AttributeTest extends TestCase
      */
     private $config;
 
+    /**
+     * @var EavConfig
+     */
+    private $eavConfig;
+
+    /**
+     * @inheridoc
+     */
     protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
@@ -78,11 +91,16 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['reset'])
             ->getMock();
+        $this->eavConfig = $this->createPartialMock(
+            EavConfig::class,
+            ['getEntityType']
+        );
         $this->model = $this->objectManager->getObject(
             Attribute::class,
             [
                 'indexerRegistry' => $this->indexerRegistryMock,
-                'config' => $this->config
+                'config' => $this->config,
+                'eavConfig' => $this->eavConfig
             ]
         );
     }
@@ -123,21 +141,26 @@ public function testAfterSaveWithInvalidation(bool $saveNeedInvalidation, bool $
             [
                 'indexerRegistry' => $this->indexerRegistryMock,
                 'config' => $this->config,
+                'eavConfig' => $this->eavConfig,
                 'saveNeedInvalidation' => $saveNeedInvalidation,
                 'saveIsNew' => $saveIsNew,
             ]
         );
+        if ($saveIsNew || $saveNeedInvalidation) {
+            $this->config->expects($this->once())
+                ->method('reset');
+            $catalogProductEntity = $this->createMock(Product::class);
+            $this->eavConfig->expects($this->once())
+                ->method('getEntityType')
+                ->with(Product::ENTITY)
+                ->willReturn($catalogProductEntity);
+        }
 
         if ($saveNeedInvalidation) {
             $this->indexerMock->expects($this->once())->method('invalidate');
             $this->prepareIndexer();
         }
 
-        if ($saveIsNew || $saveNeedInvalidation) {
-            $this->config->expects($this->once())
-                ->method('reset');
-        }
-
         $this->assertEquals(
             $this->subjectMock,
             $model->afterSave($this->subjectMock, $this->subjectMock)
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
index 89c98d29ae03e..75636991e7ee6 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php
@@ -10,6 +10,7 @@
 use Magento\Eav\Model\Config;
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeAdapter\DummyAttribute;
+use Magento\Framework\ObjectManagerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -20,7 +21,7 @@ class AttributeProvider
     /**
      * Object Manager instance
      *
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var ObjectManagerInterface
      */
     private $objectManager;
 
@@ -49,13 +50,13 @@ class AttributeProvider
     /**
      * Factory constructor
      *
-     * @param \Magento\Framework\ObjectManagerInterface $objectManager
+     * @param ObjectManagerInterface $objectManager
      * @param Config $eavConfig
      * @param LoggerInterface $logger
      * @param string $instanceName
      */
     public function __construct(
-        \Magento\Framework\ObjectManagerInterface $objectManager,
+        ObjectManagerInterface $objectManager,
         Config $eavConfig,
         LoggerInterface $logger,
         $instanceName = AttributeAdapter::class
@@ -87,4 +88,17 @@ public function getByAttributeCode(string $attributeCode): AttributeAdapter
 
         return $this->cachedPool[$attributeCode];
     }
+
+    /**
+     * Remove attribute from cache by code.
+     *
+     * @param string $attributeCode
+     * @return void
+     */
+    public function removeAttributeCacheByCode(string $attributeCode): void
+    {
+        if (isset($this->cachedPool[$attributeCode])) {
+            unset($this->cachedPool[$attributeCode]);
+        }
+    }
 }
diff --git a/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
index 53f036a3b8e38..e15d91148b8ce 100644
--- a/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
+++ b/app/code/Magento/Elasticsearch/Model/Indexer/Fulltext/Plugin/Category/Product/Attribute.php
@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\ResourceModel\Attribute as AttributeResourceModel;
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Processor;
 use Magento\Elasticsearch\Model\Config;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Indexer\IndexerHandler as ElasticsearchIndexerHandler;
 use Magento\Framework\Indexer\DimensionProviderInterface;
 use Magento\CatalogSearch\Model\Indexer\IndexerHandlerFactory;
@@ -41,6 +42,11 @@ class Attribute
      */
     private $indexerHandlerFactory;
 
+    /**
+     * @var AttributeProvider
+     */
+    private $attributeProvider;
+
     /**
      * @var bool
      */
@@ -56,17 +62,20 @@ class Attribute
      * @param Processor $indexerProcessor
      * @param DimensionProviderInterface $dimensionProvider
      * @param IndexerHandlerFactory $indexerHandlerFactory
+     * @param AttributeProvider $attributeProvider
      */
     public function __construct(
         Config $config,
         Processor $indexerProcessor,
         DimensionProviderInterface $dimensionProvider,
-        IndexerHandlerFactory $indexerHandlerFactory
+        IndexerHandlerFactory $indexerHandlerFactory,
+        AttributeProvider $attributeProvider
     ) {
         $this->config = $config;
         $this->indexerProcessor = $indexerProcessor;
         $this->dimensionProvider = $dimensionProvider;
         $this->indexerHandlerFactory = $indexerHandlerFactory;
+        $this->attributeProvider = $attributeProvider;
     }
 
     /**
@@ -82,6 +91,7 @@ public function afterSave(
         AttributeResourceModel $subject,
         AttributeResourceModel $result
     ): AttributeResourceModel {
+        $this->attributeProvider->removeAttributeCacheByCode($this->attributeCode);
         $indexer = $this->indexerProcessor->getIndexer();
         if ($this->isNewObject
             && !$indexer->isScheduled()
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
index 9dbd902f1714e..b8e1587fcad71 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -17,10 +17,7 @@ class ProductSearchAggregationsTest extends GraphQlAbstract
      */
     public function testAggregationBooleanAttribute()
     {
-        $this->markTestSkipped(
-            'MC-22184: Elasticsearch returns incorrect aggregation options for booleans'
-            . 'MC-36768: Custom attribute not appears in elasticsearch'
-        );
+        $this->markTestSkipped('MC-22184: Elasticsearch returns incorrect aggregation options for booleans');
 
         $skus= '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"';
         $query = <<<QUERY
@@ -64,7 +61,6 @@ function ($a) {
         $this->assertEquals('boolean_attribute', $booleanAggregation['attribute_code']);
         $this->assertContainsEquals(['label' => '1', 'value'=> '1', 'count' => '3'], $booleanAggregation['options']);
 
-        $this->markTestSkipped('MC-22184: Elasticsearch returns incorrect aggregation options for booleans');
         $this->assertEquals(2, $booleanAggregation['count']);
         $this->assertCount(2, $booleanAggregation['options']);
         $this->assertContainsEquals(['label' => '0', 'value'=> '0', 'count' => '2'], $booleanAggregation['options']);
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
index f755a1a1e0282..2355eb281ac38 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -19,6 +19,7 @@
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
+use Magento\TestFramework\Catalog\Model\GetCategoryByName;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\TestFramework\ObjectManager;
@@ -67,14 +68,11 @@ public function testFilterForNonExistingCategory()
      * Verify that layered navigation filters and aggregations are correct for product query
      *
      * Filter products by an array of skus
-     * @magentoApiDataFixture Magento/Catalog/_files/category.php
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testFilterLn()
     {
-        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
-            . 'fixtures product not appears in elasticsearch');
         $query = <<<QUERY
 {
     products (
@@ -149,14 +147,12 @@ private function compareFilterNames(array $a, array $b)
      *  Layered navigation for Configurable products with out of stock options
      * Two configurable products each having two variations and one of the child products of one Configurable set to OOS
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/category.php
      * @magentoApiDataFixture Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
+     * @magentoApiDataFixture Magento/Indexer/_files/reindex_all_invalid.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testLayeredNavigationForConfigurableProducts()
     {
-        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
-            . 'fixtures product not appears in elasticsearch');
         CacheCleaner::cleanAll();
         $attributeCode = 'test_configurable';
 
@@ -256,12 +252,11 @@ private function getQueryProductsWithArrayOfCustomAttributes($attributeCode, $fi
      * Filter products by custom attribute of dropdown type and filterTypeInput eq
      *
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
+     * @magentoApiDataFixture Magento/Indexer/_files/reindex_all_invalid.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testFilterProductsByDropDownCustomAttribute()
     {
-        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
-            . 'fixtures product not appears in elasticsearch');
         CacheCleaner::cleanAll();
         $attributeCode = 'second_test_configurable';
         $optionValue = $this->getDefaultAttributeOptionValue($attributeCode);
@@ -455,12 +450,11 @@ private function getDefaultAttributeOptionValue(string $attributeCode): string
      * Full text search for Products and then filter the results by custom attribute (default sort is relevance)
      *
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
+     * @magentoApiDataFixture Magento/Indexer/_files/reindex_all_invalid.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testSearchAndFilterByCustomAttribute()
     {
-        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
-            . 'fixtures product not appears in elasticsearch');
         $attribute_code = 'second_test_configurable';
         $optionValue = $this->getDefaultAttributeOptionValue($attribute_code);
 
@@ -603,18 +597,19 @@ public function testSearchAndFilterByCustomAttribute()
      *  Filter by category and custom attribute
      *
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
+     * @magentoApiDataFixture Magento/Indexer/_files/reindex_all_invalid.php
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testFilterByCategoryIdAndCustomAttribute()
     {
-        $this->markTestSkipped('MC-36768: Custom attribute value created in integration tests'
-            . 'fixtures product not appears in elasticsearch');
-        $categoryId = 13;
+        /** @var GetCategoryByName $getCategoryByName */
+        $getCategoryByName = Bootstrap::getObjectManager()->get(GetCategoryByName::class);
+        $category = $getCategoryByName->execute('Category 1.2');
         $optionValue = $this->getDefaultAttributeOptionValue('second_test_configurable');
         $query = <<<QUERY
 {
   products(filter:{
-                   category_id : {eq:"{$categoryId}"}
+                   category_id : {eq:"{$category->getId()}"}
                    second_test_configurable: {eq: "{$optionValue}"}
                    },
                    pageSize: 3
@@ -2368,7 +2363,6 @@ public function testFilterProductsThatAreOutOfStockWithConfigSettings()
     /**
      * Verify that invalid current page return an error
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/category.php
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
      */
     public function testInvalidCurrentPage()
@@ -2399,7 +2393,6 @@ public function testInvalidCurrentPage()
     /**
      * Verify that invalid page size returns an error.
      *
-     * @magentoApiDataFixture Magento/Catalog/_files/category.php
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
      */
     public function testInvalidPageSize()
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php
index 1514613987b40..ae34ea31f0d51 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php
@@ -32,8 +32,7 @@ protected function setUp(): void
     }
 
     /**
-     * @magentoApiDataFixture Magento/Swatches/_files/text_swatch_attribute.php
-     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     * @magentoApiDataFixture Magento/Swatches/_files/configurable_product_text_swatch_attribute.php
      */
     public function testTextSwatchDataValues()
     {
@@ -68,14 +67,15 @@ public function testTextSwatchDataValues()
         $option = $product['configurable_options'][0];
         $this->assertArrayHasKey('values', $option);
         $length = count($option['values']);
+        $swatchData = ['Swatch 1', 'Swatch 2', 'Swatch 3'];
         for ($i = 0; $i < $length; $i++) {
-            $this->assertEquals('option ' . ($i + 1), $option['values'][$i]['swatch_data']['value']);
+            $swatchValue = $option['values'][$i]['swatch_data']['value'];
+            $this->assertContains($swatchValue, $swatchData);
         }
     }
 
     /**
-     * @magentoApiDataFixture Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type.php
-     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     * @magentoApiDataFixture Magento/Swatches/_files/configurable_product_with_visual_swatch_attribute.php
      */
     public function testVisualSwatchDataValues()
     {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php
index 98f623e5f193b..4c0f74f009330 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ProductTest.php
@@ -5,34 +5,69 @@
  */
 namespace Magento\Catalog\Helper;
 
-class ProductTest extends \PHPUnit\Framework\TestCase
+use Exception;
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\Session;
+use Magento\Catalog\Helper\Product as ProductHelper;
+use Magento\Framework\DataObject;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @magentoAppIsolation enabled
+ * @magentoAppArea frontend
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductTest extends TestCase
 {
     /**
-     * @var \Magento\Catalog\Helper\Product
+     * @var ProductHelper
      */
     protected $helper;
 
     /**
-     * @var \Magento\Catalog\Api\ProductRepositoryInterface
+     * @var ProductRepositoryInterface
      */
     protected $productRepository;
 
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var ProductInterfaceFactory
+     */
+    private $productFactory;
+
+    /**
+     * @var Registry
+     */
+    private $registry;
+
+    /**
+     * @inheridoc
+     */
     protected function setUp(): void
     {
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\App\State::class)
-            ->setAreaCode('frontend');
-        $this->helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Catalog\Helper\Product::class
-        );
-
-        /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-        $this->productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->helper = $this->objectManager->get(ProductHelper::class);
+        /** @var ProductInterfaceFactory $productInterfaceFactory */
+        $this->productFactory = $this->objectManager->get(ProductInterfaceFactory::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->registry = $this->objectManager->get(Registry::class);
     }
 
     /**
      * @magentoDataFixture Magento/CatalogUrlRewrite/_files/product_simple.php
-     * @magentoAppIsolation enabled
      */
     public function testGetProductUrl()
     {
@@ -46,20 +81,16 @@ public function testGetProductUrl()
 
     public function testGetPrice()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var $product Product */
+        $product = $this->productFactory->create();
         $product->setPrice(49.95);
         $this->assertEquals(49.95, $this->helper->getPrice($product));
     }
 
     public function testGetFinalPrice()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var $product Product */
+        $product = $this->productFactory->create();
         $product->setPrice(49.95);
         $product->setFinalPrice(49.95);
         $this->assertEquals(49.95, $this->helper->getFinalPrice($product));
@@ -67,10 +98,8 @@ public function testGetFinalPrice()
 
     public function testGetImageUrl()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var $product Product */
+        $product = $this->productFactory->create();
         $this->assertStringEndsWith('placeholder/image.jpg', $this->helper->getImageUrl($product));
 
         $product->setImage('test_image.png');
@@ -79,10 +108,8 @@ public function testGetImageUrl()
 
     public function testGetSmallImageUrl()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var $product Product */
+        $product = $this->productFactory->create();
         $this->assertStringEndsWith('placeholder/small_image.jpg', $this->helper->getSmallImageUrl($product));
 
         $product->setSmallImage('test_image.png');
@@ -91,10 +118,8 @@ public function testGetSmallImageUrl()
 
     public function testGetThumbnailUrl()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var $product Product */
+        $product = $this->productFactory->create();
         $this->assertStringEndsWith('placeholder/thumbnail.jpg', $this->helper->getThumbnailUrl($product));
         $product->setThumbnail('test_image.png');
         $this->assertStringEndsWith('/test_image.png', $this->helper->getThumbnailUrl($product));
@@ -102,26 +127,20 @@ public function testGetThumbnailUrl()
 
     public function testGetEmailToFriendUrl()
     {
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        $product = $this->productFactory->create();
         $product->setId(100);
-        $category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Category::class
-        );
+        $category = $this->objectManager->create(CategoryInterfaceFactory::class)->create();
         $category->setId(10);
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $objectManager->get(\Magento\Framework\Registry::class)->register('current_category', $category);
+        $this->registry->register('current_category', $category);
 
         try {
             $this->assertStringEndsWith(
                 'sendfriend/product/send/id/100/cat_id/10/',
                 $this->helper->getEmailToFriendUrl($product)
             );
-            $objectManager->get(\Magento\Framework\Registry::class)->unregister('current_category');
-        } catch (\Exception $e) {
-            $objectManager->get(\Magento\Framework\Registry::class)->unregister('current_category');
+            $this->registry->unregister('current_category');
+        } catch (Exception $e) {
+            $this->registry->unregister('current_category');
             throw $e;
         }
     }
@@ -137,17 +156,15 @@ public function testGetStatuses()
     public function testCanShow()
     {
         // non-visible or disabled
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
+        /** @var $product Product */
+        $product = $this->productFactory->create();
         $this->assertFalse($this->helper->canShow($product));
         $existingProduct = $this->productRepository->get('simple');
 
         // enabled and visible
         $product->setId($existingProduct->getId());
-        $product->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED);
-        $product->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH);
+        $product->setStatus(Status::STATUS_ENABLED);
+        $product->setVisibility(Visibility::VISIBILITY_BOTH);
         $this->assertTrue($this->helper->canShow($product));
 
         $this->assertTrue($this->helper->canShow((int)$product->getId()));
@@ -193,39 +210,27 @@ public function testGetAttributeSourceModelByInputType()
     }
 
     /**
-     * @magentoDataFixture Magento/Catalog/_files/categories.php
      * @magentoDbIsolation enabled
-     * @magentoAppIsolation enabled
+     * @magentoDataFixture Magento/Catalog/_files/categories.php
      */
     public function testInitProduct()
     {
-        /** @var $objectManager \Magento\TestFramework\ObjectManager */
-        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-        $objectManager->get(\Magento\Catalog\Model\Session::class)->setLastVisitedCategoryId(2);
+        $this->objectManager->get(Session::class)->setLastVisitedCategoryId(2);
         $product = $this->productRepository->get('simple');
         $this->helper->initProduct($product->getId(), 'view');
 
-        $this->assertInstanceOf(
-            \Magento\Catalog\Model\Product::class,
-            $objectManager->get(\Magento\Framework\Registry::class)->registry('current_product')
-        );
-        $this->assertInstanceOf(
-            \Magento\Catalog\Model\Category::class,
-            $objectManager->get(\Magento\Framework\Registry::class)->registry('current_category')
-        );
+        $this->assertInstanceOf(Product::class, $this->registry->registry('current_product'));
+        $this->assertInstanceOf(Category::class, $this->registry->registry('current_category'));
     }
 
     public function testPrepareProductOptions()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-        $buyRequest = new \Magento\Framework\DataObject(['qty' => 100, 'options' => ['option' => 'value']]);
+        /** @var $product Product */
+        $product = $this->productFactory->create();
+        $buyRequest = new DataObject(['qty' => 100, 'options' => ['option' => 'value']]);
         $this->helper->prepareProductOptions($product, $buyRequest);
         $result = $product->getPreconfiguredValues();
-        $this->assertInstanceOf(\Magento\Framework\DataObject::class, $result);
+        $this->assertInstanceOf(DataObject::class, $result);
         $this->assertEquals(100, $result->getQty());
         $this->assertEquals(['option' => 'value'], $result->getOptions());
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index 4255d7d3c98e5..9b743542b8573 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -3,29 +3,48 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-$defaultAttributeSet = $objectManager->get(Magento\Eav\Model\Config::class)
-    ->getEntityType('catalog_product')
-    ->getDefaultAttributeSetId();
+use Magento\Catalog\Api\CategoryLinkManagementInterface;
+use Magento\Catalog\Api\CategoryLinkRepositoryInterface;
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Eav\Model\Config;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
 
-$productRepository = $objectManager->create(
-    \Magento\Catalog\Api\ProductRepositoryInterface::class
-);
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsite = $websiteRepository->get('base');
+$rootCategoryId = $baseWebsite->getDefaultStore()->getRootCategoryId();
+
+/** @var StoreManagerInterface $storeManager */
+$storeManager = $objectManager->get(StoreManagerInterface::class);
+
+$defaultAttributeSet = $objectManager->get(Config::class)->getEntityType(Product::ENTITY)->getDefaultAttributeSetId();
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$categoryFactory = $objectManager->get(CategoryInterfaceFactory::class);
 
 $categoryLinkRepository = $objectManager->create(
-    \Magento\Catalog\Api\CategoryLinkRepositoryInterface::class,
+    CategoryLinkRepositoryInterface::class,
     [
-        'productRepository' => $productRepository
+        'productRepository' => $productRepository,
     ]
 );
 
 /** @var Magento\Catalog\Api\CategoryLinkManagementInterface $categoryLinkManagement */
-$categoryLinkManagement = $objectManager->create(\Magento\Catalog\Api\CategoryLinkManagementInterface::class);
+$categoryLinkManagement = $objectManager->get(CategoryLinkManagementInterface::class);
 $reflectionClass = new \ReflectionClass(get_class($categoryLinkManagement));
 $properties = [
     'productRepository' => $productRepository,
-    'categoryLinkRepository' => $categoryLinkRepository
+    'categoryLinkRepository' => $categoryLinkRepository,
 ];
 foreach ($properties as $key => $value) {
     if ($reflectionClass->hasProperty($key)) {
@@ -39,7 +58,7 @@
  * After installation system has two categories: root one with ID:1 and Default category with ID:2
  */
 /** @var $category \Magento\Catalog\Model\Category */
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(3)
     ->setName('Category 1')
@@ -52,7 +71,7 @@
     ->setPosition(1)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(4)
     ->setName('Category 1.1')
@@ -67,7 +86,7 @@
     ->setDescription('Category 1.1 description.')
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(5)
     ->setName('Category 1.1.1')
@@ -83,7 +102,7 @@
     ->setDescription('This is the description for Category 1.1.1')
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(6)
     ->setName('Category 2')
@@ -96,7 +115,7 @@
     ->setPosition(2)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(7)
     ->setName('Movable')
@@ -109,7 +128,7 @@
     ->setPosition(3)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(8)
     ->setName('Inactive')
@@ -122,7 +141,7 @@
     ->setPosition(4)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(9)
     ->setName('Movable Position 1')
@@ -135,7 +154,7 @@
     ->setPosition(5)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(10)
     ->setName('Movable Position 2')
@@ -148,7 +167,7 @@
     ->setPosition(6)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(11)
     ->setName('Movable Position 3')
@@ -161,7 +180,7 @@
     ->setPosition(7)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(12)
     ->setName('Category 12')
@@ -174,7 +193,7 @@
     ->setPosition(8)
     ->save();
 
-$category = $objectManager->create(\Magento\Catalog\Model\Category::class);
+$category = $categoryFactory->create();
 $category->isObjectNew(true);
 $category->setId(13)
     ->setName('Category 1.2')
@@ -189,84 +208,86 @@
     ->setPosition(2)
     ->save();
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+/** @var ProductInterfaceFactory $productInterfaceFactory */
+$productInterfaceFactory = $objectManager->get(ProductInterfaceFactory::class);
+
+/** @var Product $product */
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
     ->setAttributeSetId($defaultAttributeSet)
-    ->setStoreId(1)
-    ->setWebsiteIds([1])
+    ->setStoreId($storeManager->getDefaultStoreView()->getId())
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setName('Simple Product')
     ->setSku('simple')
     ->setPrice(10)
     ->setWeight(18)
     ->setStockData(['use_config_manage_stock' => 0])
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->save();
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+$simple1 = $productRepository->save($product);
 
 $categoryLinkManagement->assignProductToCategories(
-    $product->getSku(),
+    $simple1->getSku(),
     [2, 3, 4, 13]
 );
 
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
     ->setAttributeSetId($defaultAttributeSet)
-    ->setStoreId(1)
-    ->setWebsiteIds([1])
+    ->setStoreId($storeManager->getDefaultStoreView()->getId())
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setName('Simple Product Two')
     ->setSku('12345') // SKU intentionally contains digits only
     ->setPrice(45.67)
     ->setWeight(56)
     ->setStockData(['use_config_manage_stock' => 0])
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->save();
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+$simple2 = $productRepository->save($product);
 
 $categoryLinkManagement->assignProductToCategories(
-    $product->getSku(),
+    $simple2->getSku(),
     [5, 4]
 );
 
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
     ->setAttributeSetId($defaultAttributeSet)
-    ->setStoreId(1)
-    ->setWebsiteIds([1])
+    ->setStoreId($storeManager->getDefaultStoreView()->getId())
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setName('Simple Product Not Visible On Storefront')
     ->setSku('simple-3')
     ->setPrice(15)
     ->setWeight(2)
     ->setStockData(['use_config_manage_stock' => 0])
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_NOT_VISIBLE)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->save();
+    ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+    ->setStatus(Status::STATUS_ENABLED);
+
+$simple3 = $productRepository->save($product);
 
 $categoryLinkManagement->assignProductToCategories(
-    $product->getSku(),
+    $simple3->getSku(),
     [10, 11, 12]
 );
 
-/** @var $product \Magento\Catalog\Model\Product */
-$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
     ->setAttributeSetId($defaultAttributeSet)
-    ->setStoreId(1)
-    ->setWebsiteIds([1])
+    ->setStoreId($storeManager->getDefaultStoreView()->getId())
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setName('Simple Product Three')
     ->setSku('simple-4')
     ->setPrice(10)
     ->setWeight(18)
     ->setStockData(['use_config_manage_stock' => 0])
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->save();
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED);
+
+$simple4 = $productRepository->save($product);
 
 $categoryLinkManagement->assignProductToCategories(
-    $product->getSku(),
+    $simple4->getSku(),
     [10, 11, 12, 13]
 );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
index c2c3782c8cd23..6737aef1eb487 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
@@ -5,29 +5,26 @@
  */
 declare(strict_types=1);
 
-use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
-
-Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
-
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\TestFramework\Helper\CacheCleaner;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_products.php');
 
-/** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+$objectManager = Bootstrap::getObjectManager();
 
-$eavConfig->clear();
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var $attribute Attribute */
+$attribute = $attributeRepository->get('test_configurable');
 
 $attribute->setIsSearchable(1)
-          ->setIsVisibleInAdvancedSearch(1)
-         ->setIsFilterable(true)
-         ->setIsFilterableInSearch(true)
+    ->setIsVisibleInAdvancedSearch(1)
+    ->setIsFilterable(true)
+    ->setIsFilterableInSearch(true)
     ->setIsVisibleOnFront(1);
 
-/** @var AttributeRepositoryInterface $attributeRepository */
-$attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
 $attributeRepository->save($attribute);
-
 CacheCleaner::cleanAll();
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php
index 57b918fb5e663..6f81d6b659996 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_boolean_attribute.php
@@ -5,51 +5,56 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Product;
 use Magento\Catalog\Setup\CategorySetup;
-use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Eav\Model\Entity\Attribute\Source\Boolean;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\Bootstrap;
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var AttributeRepositoryInterface $attributeRepository */
-$attributeRepository = $objectManager->get(AttributeRepositoryInterface::class);
-/** @var Attribute $attribute */
-$attribute = $objectManager->create(Attribute::class);
-/** @var $installer CategorySetup */
-$installer = $objectManager->create(CategorySetup::class);
 
-try {
-    $attributeRepository->get(CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID, 'boolean_attribute');
-} catch (NoSuchEntityException $e) {
-    $attribute->setData(
-        [
-            'attribute_code'                => 'boolean_attribute',
-            'entity_type_id'                => CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID,
-            'is_global'                     => 0,
-            'is_user_defined'               => 1,
-            'frontend_input'                => 'boolean',
-            'is_unique'                     => 0,
-            'is_required'                   => 0,
-            'is_searchable'                 => 1,
-            'is_visible_in_advanced_search' => 1,
-            'is_comparable'                 => 0,
-            'is_filterable'                 => 1,
-            'is_filterable_in_search'       => 1,
-            'is_used_for_promo_rules'       => 0,
-            'is_html_allowed_on_front'      => 1,
-            'is_visible_on_front'           => 1,
-            'used_in_product_listing'       => 1,
-            'used_for_sort_by'              => 0,
-            'frontend_label'                => ['Boolean Attribute'],
-            'backend_type'                  => 'int',
-            'source_model'                  => Boolean::class
-        ]
-    );
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var ProductAttributeInterfaceFactory $attributeFactory */
+$attributeFactory = $objectManager->get(ProductAttributeInterfaceFactory::class);
+
+/** @var ProductInterfaceFactory $productInterfaceFactory */
+$productInterfaceFactory = $objectManager->get(ProductInterfaceFactory::class);
+
+/** @var $installer CategorySetup */
+$installer = $objectManager->get(CategorySetup::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$groupId = $installer->getDefaultAttributeGroupId(Product::ENTITY, $attributeSetId);
 
-    $attributeRepository->save($attribute);
+/** @var ProductAttributeInterface $attributeModel */
+$attributeModel = $attributeFactory->create();
+$attributeModel->setData(
+    [
+        'attribute_code' => 'boolean_attribute',
+        'entity_type_id' => CategorySetup::CATALOG_PRODUCT_ENTITY_TYPE_ID,
+        'is_global' => 0,
+        'is_user_defined' => 1,
+        'frontend_input' => 'boolean',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 1,
+        'is_visible_in_advanced_search' => 1,
+        'is_comparable' => 0,
+        'is_filterable' => 1,
+        'is_filterable_in_search' => 1,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 1,
+        'used_in_product_listing' => 1,
+        'used_for_sort_by' => 0,
+        'frontend_label' => ['Boolean Attribute'],
+        'backend_type' => 'int',
+        'source_model' => Boolean::class
+    ]
+);
+$attribute = $attributeRepository->save($attributeModel);
 
-    /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'Attributes', $attribute->getId());
-}
+$installer->addAttributeToGroup(Product::ENTITY, $attributeSetId, $groupId, $attribute->getId());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
index 29812aa942ab5..3bc3fef56e32e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute.php
@@ -5,125 +5,135 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\CategoryInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductAttributeInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Indexer\Model\Indexer;
+use Magento\Indexer\Model\Indexer\Collection;
+use Magento\Msrp\Model\Product\Attribute\Source\Type as SourceType;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\TestFramework\Helper\CacheCleaner;
 
-$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
-$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
-
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var Config $eavConfig */
+$eavConfig = $objectManager->get(Config::class);
+
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var ProductAttributeInterfaceFactory $attributeFactory */
+$attributeFactory = $objectManager->get(ProductAttributeInterfaceFactory::class);
+
+/** @var $installer EavSetup */
+$installer = $objectManager->get(EavSetup::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$groupId = $installer->getDefaultAttributeGroupId(Product::ENTITY, $attributeSetId);
+
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsite = $websiteRepository->get('base');
+
+$attributeModel = $attributeFactory->create();
+$attributeModel->setData(
+    [
+        'attribute_code' => 'test_configurable',
+        'entity_type_id' => $installer->getEntityTypeId(Product::ENTITY),
+        'is_global' => 1,
+        'is_user_defined' => 1,
+        'frontend_input' => 'select',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 1,
+        'is_visible_in_advanced_search' => 1,
+        'is_comparable' => 1,
+        'is_filterable' => 1,
+        'is_filterable_in_search' => 1,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 1,
+        'used_in_product_listing' => 1,
+        'used_for_sort_by' => 1,
+        'frontend_label' => ['Test Configurable'],
+        'backend_type' => 'int',
+        'option' => [
+            'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
+            'order' => ['option_0' => 1, 'option_1' => 2],
+        ],
+        'default' => ['option_0']
+    ]
+);
+$attribute = $attributeRepository->save($attributeModel);
+
+$installer->addAttributeToGroup(Product::ENTITY, $attributeSetId, $groupId, $attribute->getId());
+CacheCleaner::cleanAll();
 $eavConfig->clear();
 
-/** @var $installer \Magento\Catalog\Setup\CategorySetup */
-$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
-
-if (!$attribute->getId()) {
-
-    /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-    $attribute = Bootstrap::getObjectManager()->create(
-        \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-    );
-
-    /** @var AttributeRepositoryInterface $attributeRepository */
-    $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
-
-    $attribute->setData(
-        [
-            'attribute_code' => 'test_configurable',
-            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-            'is_global' => 1,
-            'is_user_defined' => 1,
-            'frontend_input' => 'select',
-            'is_unique' => 0,
-            'is_required' => 0,
-            'is_searchable' => 1,
-            'is_visible_in_advanced_search' => 1,
-            'is_comparable' => 1,
-            'is_filterable' => 1,
-            'is_filterable_in_search' => 1,
-            'is_used_for_promo_rules' => 0,
-            'is_html_allowed_on_front' => 1,
-            'is_visible_on_front' => 1,
-            'used_in_product_listing' => 1,
-            'used_for_sort_by' => 1,
-            'frontend_label' => ['Test Configurable'],
-            'backend_type' => 'int',
-            'option' => [
-                'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
-                'order' => ['option_0' => 1, 'option_1' => 2],
-            ],
-            'default' => ['option_0']
-        ]
-    );
-
-    $attributeRepository->save($attribute);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductInterfaceFactory $productInterfaceFactory */
+$productInterfaceFactory = $objectManager->get(ProductInterfaceFactory::class);
 
-    /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
-    CacheCleaner::cleanAll();
-}
-
-$eavConfig->clear();
-
-/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-
-/** @var $product \Magento\Catalog\Model\Product */
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId(10)
-    ->setAttributeSetId(4)
+/** @var Product $product */
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setName('Simple Product1')
     ->setSku('simple1')
     ->setTaxClassId('none')
     ->setDescription('description')
     ->setShortDescription('short description')
     ->setOptionsContainer('container1')
-    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_IN_CART)
+    ->setMsrpDisplayActualPriceType(SourceType::TYPE_IN_CART)
     ->setPrice(10)
     ->setWeight(1)
     ->setMetaTitle('meta title')
     ->setMetaKeyword('meta keyword')
     ->setMetaDescription('meta description')
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->setWebsiteIds([1])
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-    ->setSpecialPrice('5.99')
-    ->save();
+    ->setSpecialPrice('5.99');
+$simple1 = $productRepository->save($product);
 
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId(11)
-    ->setAttributeSetId(4)
+/** @var Product $product */
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setName('Simple Product2')
     ->setSku('simple2')
     ->setTaxClassId('none')
     ->setDescription('description')
     ->setShortDescription('short description')
     ->setOptionsContainer('container1')
-    ->setMsrpDisplayActualPriceType(\Magento\Msrp\Model\Product\Attribute\Source\Type::TYPE_ON_GESTURE)
+    ->setMsrpDisplayActualPriceType(SourceType::TYPE_ON_GESTURE)
     ->setPrice(20)
     ->setWeight(1)
     ->setMetaTitle('meta title')
     ->setMetaKeyword('meta keyword')
     ->setMetaDescription('meta description')
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
-    ->setWebsiteIds([1])
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 50, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-    ->setSpecialPrice('15.99')
-    ->save();
+    ->setSpecialPrice('15.99');
+$simple2 = $productRepository->save($product);
 
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-$product->isObjectNew(true);
-$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
-    ->setId(12)
-    ->setAttributeSetId(4)
+/** @var Product $product */
+$product = $productInterfaceFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
     ->setName('Simple Product3')
     ->setSku('simple3')
     ->setTaxClassId('none')
@@ -131,44 +141,42 @@
     ->setShortDescription('short description')
     ->setPrice(30)
     ->setWeight(1)
-    ->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
-    ->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_DISABLED)
-    ->setWebsiteIds([1])
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_DISABLED)
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setCategoryIds([])
     ->setStockData(['use_config_manage_stock' => 1, 'qty' => 140, 'is_qty_decimal' => 0, 'is_in_stock' => 1])
-    ->setSpecialPrice('25.99')
-    ->save();
+    ->setSpecialPrice('25.99');
+$simple3 = $productRepository->save($product);
 
-$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
+/** @var CategoryInterfaceFactory $categoryInterfaceFactory */
+$categoryInterfaceFactory = $objectManager->get(CategoryInterfaceFactory::class);
+
+$category = $categoryInterfaceFactory->create();
 $category->isObjectNew(true);
-$category->setId(
-    333
-)->setCreatedAt(
-    '2014-06-23 09:50:07'
-)->setName(
-    'Category 1'
-)->setParentId(
-    2
-)->setPath(
-    '1/2/333'
-)->setLevel(
-    2
-)->setAvailableSortBy(
-    ['position', 'name']
-)->setDefaultSortBy(
-    'name'
-)->setIsActive(
-    true
-)->setPosition(
-    1
-)->setPostedProducts(
-    [10 => 10, 11 => 11, 12 => 12]
-)->save();
+$category->setId(333)
+    ->setCreatedAt('2014-06-23 09:50:07')
+    ->setName('Category 1')
+    ->setParentId(2)
+    ->setPath('1/2/333')
+    ->setLevel(2)
+    ->setAvailableSortBy(['position', 'name'])
+    ->setDefaultSortBy('name')
+    ->setIsActive(true)
+    ->setPosition(1)
+    ->setPostedProducts(
+        [
+            $simple1->getId() => 10,
+            $simple2->getId() => 11,
+            $simple3->getId() => 12
+        ]
+    );
+$category->save();
 
-/** @var \Magento\Indexer\Model\Indexer\Collection $indexerCollection */
-$indexerCollection = Bootstrap::getObjectManager()->get(\Magento\Indexer\Model\Indexer\Collection::class);
+/** @var Collection $indexerCollection */
+$indexerCollection = $objectManager->get(Collection::class);
 $indexerCollection->load();
-/** @var \Magento\Indexer\Model\Indexer $indexer */
+/** @var Indexer $indexer */
 foreach ($indexerCollection->getItems() as $indexer) {
     $indexer->reindexAll();
 }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php
index dd89f8974a647..47e6a4e71cb69 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attribute_rollback.php
@@ -5,47 +5,57 @@
  */
 declare(strict_types=1);
 
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
-
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Eav\Model\Config;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Catalog\Model\GetCategoryByName;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var Registry $registry */
+$registry = $objectManager->get(Registry::class);
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', true);
 
-/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager->create(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 
 foreach (['simple1', 'simple2', 'simple3'] as $sku) {
     try {
         $product = $productRepository->get($sku, false, null, true);
         $productRepository->delete($product);
-    } catch (\Magento\Framework\Exception\NoSuchEntityException $exception) {
+    } catch (NoSuchEntityException $exception) {
         //Product already removed
     }
 }
 
-$productCollection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-    ->get(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
-foreach ($productCollection as $product) {
-    $product->delete();
+/** @var CategoryRepositoryInterface $categoryRepository */
+$categoryRepository = $objectManager->get(CategoryRepositoryInterface::class);
+/** @var GetCategoryByName $getCategoryByName */
+$getCategoryByName = $objectManager->get(GetCategoryByName::class);
+$category = $getCategoryByName->execute('Category 1');
+try {
+    if ($category->getId()) {
+        $categoryRepository->delete($category);
+    }
+} catch (NoSuchEntityException $exception) {
+    //Category already removed
 }
 
-/** @var $category \Magento\Catalog\Model\Category */
-$category = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Category::class);
-$category->load(333);
-if ($category->getId()) {
-    $category->delete();
-}
+$eavConfig = $objectManager->get(Config::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
 
-$eavConfig = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
-$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
-if ($attribute instanceof \Magento\Eav\Model\Entity\Attribute\AbstractAttribute
-    && $attribute->getId()
-) {
-    $attribute->delete();
+try {
+    $attribute = $attributeRepository->get('test_configurable');
+    $attributeRepository->delete($attribute);
+} catch (NoSuchEntityException $exception) {
+    //Attribute already removed
 }
 $eavConfig->clear();
 
-
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
index 4dd088e148d75..76056f2fa9e0d 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_custom_attribute.php
@@ -5,8 +5,15 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Eav\Api\AttributeRepositoryInterface;
 use Magento\TestFramework\Helper\CacheCleaner;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 use Magento\TestFramework\Eav\Model\GetAttributeSetByName;
@@ -15,136 +22,117 @@
 Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/categories.php');
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var GetAttributeSetByName $getAttributeSetByName */
-$getAttributeSetByName = $objectManager->get(GetAttributeSetByName::class);
-$attributeSet = $getAttributeSetByName->execute('second_attribute_set');
-$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
-$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
-
-$eavConfig->clear();
-
-$attribute1 = $eavConfig->getAttribute('catalog_product', ' second_test_configurable');
-$eavConfig->clear();
-
-/** @var $installer \Magento\Catalog\Setup\CategorySetup */
-$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
-
-if (!$attribute->getId()) {
-
-    /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-    $attribute = Bootstrap::getObjectManager()->create(
-        \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-    );
-
-    /** @var AttributeRepositoryInterface $attributeRepository */
-    $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
-
-    $attribute->setData(
-        [
-            'attribute_code' => 'test_configurable',
-            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-            'is_global' => 1,
-            'is_user_defined' => 1,
-            'frontend_input' => 'select',
-            'is_unique' => 0,
-            'is_required' => 0,
-            'is_searchable' => 1,
-            'is_visible_in_advanced_search' => 1,
-            'is_comparable' => 1,
-            'is_filterable' => 1,
-            'is_filterable_in_search' => 1,
-            'is_used_for_promo_rules' => 0,
-            'is_html_allowed_on_front' => 1,
-            'is_visible_on_front' => 1,
-            'used_in_product_listing' => 1,
-            'used_for_sort_by' => 1,
-            'frontend_label' => ['Test Configurable'],
-            'backend_type' => 'int',
-            'option' => [
-                'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
-                'order' => ['option_0' => 1, 'option_1' => 2],
-            ],
-            'default_value' => 'option_0'
-        ]
-    );
 
-    $attributeRepository->save($attribute);
-
-    /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
-}
-// create a second attribute
-if (!$attribute1->getId()) {
-
-    /** @var $attribute1 \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-    $attribute1 = Bootstrap::getObjectManager()->create(
-        \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-    );
-
-    /** @var AttributeRepositoryInterface $attributeRepository */
-    $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
-
-    $attribute1->setData(
-        [
-            'attribute_code' => 'second_test_configurable',
-            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-            'is_global' => 1,
-            'is_user_defined' => 1,
-            'frontend_input' => 'select',
-            'is_unique' => 0,
-            'is_required' => 0,
-            'is_searchable' => 1,
-            'is_visible_in_advanced_search' => 1,
-            'is_comparable' => 1,
-            'is_filterable' => 1,
-            'is_filterable_in_search' => 1,
-            'is_used_for_promo_rules' => 0,
-            'is_html_allowed_on_front' => 1,
-            'is_visible_on_front' => 1,
-            'used_in_product_listing' => 1,
-            'used_for_sort_by' => 1,
-            'frontend_label' => ['Second Test Configurable'],
-            'backend_type' => 'int',
-            'option' => [
-                'value' => ['option_0' => ['Option 3'], 'option_1' => ['Option 4']],
-                'order' => ['option_0' => 1, 'option_1' => 2],
-            ],
-            'default' => ['option_0']
-        ]
-    );
-
-    $attributeRepository->save($attribute1);
-
-    /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup(
-        'catalog_product',
-        $attributeSet->getId(),
-        $attributeSet->getDefaultGroupId(),
-        $attribute1->getId()
-    );
-}
+/** @var Config $eavConfig */
+$eavConfig = $objectManager->get(Config::class);
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var ProductAttributeInterfaceFactory $attributeFactory */
+$attributeFactory = $objectManager->get(ProductAttributeInterfaceFactory::class);
 
+/** @var GetAttributeSetByName $getAttributeSetByName */
+$getAttributeSetByName = $objectManager->get(GetAttributeSetByName::class);
+$secondAttributeSet = $getAttributeSetByName->execute('second_attribute_set');
+
+/** @var $installer EavSetup */
+$installer = $objectManager->get(EavSetup::class);
+$defaultAttributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$defaultGroupId = $installer->getDefaultAttributeGroupId(Product::ENTITY, $defaultAttributeSetId);
+
+$attributeModel = $attributeFactory->create();
+$attributeModel->setData(
+    [
+        'attribute_code' => 'test_configurable',
+        'entity_type_id' => $installer->getEntityTypeId(Product::ENTITY),
+        'is_global' => 1,
+        'is_user_defined' => 1,
+        'frontend_input' => 'select',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 1,
+        'is_visible_in_advanced_search' => 1,
+        'is_comparable' => 1,
+        'is_filterable' => 1,
+        'is_filterable_in_search' => 1,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 1,
+        'used_in_product_listing' => 1,
+        'used_for_sort_by' => 1,
+        'frontend_label' => ['Test Configurable'],
+        'backend_type' => 'int',
+        'option' => [
+            'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
+            'order' => ['option_0' => 1, 'option_1' => 2],
+        ],
+        'default' => ['option_0']
+    ]
+);
+$attribute = $attributeRepository->save($attributeModel);
+$installer->addAttributeToGroup(
+    Product::ENTITY,
+    $defaultAttributeSetId,
+    $defaultGroupId,
+    $attribute->getId()
+);
 $eavConfig->clear();
 
-/** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+/** @var ProductAttributeInterface $attribute */
+$attributeModel2 = $attributeFactory->create();
+$attributeModel2->setData(
+    [
+        'attribute_code' => 'second_test_configurable',
+        'entity_type_id' => $installer->getEntityTypeId(Product::ENTITY),
+        'is_global' => 1,
+        'is_user_defined' => 1,
+        'frontend_input' => 'select',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 1,
+        'is_visible_in_advanced_search' => 1,
+        'is_comparable' => 1,
+        'is_filterable' => 1,
+        'is_filterable_in_search' => 1,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 1,
+        'used_in_product_listing' => 1,
+        'used_for_sort_by' => 1,
+        'frontend_label' => ['Second Test Configurable'],
+        'backend_type' => 'int',
+        'option' => [
+            'value' => ['option_0' => ['Option 3'], 'option_1' => ['Option 4']],
+            'order' => ['option_0' => 1, 'option_1' => 2],
+        ],
+        'default' => ['option_0'],
+    ]
+);
+$attribute2 = $attributeRepository->save($attributeModel2);
+$installer->addAttributeToGroup(
+    Product::ENTITY,
+    $secondAttributeSet->getId(),
+    $secondAttributeSet->getDefaultGroupId(),
+    $attribute2->getId()
+);
 
 /** @var  $productRepository \Magento\Catalog\Api\ProductRepositoryInterface */
-$productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
 $productsWithNewAttributeSet = ['simple', '12345', 'simple-4'];
 
 foreach ($productsWithNewAttributeSet as $sku) {
     try {
         $product = $productRepository->get($sku, false, null, true);
-        $product->setAttributeSetId($attributeSet->getId());
+        $product->setAttributeSetId($secondAttributeSet->getId());
         $product->setStockData(
-            ['use_config_manage_stock' => 1,
+            [
+                'use_config_manage_stock' => 1,
                 'qty' => 50,
                 'is_qty_decimal' => 0,
-                'is_in_stock' => 1]
+                'is_in_stock' => 1,
+            ]
         );
         $productRepository->save($product);
-    } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+    } catch (NoSuchEntityException $e) {
 
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute.php
index 12f63993cb2d3..939c1d261b3c6 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_attribute.php
@@ -4,59 +4,67 @@
  * See COPYING.txt for license details.
  */
 
+use Magento\Catalog\Api\Data\ProductAttributeInterface;
+use Magento\Catalog\Api\Data\ProductAttributeInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Config;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\TestFramework\Helper\Bootstrap;
-use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-$eavConfig = Bootstrap::getObjectManager()->get(\Magento\Eav\Model\Config::class);
-$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
+$objectManager = Bootstrap::getObjectManager();
 
-$eavConfig->clear();
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var ProductAttributeInterfaceFactory $attributeFactory */
+$attributeFactory = $objectManager->get(ProductAttributeInterfaceFactory::class);
 
-/** @var $installer \Magento\Catalog\Setup\CategorySetup */
-$installer = Bootstrap::getObjectManager()->create(\Magento\Catalog\Setup\CategorySetup::class);
-
-if (!$attribute->getId()) {
-
-    /** @var $attribute \Magento\Catalog\Model\ResourceModel\Eav\Attribute */
-    $attribute = Bootstrap::getObjectManager()->create(
-        \Magento\Catalog\Model\ResourceModel\Eav\Attribute::class
-    );
-
-    /** @var AttributeRepositoryInterface $attributeRepository */
-    $attributeRepository = Bootstrap::getObjectManager()->create(AttributeRepositoryInterface::class);
-
-    $attribute->setData(
-        [
-            'attribute_code' => 'test_configurable',
-            'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
-            'is_global' => 1,
-            'is_user_defined' => 1,
-            'frontend_input' => 'select',
-            'is_unique' => 0,
-            'is_required' => 0,
-            'is_searchable' => 0,
-            'is_visible_in_advanced_search' => 0,
-            'is_comparable' => 0,
-            'is_filterable' => 0,
-            'is_filterable_in_search' => 0,
-            'is_used_for_promo_rules' => 0,
-            'is_html_allowed_on_front' => 1,
-            'is_visible_on_front' => 0,
-            'used_in_product_listing' => 0,
-            'used_for_sort_by' => 0,
-            'frontend_label' => ['Test Configurable'],
-            'backend_type' => 'int',
-            'option' => [
-                'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
-                'order' => ['option_0' => 1, 'option_1' => 2],
-            ],
-        ]
-    );
-
-    $attributeRepository->save($attribute);
-
-    /* Assign attribute to attribute set */
-    $installer->addAttributeToGroup('catalog_product', 'Default', 'General', $attribute->getId());
+try {
+    $attributeRepository->get('test_configurable');
+    Resolver::getInstance()
+        ->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute_rollback.php');
+} catch (NoSuchEntityException $e) {
 }
 
+$eavConfig = $objectManager->get(Config::class);
+
+/** @var $installer EavSetup */
+$installer = $objectManager->get(EavSetup::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+$groupId = $installer->getDefaultAttributeGroupId(Product::ENTITY, $attributeSetId);
+/** @var ProductAttributeInterface $attributeModel */
+$attributeModel = $attributeFactory->create();
+$attributeModel->setData(
+    [
+        'attribute_code' => 'test_configurable',
+        'entity_type_id' => $installer->getEntityTypeId(Product::ENTITY),
+        'is_global' => 1,
+        'is_user_defined' => 1,
+        'frontend_input' => 'select',
+        'is_unique' => 0,
+        'is_required' => 0,
+        'is_searchable' => 0,
+        'is_visible_in_advanced_search' => 0,
+        'is_comparable' => 0,
+        'is_filterable' => 0,
+        'is_filterable_in_search' => 0,
+        'is_used_for_promo_rules' => 0,
+        'is_html_allowed_on_front' => 1,
+        'is_visible_on_front' => 0,
+        'used_in_product_listing' => 0,
+        'used_for_sort_by' => 0,
+        'frontend_label' => ['Test Configurable'],
+        'backend_type' => 'int',
+        'option' => [
+            'value' => ['option_0' => ['Option 1'], 'option_1' => ['Option 2']],
+            'order' => ['option_0' => 1, 'option_1' => 2],
+        ],
+    ]
+);
+
+$attribute = $attributeRepository->save($attributeModel);
+
+$installer->addAttributeToGroup(Product::ENTITY, $attributeSetId, $groupId, $attribute->getId());
 $eavConfig->clear();
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
index f6e6261c75662..618b554aaa2cc 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_products.php
@@ -3,49 +3,63 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Attribute\Source\Status;
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\Catalog\Setup\CategorySetup;
 use Magento\ConfigurableProduct\Helper\Product\Options\Factory;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
 use Magento\Eav\Api\Data\AttributeOptionInterface;
-use Magento\Eav\Model\Config;
+use Magento\Eav\Setup\EavSetup;
+use Magento\Store\Api\WebsiteRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
 Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute.php');
 
 $objectManager = Bootstrap::getObjectManager();
-/** @var ProductRepositoryInterface $productRepository */
-$productRepository = $objectManager
-    ->get(ProductRepositoryInterface::class);
-/** @var Config $eavConfig */
-$eavConfig = $objectManager->get(Config::class);
-$attribute = $eavConfig->getAttribute(Product::ENTITY, 'test_configurable');
 
-/** @var $installer CategorySetup */
-$installer = $objectManager->create(CategorySetup::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsite = $websiteRepository->get('base');
 
-/* Create simple products per each option value*/
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+/** @var ProductInterfaceFactory $productInterfaceFactory */
+$productInterfaceFactory = $objectManager->get(ProductInterfaceFactory::class);
+
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+/** @var $attribute Attribute */
+$attribute = $attributeRepository->get('test_configurable');
 /** @var AttributeOptionInterface[] $options */
 $options = $attribute->getOptions();
 
+/** @var $installer EavSetup */
+$installer = $objectManager->get(EavSetup::class);
+$attributeSetId = $installer->getAttributeSetId(Product::ENTITY, 'Default');
+
+/** @var Factory $optionsFactory */
+$optionsFactory = $objectManager->get(Factory::class);
+/* Create simple products per each option value*/
+
 $attributeValues = [];
-$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 $associatedProductIds = [];
 $productIds = [10, 20];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
     /** @var $product Product */
-    $product = $objectManager->create(Product::class);
+    $product = $productInterfaceFactory->create();
     $productId = array_shift($productIds);
     $product->setTypeId(Type::TYPE_SIMPLE)
         ->setAttributeSetId($attributeSetId)
-        ->setWebsiteIds([1])
+        ->setWebsiteIds([$baseWebsite->getId()])
         ->setName('Configurable Option' . $option->getLabel())
         ->setSku('simple_' . $productId)
         ->setPrice($productId)
@@ -53,20 +67,18 @@
         ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
         ->setStatus(Status::STATUS_ENABLED)
         ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
-    $product = $productRepository->save($product);
+    $simple1 = $productRepository->save($product);
 
     $attributeValues[] = [
         'label' => 'test',
         'attribute_id' => $attribute->getId(),
         'value_index' => $option->getValue(),
     ];
-    $associatedProductIds[] = $product->getId();
+    $associatedProductIds[] = $simple1->getId();
 }
 
 /** @var $product Product */
-$product = $objectManager->create(Product::class);
-/** @var Factory $optionsFactory */
-$optionsFactory = $objectManager->create(Factory::class);
+$product = $productInterfaceFactory->create();
 $configurableAttributesData = [
     [
         'attribute_id' => $attribute->getId(),
@@ -84,7 +96,7 @@
 
 $product->setTypeId(Configurable::TYPE_CODE)
     ->setAttributeSetId($attributeSetId)
-    ->setWebsiteIds([1])
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setName('Configurable Product')
     ->setSku('configurable')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
@@ -98,18 +110,17 @@
 $options = $attribute->getOptions();
 
 $attributeValues = [];
-$attributeSetId = $installer->getAttributeSetId('catalog_product', 'Default');
 $associatedProductIds = [];
 $productIds = [30, 40];
 array_shift($options); //remove the first option which is empty
 
 foreach ($options as $option) {
     /** @var $product Product */
-    $product = $objectManager->create(Product::class);
+    $product = $productInterfaceFactory->create();
     $productId = array_shift($productIds);
     $product->setTypeId(Type::TYPE_SIMPLE)
         ->setAttributeSetId($attributeSetId)
-        ->setWebsiteIds([1])
+        ->setWebsiteIds([$baseWebsite->getId()])
         ->setName('Configurable Option' . $option->getLabel())
         ->setSku('simple_' . $productId)
         ->setPrice($productId)
@@ -117,21 +128,18 @@
         ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
         ->setStatus(Status::STATUS_ENABLED)
         ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
-    $product = $productRepository->save($product);
+    $simple2 = $productRepository->save($product);
 
     $attributeValues[] = [
         'label' => 'test',
         'attribute_id' => $attribute->getId(),
         'value_index' => $option->getValue(),
     ];
-    $associatedProductIds[] = $product->getId();
+    $associatedProductIds[] = $simple2->getId();
 }
 
 /** @var $product Product */
-$product = $objectManager->create(Product::class);
-
-/** @var Factory $optionsFactory */
-$optionsFactory = $objectManager->create(Factory::class);
+$product = $productInterfaceFactory->create();
 
 $configurableAttributesData = [
     [
@@ -153,7 +161,7 @@
 
 $product->setTypeId(Configurable::TYPE_CODE)
     ->setAttributeSetId($attributeSetId)
-    ->setWebsiteIds([1])
+    ->setWebsiteIds([$baseWebsite->getId()])
     ->setName('Configurable Product 12345')
     ->setSku('configurable_12345')
     ->setVisibility(Visibility::VISIBILITY_BOTH)
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/_files/reindex_all_invalid.php b/dev/tests/integration/testsuite/Magento/Indexer/_files/reindex_all_invalid.php
new file mode 100644
index 0000000000000..f243d39c24d26
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Indexer/_files/reindex_all_invalid.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Indexer\Model\Processor;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Processor $processor */
+$processor = Bootstrap::getObjectManager()->get(Processor::class);
+$processor->reindexAllInvalid();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php
index 4e64aa0349b80..1b56a7e8c4448 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_configurable_product_rollback.php
@@ -5,4 +5,5 @@
  */
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/product_configurable_rollback.php');
 Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_with_visual_swatch_attribute_rollback.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_with_visual_swatch_attribute_rollback.php
index 38fade9013cd1..0bc5e2e6e595e 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_with_visual_swatch_attribute_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/configurable_product_with_visual_swatch_attribute_rollback.php
@@ -12,9 +12,6 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
 
-Resolver::getInstance()->requireDataFixture(
-    'Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php'
-);
 $objectManager = Bootstrap::getObjectManager();
 /** @var Registry $registry */
 $registry = $objectManager->get(Registry::class);
@@ -42,5 +39,9 @@
     //Product already removed
 }
 
+Resolver::getInstance()->requireDataFixture(
+    'Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php'
+);
+
 $registry->unregister('isSecureArea');
 $registry->register('isSecureArea', false);
diff --git a/dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php b/dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php
index c480906619a4a..c5e1e1fc287ba 100644
--- a/dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Swatches/_files/visual_swatch_attribute_with_different_options_type_rollback.php
@@ -5,20 +5,33 @@
  */
 declare(strict_types=1);
 
+use Magento\Catalog\Api\ProductAttributeRepositoryInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Swatches\Helper\Media as SwatchesMedia;
 use Magento\TestFramework\Helper\Bootstrap;
 
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductAttributeRepositoryInterface $attributeRepository */
+$attributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+
+try {
+    $attribute = $attributeRepository->get('test_configurable');
+    $attributeRepository->delete($attribute);
+} catch (NoSuchEntityException $exception) {
+    //Product already removed
+}
+
 /** @var WriteInterface $mediaDirectory */
-$mediaDirectory = Bootstrap::getObjectManager()->get(Filesystem::class)
+$mediaDirectory = $objectManager->get(Filesystem::class)
     ->getDirectoryWrite(
         DirectoryList::MEDIA
     );
 
 /** @var SwatchesMedia $swatchesMedia */
-$swatchesMedia = Bootstrap::getObjectManager()->get(SwatchesMedia::class);
+$swatchesMedia = $objectManager->get(SwatchesMedia::class);
 
 $testImageName = 'visual_swatch_attribute_option_type_image.jpg';
 $testImageSwatchPath = $swatchesMedia->getAttributeSwatchPath($testImageName);

From 6d05df05c1161e5d7e742da4f9f460a0e4f8a687 Mon Sep 17 00:00:00 2001
From: Roman Zhupanyn <roma.dj.elf@gmail.com>
Date: Wed, 21 Oct 2020 11:44:36 +0300
Subject: [PATCH 602/671] MC-36956: Create automated test for "Upload Category
 Image"

---
 .../Model/ResourceModel/CategoryTest.php        | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php
index 0a3944bbb36fd..c57e981f772de 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/CategoryTest.php
@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\Category as CategoryModel;
 use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -64,7 +65,7 @@ protected function setUp(): void
         $this->categoryRepository = $this->objectManager->get(CategoryRepositoryInterface::class);
         $this->categoryResource = $this->objectManager->get(CategoryResource::class);
         $this->storeManager = $this->objectManager->get(StoreManagerInterface::class);
-        $this->categoryCollection = $this->objectManager->get(CategoryCollection::class);
+        $this->categoryCollection = $this->objectManager->get(CategoryCollectionFactory::class)->create();
         $this->filesystem = $this->objectManager->get(Filesystem::class);
         $this->mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
     }
@@ -92,8 +93,8 @@ public function testAddImageForCategory(): void
             'type' => 'image/jpg',
             'tmp_name' => '/tmp/phpDstnAx',
             'file' => 'magento_small_image.jpg',
+            'url' => $this->prepareDataImageUrl('magento_small_image.jpg'),
         ];
-        $this->prepareDataImageUrl($dataImage);
         $imageRelativePath = self::BASE_PATH . DIRECTORY_SEPARATOR . $dataImage['file'];
         $expectedImage = DIRECTORY_SEPARATOR . $this->storeManager->getStore()->getBaseMediaDir()
             . DIRECTORY_SEPARATOR . $imageRelativePath;
@@ -116,14 +117,14 @@ public function testAddImageForCategory(): void
     }
 
     /**
-     * Add image url to image data
+     * Prepare image url for image data
      *
-     * @param array $dataImage
-     * @return void
+     * @param string $file
+     * @return string
      */
-    private function prepareDataImageUrl(array &$dataImage): void
+    private function prepareDataImageUrl(string $file): string
     {
-        $dataImage['url'] = $this->storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA)
-            . self::BASE_TMP_PATH . DIRECTORY_SEPARATOR . $dataImage['file'];
+        return $this->storeManager->getStore()->getBaseUrl(UrlInterface::URL_TYPE_MEDIA)
+            . self::BASE_TMP_PATH . DIRECTORY_SEPARATOR . $file;
     }
 }

From 36f4183ae372fb1b8a2f51aefe1ee948829ed16c Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Wed, 21 Oct 2020 12:05:40 +0300
Subject: [PATCH 603/671] MC-37544: Create automated test for "Category
 Schedule Design Update not available if CatalogStaging installed"

---
 .../Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml    | 1 +
 .../Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
index a65d2c9e63bef..fb231cf56b200 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
@@ -10,5 +10,6 @@
     <section name="AdminCategoryScheduleDesignUpdateSection">
         <element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/>
         <element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/>
+        <element name="customDesignFrom" type="input" selector="input[name='custom_design_from']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
index e2f0a01fc733b..b9940fe42052c 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -10,5 +10,6 @@
     <section name="StorefrontHeaderSection">
         <element name="welcomeMessage" type="text" selector=".greet.welcome"/>
         <element name="logoLink" type="button" selector=".header .logo"/>
+        <element name="logoImage" type="button" selector=".header .logo > img[src*='{{filename}}']" parameterized="true"/>
     </section>
 </sections>

From 6970b19c234d752d2f4137580c877b37d96f77d5 Mon Sep 17 00:00:00 2001
From: Ejaz Alam <ejazalam518@gmail.com>
Date: Wed, 21 Oct 2020 14:23:44 +0500
Subject: [PATCH 604/671] Updated string with Static key.

#30545
Update string with the static key in function.
---
 app/code/Magento/Quote/Model/Quote/Address.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 5476915d9d649..4773c5a391094 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -139,6 +139,8 @@ class Address extends AbstractAddress implements
     const ADDRESS_TYPE_BILLING = 'billing';
 
     const ADDRESS_TYPE_SHIPPING = 'shipping';
+    
+    const CACHED_ITEMS_ALL = 'cached_items_all';
 
     /**
      * Prefix of model events
@@ -636,8 +638,7 @@ public function getItemsCollection()
     public function getAllItems()
     {
         // We calculate item list once and cache it in three arrays - all items
-        $key = 'cached_items_all';
-        if (!$this->hasData($key)) {
+        if (!$this->hasData(self::CACHED_ITEMS_ALL)) {
             $quoteItems = $this->getQuote()->getItemsCollection();
             $addressItems = $this->getItemsCollection();
 
@@ -676,10 +677,10 @@ public function getAllItems()
             }
 
             // Cache calculated lists
-            $this->setData('cached_items_all', $items);
+            $this->setData(self::CACHED_ITEMS_ALL, $items);
         }
 
-        $items = $this->getData($key);
+        $items = $this->getData(self::CACHED_ITEMS_ALL);
 
         return $items;
     }

From 8243e91b186baaa1002cc1cc7f74bbe4f1d219fa Mon Sep 17 00:00:00 2001
From: Viktor Kopin <viktor.kopin@transoftgroup.com>
Date: Wed, 21 Oct 2020 14:50:58 +0300
Subject: [PATCH 605/671] MC-38413: REST API: catalogCategoryLinkManagement
 error if same product in multiple subcategories of parent

---
 .../Catalog/Model/CategoryLinkManagement.php  |  6 ++++--
 .../Catalog/Model/ResourceModel/Category.php  |  6 +++---
 .../ResourceModel/Product/Collection.php      | 12 ++++++-----
 .../Unit/Model/CategoryLinkManagementTest.php |  5 +++++
 .../Api/CategoryLinkManagementTest.php        | 21 ++++++++++++++++---
 5 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
index 8966848a6d036..591cbc32a0d86 100644
--- a/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
+++ b/app/code/Magento/Catalog/Model/CategoryLinkManagement.php
@@ -3,11 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Catalog\Model;
 
 /**
- * Class CategoryLinkManagement
+ * Represents Category Product Link Management class
  */
 class CategoryLinkManagement implements \Magento\Catalog\Api\CategoryLinkManagementInterface
 {
@@ -56,7 +57,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAssignedProducts($categoryId)
     {
@@ -65,6 +66,7 @@ public function getAssignedProducts($categoryId)
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $products */
         $products = $category->getProductCollection();
         $products->addFieldToSelect('position');
+        $products->groupByAttribute($products->getProductEntityMetadata()->getIdentifierField());
 
         /** @var \Magento\Catalog\Api\Data\CategoryProductLinkInterface[] $links */
         $links = [];
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
index 917aafb643b47..e19286efc38c0 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Category.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -13,7 +13,7 @@
 
 namespace Magento\Catalog\Model\ResourceModel;
 
-use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\Indexer\Category\Product\Processor;
 use Magento\Catalog\Setup\CategorySetup;
 use Magento\Framework\App\ObjectManager;
@@ -1172,11 +1172,11 @@ public function getCategoryWithChildren(int $categoryId): array
             return [];
         }
 
-        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->metadataPool->getMetadata(CategoryInterface::class)->getLinkField();
         $select = $connection->select()
             ->from(
                 ['cce' => $this->getTable('catalog_category_entity')],
-                [$linkField, 'parent_id', 'path']
+                [$linkField, 'entity_id', 'parent_id', 'path']
             )->join(
                 ['cce_int' => $this->getTable('catalog_category_entity_int')],
                 'cce.' . $linkField . ' = cce_int.' . $linkField,
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
index 7dbfe0d5fccea..3f908663c8e5e 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -7,6 +7,7 @@
 
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 use Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver;
@@ -2130,16 +2131,17 @@ private function getChildrenCategories(int $categoryId): array
 
         $firstCategory = array_shift($categories);
         if ($firstCategory['is_anchor'] == 1) {
-            $linkField = $this->getProductEntityMetadata()->getLinkField();
-            $anchorCategory[] = (int)$firstCategory[$linkField];
+            //category hierarchy can not be modified by staging updates
+            $entityField = $this->metadataPool->getMetadata(CategoryInterface::class)->getIdentifierField();
+            $anchorCategory[] = (int)$firstCategory[$entityField];
             foreach ($categories as $category) {
                 if (in_array($category['parent_id'], $categoryIds)
                     && in_array($category['parent_id'], $anchorCategory)) {
-                    $categoryIds[] = (int)$category[$linkField];
+                    $categoryIds[] = (int)$category[$entityField];
                     // Storefront approach is to treat non-anchor children of anchor category as anchors.
-                    // Adding their's IDs to $anchorCategory for consistency.
+                    // Adding theirs IDs to $anchorCategory for consistency.
                     if ($category['is_anchor'] == 1 || in_array($category['parent_id'], $anchorCategory)) {
-                        $anchorCategory[] = (int)$category[$linkField];
+                        $anchorCategory[] = (int)$category[$entityField];
                     }
                 }
             }
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
index be79b11cdf2b8..7cb2064d34d20 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/CategoryLinkManagementTest.php
@@ -15,6 +15,7 @@
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ResourceModel\Product;
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\DataObject;
 use Magento\Framework\Indexer\IndexerRegistry;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -85,7 +86,11 @@ public function testGetAssignedProducts()
         $categoryMock->expects($this->once())->method('getProductCollection')->willReturn($productsMock);
         $categoryMock->expects($this->once())->method('getId')->willReturn($categoryId);
         $productsMock->expects($this->once())->method('addFieldToSelect')->with('position')->willReturnSelf();
+        $productsMock->expects($this->once())->method('groupByAttribute')->with('entity_id')->willReturnSelf();
         $productsMock->expects($this->once())->method('getItems')->willReturn($items);
+        $productsMock->expects($this->once())
+            ->method('getProductEntityMetadata')
+            ->willReturn(new DataObject(['identifier_field' => 'entity_id']));
         $this->productLinkFactoryMock->expects($this->once())->method('create')->willReturn($categoryProductLinkMock);
         $categoryProductLinkMock->expects($this->once())
             ->method('setSku')
diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php
index 629cc077a63ea..85509dabdf415 100644
--- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php
@@ -4,10 +4,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Catalog\Api;
 
 use Magento\TestFramework\TestCase\WebapiAbstract;
 
+/**
+ * Represents CategoryLinkManagementTest Class
+ */
 class CategoryLinkManagementTest extends WebapiAbstract
 {
     const SERVICE_WRITE_NAME = 'catalogCategoryLinkManagementV1';
@@ -43,11 +48,21 @@ public function testInfoNoSuchEntityException()
         }
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testDuplicatedProductsInChildCategories()
+    {
+        $result = $this->getAssignedProducts(3, 'all');
+        $this->assertCount(3, $result);
+    }
+
     /**
      * @param int $id category id
-     * @return string
+     * @param string|null $storeCode
+     * @return array|string
      */
-    protected function getAssignedProducts($id)
+    private function getAssignedProducts(int $id, ?string $storeCode = null)
     {
         $serviceInfo = [
             'rest' => [
@@ -60,6 +75,6 @@ protected function getAssignedProducts($id)
                 'operation' => self::SERVICE_WRITE_NAME . 'GetAssignedProducts',
             ],
         ];
-        return $this->_webApiCall($serviceInfo, ['categoryId' => $id]);
+        return $this->_webApiCall($serviceInfo, ['categoryId' => $id], null, $storeCode);
     }
 }

From 3176d9d703a7859646c2543a564cb58c6c1ac99d Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Wed, 21 Oct 2020 15:19:12 +0300
Subject: [PATCH 606/671] MC-37213: [MFTF]
 AdminMediaGalleryCatalogUiUsedInProductFilterTest is flaky

---
 .../AdminDisableWYSIWYGActionGroup.xml        |  2 +-
 .../AdminEnableWYSIWYGActionGroup.xml         |  2 +-
 .../Cms/Test/Mftf/Data/WysiwygConfigData.xml  |  2 +-
 ...alleryFilterPlaceHolderGridActionGroup.xml |  2 +
 ...leryCatalogUiUsedInProductFilterOnTest.xml | 79 +++++++++++++++++++
 ...alleryCatalogUiUsedInProductFilterTest.xml |  7 +-
 ...nhancedMediaGalleryImageActionsSection.xml |  2 +-
 .../Test/Mftf/Suite/MediaGalleryUiSuite.xml   | 12 +--
 .../web/js/grid/filters/elements/ui-select.js |  4 +-
 9 files changed, 97 insertions(+), 15 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
index 7e035a47824ee..8407860959184 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
@@ -13,6 +13,6 @@
             <description>Runs bin/magento command to disable WYSIWYG</description>
         </annotations>
 
-        <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
+        <magentoCLI command="config:set {{WysiwygDisabledByDefault.path}} {{WysiwygDisabledByDefault.value}}" stepKey="disableWYSIWYG"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
index 6c9b439e2941b..58c219092d85e 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
@@ -13,6 +13,6 @@
             <description>Runs bin/magento command to enable WYSIWYG</description>
         </annotations>
 
-        <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
+        <magentoCLI command="config:set {{WysiwygEnabledByDefault.path}} {{WysiwygEnabledByDefault.value}}" stepKey="enableWYSIWYG"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
index ea5e90383511c..66f2983140b45 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
@@ -16,7 +16,7 @@
     <entity name="WysiwygDisabledByDefault">
         <data key="path">cms/wysiwyg/enabled</data>
         <data key="scope_id">0</data>
-        <data key="value">hidden</data>
+        <data key="value">disabled</data>
     </entity>
     <entity name="WysiwygTinyMCE3Enable" deprecated="Use WysiwygTinyMCE4Enable instead">
         <data key="path">cms/wysiwyg/editor</data>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
index e21fa89965391..32065da7bb1e7 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
@@ -15,6 +15,8 @@
             <argument name="filterPlaceholder" type="string"/>
         </arguments>
 
+        <waitForPageLoad stepKey="waitVisibleFilter"/>
+        <waitForElementVisible selector="{{AdminProductGridFilterSection.enabledFilters}}" stepKey="waitForRequest"/>
         <see selector="{{AdminProductGridFilterSection.enabledFilters}}" userInput="{{filterPlaceholder}}" stepKey="seeFilter"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml
new file mode 100644
index 0000000000000..32a07d6f6273f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryCatalogUiUsedInProductFilterOnTest">
+        <annotations>
+            <features value="MediaGalleryCatalogUi"/>
+            <stories value="Story 58 - User sees entities where asset is used in" />
+            <title value="User can open the product entity the asset is associated"/>
+            <description value="User filters assets used in products"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <magentoCLI command="config:set {{WysiwygEnabledByDefault.path}} {{WysiwygEnabledByDefault.value}}" stepKey="enableWYSIWYG"/>
+            <createData entity="SimpleProduct2" stepKey="createProduct"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <magentoCLI command="config:set {{WysiwygDisabledByDefault.path}} {{WysiwygDisabledByDefault.value}}" stepKey="disableWYSIWYG"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
+            <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
+
+            <actionGroup ref="AdminEnhancedMediaGalleryEnableMassActionModeActionGroup" stepKey="enableMassActionToDeleteImages"/>
+            <actionGroup ref="AdminEnhancedMediaGallerySelectImageForMassActionActionGroup" stepKey="selectFirstImageToDelete">
+                <argument name="imageName" value="{{ImageMetadata.title}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
+
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView2"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="goToProductEditPage">
+            <argument name="productId" value="$createProduct.id$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Used in Products"/>
+            <argument name="optionName" value="$createProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInProducts">
+            <argument name="entityName" value="Products"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnProductGrid"/>
+
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index a66009e9d2045..34d51f6533ef5 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest">
+    <test name="AdminMediaGalleryCatalogUiUsedInProductFilterTest" deprecated="Use AdminMediaGalleryCatalogUiUsedInProductFilterOnTest instead">
         <annotations>
             <features value="AdminMediaGalleryUsedInProductsFilter"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
-            <title value="User can open product entity the asset is associated"/>
+            <title value="Deprecated. User can open product entity the asset is associated"/>
             <stories value="Story 58: User sees entities where asset is used in" />
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
             <description value="User filters assets used in products"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryCatalogUiUsedInProductFilterOnTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
index f36fca88dc760..32282f4f5e8ca 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -10,7 +10,7 @@
     <section name="AdminEnhancedMediaGalleryImageActionsSection">
         <element name="openContextMenu" type="button" selector=".three-dots"/>
         <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
-        <element name="viewDetails" type="button" selector="[data-ui-id='action-image-details']"/>
+        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[text()='View Details']"/>
         <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
         <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
         <element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
index e81dc807d0f48..bda9b6ad08e43 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
@@ -11,16 +11,12 @@
     <suite name="MediaGalleryUiSuite">
         <before>
             <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableEnhancedMediaGallery">
-                <argument name="enabled" value="1"/>
-            </actionGroup>
-            <actionGroup ref="AdminMediaGalleryRenditionsEnableActionGroup" stepKey="enableMediaGalleryRenditions"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
+            <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/>
+            <magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/>
         </before>
         <after>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
+            <magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/>
+            <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/>
             <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" />
         </after>
         <include>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
index a913f3fa4a042..cddcc7d49ffe8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
@@ -18,13 +18,15 @@ define([
             loadedOption: [],
             validationLoading: true,
             imports: {
+                applied: '${ $.filterChipsProvider }:applied',
                 activeIndex: '${ $.bookmarkProvider }:activeIndex'
             },
             modules: {
                 filterChips: '${ $.filterChipsProvider }'
             },
             listens: {
-                activeIndex: 'validateInitialValue'
+                activeIndex: 'validateInitialValue',
+                applied: 'validateInitialValue'
             }
 
         },

From af0ba2b76e1015481d262eeabd83f2734a62c632 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Wed, 21 Oct 2020 15:32:40 +0300
Subject: [PATCH 607/671] MC-37891: Create automated test for "Delete Widget"

---
 .../Adminhtml/Widget/Instance/DeleteTest.php           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php
index 46ea322953278..eb4fe3dc3b7a9 100644
--- a/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Controller/Adminhtml/Widget/Instance/DeleteTest.php
@@ -10,6 +10,7 @@
 use Magento\Framework\App\Request\Http;
 use Magento\Framework\Message\MessageInterface;
 use Magento\TestFramework\TestCase\AbstractBackendController;
+use Magento\Widget\Model\ResourceModel\Widget\Instance\Collection;
 use Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory;
 
 /**
@@ -21,8 +22,8 @@
  */
 class DeleteTest extends AbstractBackendController
 {
-    /** @var CollectionFactory */
-    private $collectionFactory;
+    /** @var Collection */
+    private $widgetCollection;
 
     /**
      * @inheritdoc
@@ -31,7 +32,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->collectionFactory = $this->_objectManager->get(CollectionFactory::class);
+        $this->widgetCollection = $this->_objectManager->get(CollectionFactory::class)->create();
     }
 
     /**
@@ -41,8 +42,7 @@ protected function setUp(): void
      */
     public function testDeleteWidget(): void
     {
-        $widget = $this->collectionFactory->create()
-            ->addFieldToFilter('title', 'New Sample widget title')->getFirstItem();
+        $widget = $this->widgetCollection->addFieldToFilter('title', 'New Sample widget title')->getFirstItem();
         $this->assertNotNull($widget->getInstanceId());
         $this->getRequest()->setMethod(Http::METHOD_POST);
         $this->getRequest()->setParams(['instance_id' => $widget->getInstanceId()]);

From fd4a5a7cb63e2c712e03de61b820f92a47a33a2e Mon Sep 17 00:00:00 2001
From: Ejaz Alam <ejazalam518@gmail.com>
Date: Wed, 21 Oct 2020 18:23:14 +0500
Subject: [PATCH 608/671] Apply suggestions from code review

added scope for the const variable.

Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
---
 app/code/Magento/Quote/Model/Quote/Address.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 4773c5a391094..aee86eb1f8935 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -140,7 +140,7 @@ class Address extends AbstractAddress implements
 
     const ADDRESS_TYPE_SHIPPING = 'shipping';
     
-    const CACHED_ITEMS_ALL = 'cached_items_all';
+    private const CACHED_ITEMS_ALL = 'cached_items_all';
 
     /**
      * Prefix of model events

From f38bcc53503704ed39c7fcee506342ea7b61c0dc Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Wed, 21 Oct 2020 12:46:31 +0300
Subject: [PATCH 609/671] MC-37128: Create automated test for "[Security] No
 XSS injections in order comments"

MC-37128: Create automated test for "[Security] No XSS injections in order comments"
---
 ...with_address_and_shipping_method_saved.php | 26 +++++++++++++++++++
 ...ess_and_shipping_method_saved_rollback.php | 10 +++++++
 2 files changed, 36 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php
new file mode 100644
index 0000000000000..0f8e92e252057
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/quote_with_address_saved.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var CartRepositoryInterface $quoteRepository */
+$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
+/** @var CartManagementInterface $quoteManagement */
+$quoteManagement = $objectManager->get(CartManagementInterface::class);
+$quote = $objectManager->get(GetQuoteByReservedOrderId::class)->execute('test_order_1');
+$quote->setIsActive(true);
+$quote->getShippingAddress()->setShippingMethod('flatrate_flatrate');
+$quote->getShippingAddress()->setCollectShippingRates(true);
+$quote->getShippingAddress()->collectShippingRates();
+$quoteRepository->save($quote);
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved_rollback.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved_rollback.php
new file mode 100644
index 0000000000000..919958d9cbcf4
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved_rollback.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Checkout/_files/quote_with_address_saved_rollback.php');

From 23df632a70ed050b709cf8f25d8a047ae4e69faa Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 21 Oct 2020 22:21:47 -0500
Subject: [PATCH 610/671] 29251 test web-api test fix

---
 .../etc/graphql/di.xml                        |  6 +-
 .../Model/Cart/AddSimpleProductToCart.php     | 70 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
index ace37b54a2bf6..dc672b02e2f96 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -48,7 +48,7 @@
         <plugin name="used_products_cache_graphql" type="Magento\ConfigurableProduct\Model\Plugin\Frontend\UsedProductsCache" />
     </type>
 
-<!--    <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">-->
-<!--        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder_GraphQl" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>-->
-<!--    </type>-->
+    <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
+        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder_GraphQl" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
+    </type>
 </config>
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 83c1d03f132db..4b76a1ea5bd15 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -9,11 +9,13 @@
 
 use Exception;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder;
+use Magento\CatalogInventory\Api\StockStateInterface;
 
 /**
  * Add simple product to cart
@@ -30,16 +32,24 @@ class AddSimpleProductToCart
      */
     private $buyRequestBuilder;
 
+    /**
+     * @var StockStateInterface
+     */
+    private $stockState;
+
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param BuyRequestBuilder $buyRequestBuilder
+     * @param StockStateInterface $stockState
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
-        BuyRequestBuilder $buyRequestBuilder
+        BuyRequestBuilder $buyRequestBuilder,
+        StockStateInterface $stockState
     ) {
         $this->productRepository = $productRepository;
         $this->buyRequestBuilder = $buyRequestBuilder;
+        $this->stockState = $stockState;
     }
 
     /**
@@ -53,15 +63,40 @@ public function __construct(
     public function execute(Quote $cart, array $cartItemData): void
     {
         $sku = $this->extractSku($cartItemData);
-
+        $childSku = $this->extractChildSku($cartItemData);
+        $childSkuQty = $this->extractChildSkuQuantity($cartItemData);
         try {
             $product = $this->productRepository->get($sku, false, null, true);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
         }
 
+        if ($childSku) {
+            $childProduct = $this->productRepository->get($childSku, false, null, true);
+
+            $result = $this->stockState->checkQuoteItemQty(
+                $childProduct->getId(), $childSkuQty, $childSkuQty, $childSkuQty, $cart->getStoreId()
+            );
+
+            if ($result->getHasError() ) {
+                throw new GraphQlInputException(
+                    __(
+                        'Could not add the product with SKU %sku to the shopping cart: %message',
+                        ['sku' => $childSku, 'message' => __($result->getMessage())]
+                    )
+                );
+            }
+        }
+
         try {
-            $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
+           $buyRequest = $this->buyRequestBuilder->build($cartItemData);
+           // Some options might be disabled and not available
+           if (empty($buyRequest['super_attribute'])) {
+               throw new LocalizedException(
+                   __('The product with SKU %sku is out of stock.', ['sku' => $childSku])
+               );
+           }
+           $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
         } catch (Exception $e) {
             throw new GraphQlInputException(
                 __(
@@ -99,4 +134,33 @@ private function extractSku(array $cartItemData): string
         }
         return (string)$cartItemData['data']['sku'];
     }
+
+    /**
+     * Extract option child SKU from cart item data
+     *
+     * @param array $cartItemData
+     * @return string
+     * @throws GraphQlInputException
+     */
+    private function extractChildSku(array $cartItemData): ?string
+    {
+        if (isset($cartItemData['data']['sku'])) {
+            return (string)$cartItemData['data']['sku'];
+        }
+    }
+
+    /**
+     * Extract option child SKU from cart item data
+     *
+     * @param array $cartItemData
+     * @return string
+     * @throws GraphQlInputException
+     */
+    private function extractChildSkuQuantity(array $cartItemData): ?string
+    {
+        if (empty($cartItemData['data']['quantity'])) {
+            throw new GraphQlInputException(__('Missed "quantity" in cart item data'));
+        }
+        return (string)$cartItemData['data']['quantity'];
+    }
 }

From 2e4e937b00dfd3fb06a83b3dcd9b92a69edb3f95 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Thu, 22 Oct 2020 09:21:11 +0300
Subject: [PATCH 611/671] MC-36964: Create automated test for "[Elasticsearch]
 Search by multiple attributes"

---
 .../Block/Navigation/AbstractFiltersTest.php  |  23 ++-
 .../Navigation/Category/FilterScopeTest.php   |   3 +-
 .../Category/MultipleFiltersTest.php          | 187 ++++++++++++++++++
 .../Navigation/Search/MultipleFiltersTest.php |  58 ++++++
 4 files changed, 263 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultipleFiltersTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/MultipleFiltersTest.php

diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php
index df542dd622864..608e6c9b53cef 100644
--- a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php
@@ -91,7 +91,10 @@ abstract protected function getLayerType(): string;
      *
      * @return string
      */
-    abstract protected function getAttributeCode(): string;
+    protected function getAttributeCode(): string
+    {
+        return '';
+    }
 
     /**
      * Tests getFilters method from navigation block on category page.
@@ -108,7 +111,7 @@ protected function getCategoryFiltersAndAssert(
         array $expectation,
         string $categoryName
     ): void {
-        $this->updateAttribute($attributeData);
+        $this->updateAttribute($attributeData, $this->getAttributeCode());
         $this->updateProducts($products, $this->getAttributeCode());
         $this->clearInstanceAndReindexSearch();
         $category = $this->loadCategory($categoryName, Store::DEFAULT_STORE_ID);
@@ -141,7 +144,10 @@ protected function getCategoryActiveFiltersAndAssert(
         string $filterValue,
         int $productsCount
     ): void {
-        $this->updateAttribute(['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS]);
+        $this->updateAttribute(
+            ['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS],
+            $this->getAttributeCode()
+        );
         $this->updateProducts($products, $this->getAttributeCode());
         $this->clearInstanceAndReindexSearch();
         $this->navigationBlock->getRequest()->setParams($this->getRequestParams($filterValue));
@@ -169,7 +175,7 @@ protected function getSearchFiltersAndAssert(
         array $attributeData,
         array $expectation
     ): void {
-        $this->updateAttribute($attributeData);
+        $this->updateAttribute($attributeData, $this->getAttributeCode());
         $this->updateProducts($products, $this->getAttributeCode());
         $this->clearInstanceAndReindexSearch();
         $this->navigationBlock->getRequest()->setParams(['q' => $this->getSearchString()]);
@@ -200,7 +206,8 @@ protected function getSearchActiveFiltersAndAssert(
         int $productsCount
     ): void {
         $this->updateAttribute(
-            ['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS, 'is_filterable_in_search' => 1]
+            ['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS, 'is_filterable_in_search' => 1],
+            $this->getAttributeCode()
         );
         $this->updateProducts($products, $this->getAttributeCode());
         $this->clearInstanceAndReindexSearch();
@@ -239,12 +246,14 @@ function (AbstractFilter $filter) use ($code) {
      * Updates attribute data.
      *
      * @param array $data
+     * @param string $attributeCode
      * @return void
      */
     protected function updateAttribute(
-        array $data
+        array $data,
+        string $attributeCode
     ): void {
-        $attribute = $this->attributeRepository->get($this->getAttributeCode());
+        $attribute = $this->attributeRepository->get($attributeCode);
         $attribute->setDataChanges(false);
         $attribute->addData($data);
 
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/FilterScopeTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/FilterScopeTest.php
index 288128b04669c..266f8735fe48d 100644
--- a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/FilterScopeTest.php
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/FilterScopeTest.php
@@ -63,7 +63,8 @@ public function testGetFilters(int $scope, array $products, array $expectation):
             [
                 'is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS,
                 'is_global' => $scope,
-            ]
+            ],
+            $this->getAttributeCode()
         );
         $this->updateProductsOnStore($products);
         $this->clearInstanceAndReindexSearch();
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultipleFiltersTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultipleFiltersTest.php
new file mode 100644
index 0000000000000..299be3f3c3e88
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultipleFiltersTest.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Category;
+
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\LayeredNavigation\Block\Navigation\AbstractFiltersTest;
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+use Magento\Store\Model\Store;
+
+/**
+ * Provides tests for multiple custom select filters in navigation block on category page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class MultipleFiltersTest extends AbstractFiltersTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_dropdown_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/configurable_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_three_products.php
+     * @dataProvider getMultipleActiveFiltersDataProvider
+     * @param array $products
+     * @param array $filters
+     * @param array $expectedProducts
+     * @return void
+     */
+    public function testGetMultipleActiveFilters(
+        array $products,
+        array $filters,
+        array $expectedProducts
+    ): void {
+        $this->updateAttributesAndProducts(
+            $products,
+            ['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS]
+        );
+        $this->clearInstanceAndReindexSearch();
+        $this->navigationBlock->getRequest()->setParams($this->getMultipleRequestParams($filters));
+        $this->navigationBlock->getLayer()->setCurrentCategory(
+            $this->loadCategory('Category 999', Store::DEFAULT_STORE_ID)
+        );
+        $this->navigationBlock->setLayout($this->layout);
+        $resultProducts = $this->getProductSkus($this->navigationBlock->getLayer()->getProductCollection());
+        $this->assertEquals($expectedProducts, $resultProducts);
+    }
+
+    /**
+     * @return array
+     */
+    public function getMultipleActiveFiltersDataProvider(): array
+    {
+        return [
+            'without_filters' => [
+                'products_data' => [
+                    'test_configurable' => [
+                        'simple1000' => 'Option 1',
+                        'simple1001' => 'Option 2',
+                        'simple1002' => 'Option 2',
+                    ],
+                    'dropdown_attribute' => [
+                        'simple1000' => 'Option 1',
+                        'simple1001' => 'Option 2',
+                        'simple1002' => 'Option 3',
+                    ],
+                ],
+                'filters' => [],
+                'expected_products' => ['simple1000', 'simple1001', 'simple1002'],
+            ],
+            'applied_first_option_in_both_filters' => [
+                'products_data' => [
+                    'test_configurable' => [
+                        'simple1000' => 'Option 1',
+                        'simple1001' => 'Option 1',
+                        'simple1002' => 'Option 2',
+                    ],
+                    'dropdown_attribute' => [
+                        'simple1000' => 'Option 1',
+                        'simple1001' => 'Option 1',
+                        'simple1002' => 'Option 3',
+                    ],
+                ],
+                'filters' => ['test_configurable' => 'Option 1', 'dropdown_attribute' => 'Option 1'],
+                'expected_products' => ['simple1000', 'simple1001'],
+            ],
+            'applied_mixed_options_in_filters' => [
+                'products_data' => [
+                    'test_configurable' => [
+                        'simple1000' => 'Option 1',
+                        'simple1001' => 'Option 2',
+                        'simple1002' => 'Option 2',
+                    ],
+                    'dropdown_attribute' => [
+                        'simple1000' => 'Option 1',
+                        'simple1001' => 'Option 2',
+                        'simple1002' => 'Option 3',
+                    ],
+                ],
+                'filters' => ['test_configurable' => 'Option 2', 'dropdown_attribute' => 'Option 3'],
+                'expected_products' => ['simple1002'],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getLayerType(): string
+    {
+        return Resolver::CATALOG_LAYER_CATEGORY;
+    }
+
+    /**
+     * Updates products and product attribute.
+     *
+     * @param array $productsData
+     * @param array $attributesData
+     * @return void
+     */
+    protected function updateAttributesAndProducts(array $productsData, array $attributesData): void
+    {
+        $products = [];
+        foreach ($productsData as $attributeCode => $data) {
+            $this->updateAttribute($attributesData, $attributeCode);
+            $attribute = $this->attributeRepository->get($attributeCode);
+
+            foreach ($data as $productSku => $stringValue) {
+                if (empty($products[$productSku])) {
+                    $product = $this->productRepository->get($productSku, false, Store::DEFAULT_STORE_ID, true);
+                    $products[$productSku] = $product;
+                } else {
+                    $product = $products[$productSku];
+                }
+                $productValue = $attribute->usesSource()
+                    ? $attribute->getSource()->getOptionId($stringValue)
+                    : $stringValue;
+                $product->addData([$attribute->getAttributeCode() => $productValue]);
+            }
+        }
+        foreach ($products as $product) {
+            $this->productRepository->save($product);
+        }
+    }
+
+    /**
+     * Returns array with multiple filters.
+     *
+     * @param array $filters
+     * @return array
+     */
+    protected function getMultipleRequestParams(array $filters): array
+    {
+        $params = [];
+        foreach ($filters as $attributeCode => $filterValue) {
+            $attribute = $this->attributeRepository->get($attributeCode);
+            $filterValue = $attribute->usesSource()
+                ? $attribute->getSource()->getOptionId($filterValue)
+                : $filterValue;
+
+            $params[$attributeCode] = $filterValue;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Returns list of product skus from given collection.
+     *
+     * @param Collection $getProductCollection
+     * @return array
+     */
+    protected function getProductSkus(Collection $getProductCollection): array
+    {
+        $skus = [];
+        foreach ($getProductCollection as $product) {
+            $skus[] = $product->getSku();
+        }
+
+        return $skus;
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/MultipleFiltersTest.php b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/MultipleFiltersTest.php
new file mode 100644
index 0000000000000..d0943b333e1ac
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/MultipleFiltersTest.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\LayeredNavigation\Block\Navigation\Search;
+
+use Magento\Catalog\Model\Layer\Resolver;
+use Magento\LayeredNavigation\Block\Navigation\Category\MultipleFiltersTest as CategoryFilterTest;
+use Magento\Catalog\Model\Layer\Filter\AbstractFilter;
+
+/**
+ * Provides tests for multiple custom select filters in navigation block on search page.
+ *
+ * @magentoAppArea frontend
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ */
+class MultipleFiltersTest extends CategoryFilterTest
+{
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_dropdown_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/configurable_attribute.php
+     * @magentoDataFixture Magento/Catalog/_files/category_with_three_products.php
+     * @dataProvider getMultipleActiveFiltersDataProvider
+     * @param array $products
+     * @param array $filters
+     * @param array $expectedProducts
+     * @return void
+     */
+    public function testGetMultipleActiveFilters(
+        array $products,
+        array $filters,
+        array $expectedProducts
+    ): void {
+        $this->updateAttributesAndProducts(
+            $products,
+            ['is_filterable' => AbstractFilter::ATTRIBUTE_OPTIONS_ONLY_WITH_RESULTS, 'is_filterable_in_search' => 1]
+        );
+        $this->clearInstanceAndReindexSearch();
+        $this->navigationBlock->getRequest()->setParams(
+            array_merge($this->getMultipleRequestParams($filters), ['q' => $this->getSearchString()])
+        );
+        $this->navigationBlock->setLayout($this->layout);
+        $resultProducts = $this->getProductSkus($this->navigationBlock->getLayer()->getProductCollection());
+        $this->assertEquals($expectedProducts, $resultProducts);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getLayerType(): string
+    {
+        return Resolver::CATALOG_LAYER_SEARCH;
+    }
+}

From 59b7ba8a5845ea8964d62e1ed9c28d18fc5925a9 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 22 Oct 2020 10:56:30 +0300
Subject: [PATCH 612/671] MC-38589: [MFTF]
 AdminEnhancedMediaGalleryVerifyAssetFilterTest failed because of bad design

---
 .../TinyMCESection/MediaGallerySection.xml    |  1 +
 ...ediaGalleryDeletedAllImagesActionGroup.xml | 30 ++++++++
 ...ediaGalleryClickAddSelectedActionGroup.xml |  6 +-
 ...ediaGalleryFromTinyMce4IconActionGroup.xml |  4 +-
 .../Test/Mftf/Helper/MediaGalleryUiHelper.php | 77 +++++++++++++++++++
 ...nEnhancedMediaGalleryMassActionSection.xml |  1 +
 .../Section/AdminMediaGalleryGridSection.xml  |  2 +-
 .../AdminMediaGalleryMessagesSection.xml      | 13 ++++
 ...ancedMediaGalleryVerifyAssetFilterTest.xml |  7 +-
 ...cedMediaGalleryVerifyFilterByAssetTest.xml | 75 ++++++++++++++++++
 10 files changed, 208 insertions(+), 8 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
index 725d050554f2d..212035fbc575a 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
@@ -36,5 +36,6 @@
         <element name="checkIfWysiwygArrowExpand" type="button" selector="//li[@id='d3lzaXd5Zw--' and contains(@class,'jstree-closed')]"/>
         <element name="confirmDelete" type="button" selector=".action-primary.action-accept"/>
         <element name="imageBlockByName" type="block" selector="//div[@data-row='file'][contains(., '{{imageName}}')]" parameterized="true"/>
+        <element name="insertEditImageModalWindow" type="block" selector=".mce-floatpanel.mce-window[aria-label='Insert/edit image']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
new file mode 100644
index 0000000000000..f77521879c8ea
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup">
+        <annotations>
+            <description>Open Media Gallery page and delete all images</description>
+        </annotations>
+
+        <amOnPage url="{{AdminStandaloneMediaGalleryPage.url}}" stepKey="openMediaGalleryPage"/>
+        <!-- It sometimes is loading too long for default 10s -->
+        <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <helper class="\Magento\MediaGalleryUi\Test\Mftf\Helper\MediaGalleryUiHelper" method="deleteAllImagesUsingMassAction" stepKey="deleteAllImagesUsingMassAction">
+            <argument name="emptyRow">{{AdminMediaGalleryGridSection.noDataMessage}}</argument>
+            <argument name="deleteImagesButton">{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}</argument>
+            <argument name="checkImage">{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckboxAll}}</argument>
+            <argument name="deleteSelectedButton">{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}</argument>
+            <argument name="modalAcceptButton">{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}</argument>
+            <argument name="successMessageContainer">{{AdminMediaGalleryMessagesSection.success}}</argument>
+            <argument name="successMessage">been successfully deleted</argument>
+        </helper>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
index 45ab4dc4538e0..f575e346a8ca0 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
@@ -10,8 +10,8 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminMediaGalleryClickAddSelectedActionGroup">
         <waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="waitForAddSelectedButton"/>
-        <click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="ClickAddSelected"/>
-        <wait time="5" stepKey="waitForImageToBeAdded"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear"/>
+        <click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="clickAddSelected"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElementVisible selector="{{MediaGallerySection.insertEditImageModalWindow}}" stepKey="waitForInsertEditImageWindow"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml
index 3143b4ff24fb4..e4fb6aec5c152 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromTinyMce4IconActionGroup.xml
@@ -11,8 +11,8 @@
         <annotations>
             <description>Opens Enhanced MediaGallery from category page  by tyniMce4 image icon</description>
         </annotations>
-        
-        <click selector="{{AdminCategoryContentSection.sectionHeader}}" stepKey="clickExpandContent"/>
+
+        <conditionalClick selector="{{AdminCategoryContentSection.sectionHeader}}" dependentSelector="{{AdminCategoryContentSection.uploadButton}}" visible="false" stepKey="clickExpandContent"/>
         <waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
         <click selector="{{TinyMCESection.InsertImageIcon}}" stepKey="clickInsertImageIcon" />
         <waitForPageLoad stepKey="waitForPageLoad" />
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
new file mode 100644
index 0000000000000..4059a8460bb51
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver as FacebookWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\WebDriverBy;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
+
+/**
+ * Class for MFTF helpers for MediaGalleryUi module.
+ */
+class MediaGalleryUiHelper extends Helper
+{
+    /**
+     * Delete all images using mass action.
+     *
+     * @param string $emptyRow
+     * @param string $deleteImagesButton
+     * @param string $checkImage
+     * @param string $deleteSelectedButton
+     * @param string $modalAcceptButton
+     * @param string $successMessageContainer
+     * @param string $successMessage
+     *
+     * @return void
+     */
+    public function deleteAllImagesUsingMassAction(
+        string $emptyRow,
+        string $deleteImagesButton,
+        string $checkImage,
+        string $deleteSelectedButton,
+        string $modalAcceptButton,
+        string $successMessageContainer,
+        string $successMessage
+    ): void {
+        try {
+            /** @var MagentoWebDriver $webDriver */
+            $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+            /** @var FacebookWebDriver $webDriver */
+            $webDriver = $magentoWebDriver->webDriver;
+            $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+            while (empty($rows)) {
+                $magentoWebDriver->click($deleteImagesButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($deleteSelectedButton, 10);
+
+                // Check all images
+                /** @var RemoteWebElement[] $images */
+                $imagesCheckboxes = $webDriver->findElements(WebDriverBy::cssSelector($checkImage));
+                /** @var RemoteWebElement $image */
+                foreach ($imagesCheckboxes as $imageCheckbox) {
+                    $imageCheckbox->click();
+                }
+
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->click($deleteSelectedButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+                $magentoWebDriver->click($modalAcceptButton);
+                $magentoWebDriver->waitForPageLoad(60);
+                $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+                $magentoWebDriver->see($successMessage, $successMessageContainer);
+
+                $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+            }
+        } catch (\Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index 07f2dc23530e1..9018ccb4ddd69 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -13,5 +13,6 @@
         <element name="cancelMassActionMode" type="button" selector="#cancel_massaction"/>
         <element name="deleteImages" type="button" selector="#delete_massaction"/>
         <element name="deleteSelected" type="button" selector="#delete_selected_massaction"/>
+        <element name="massActionCheckboxAll" type="checkbox" selector="[data-id='media-gallery-masonry-grid'] .mediagallery-massaction-checkbox input[type='checkbox']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryGridSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryGridSection.xml
index f35a32b6d3a37..08be2e61a9d14 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryGridSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryGridSection.xml
@@ -8,7 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminMediaGalleryGridSection">
-        <element name="noDataMessage" type="text" selector="div.no-data-message-container"/>
+        <element name="noDataMessage" type="text" selector="[data-id='media-gallery-masonry-grid'] .no-data-message-container"/>
         <element name="nthImageInGrid" type="text" selector="div[class='masonry-image-column'][data-repeat-index='{{row}}'] img" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
new file mode 100644
index 0000000000000..42a936b6c0ebc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMediaGalleryMessagesSection">
+        <element name="success" type="text" selector=".media-gallery-container ul.messages div.message.message-success span"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
index 9a08f7cd0bb9c..847cc398d489d 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyAssetFilterTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminEnhancedMediaGalleryVerifyAssetFilterTest">
+    <test name="AdminEnhancedMediaGalleryVerifyAssetFilterTest" deprecated="Use AdminEnhancedMediaGalleryVerifyFilterByAssetTest instead">
         <annotations>
             <features value="MediaGallery"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1292"/>
-            <title value="User sees entities where asset is used in"/>
+            <title value="DEPRECATED. User sees entities where asset is used in"/>
             <stories value="Story 58: User sees entities where asset is used in"/>
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951024"/>
             <description value="User sees entities where asset is used in"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminEnhancedMediaGalleryVerifyFilterByAssetTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleSubCategory" stepKey="category"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
new file mode 100644
index 0000000000000..24259edbfe669
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminEnhancedMediaGalleryVerifyFilterByAssetTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <stories value="Story 58: User sees entities where asset is used in"/>
+            <title value="User sees entities where asset is used in"/>
+            <description value="User sees entities where asset is used in"/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951024"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1292"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="EnabledWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disableWYSIWYG"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
+
+            <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="GoToAdminCategoryPageByIdActionGroup" stepKey="openCategoryPage">
+            <argument name="id" value="$category.id$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadFirstIMage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadSecondImage">
+            <argument name="image" value="ImageUpload_1"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectCategoryImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminMediaGalleryClickOkButtonTinyMce4ActionGroup" stepKey="clickOkButton"/>
+        <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
+
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
+            <argument name="filterName" value="Asset"/>
+            <argument name="optionName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
+            <argument name="numberOfRecords" value="1 records found"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn"/>
+        <actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryInGrid">
+            <argument name="category" value="$category$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
+    </test>
+</tests>

From 64322e6e61de7c2733b98ef9e888de9727557987 Mon Sep 17 00:00:00 2001
From: IvanPletnyov <ivan.pletnyov@transoftgroup.com>
Date: Thu, 22 Oct 2020 12:16:16 +0300
Subject: [PATCH 613/671] MC-37544: Create automated test for "Category
 Schedule Design Update not available if CatalogStaging installed"

---
 .../AdminCategoryOpenDesignSectionActionGroup.xml | 15 +++++++++++++++
 ...OpenScheduleDesignUpdateSectionActionGroup.xml | 15 +++++++++++++++
 .../AdminCategoryScheduleDesignUpdateSection.xml  |  2 +-
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenDesignSectionActionGroup.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenScheduleDesignUpdateSectionActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenDesignSectionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenDesignSectionActionGroup.xml
new file mode 100644
index 0000000000000..7fd42fd4925e1
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenDesignSectionActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="AdminCategoryOpenDesignSectionActionGroup">
+        <waitForElementVisible selector="{{CategoryDesignSection.DesignTab}}" stepKey="waitForDesignSection"/>
+        <conditionalClick selector="{{CategoryDesignSection.DesignTab}}" dependentSelector="{{CategoryDesignSection.LayoutDropdown}}" visible="false" stepKey="openDesignSection"/>
+        <waitForPageLoad stepKey="waitForDesignSectionLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenScheduleDesignUpdateSectionActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenScheduleDesignUpdateSectionActionGroup.xml
new file mode 100644
index 0000000000000..e0606d159e357
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminCategoryOpenScheduleDesignUpdateSectionActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="AdminCategoryOpenScheduleDesignUpdateSectionActionGroup">
+        <waitForElementVisible selector="{{AdminCategoryScheduleDesignUpdateSection.sectionHeader}}" stepKey="waitForScheduleDesignUpdateSection"/>
+        <conditionalClick selector="{{AdminCategoryScheduleDesignUpdateSection.sectionHeader}}" dependentSelector="{{AdminCategoryScheduleDesignUpdateSection.customDesignFrom}}" visible="false" stepKey="openScheduleDesignUpdateSection"/>
+        <waitForPageLoad stepKey="waitForScheduleDesignUpdateSectionLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
index fb231cf56b200..9d9a7f204544d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/AdminCategoryScheduleDesignUpdateSection.xml
@@ -10,6 +10,6 @@
     <section name="AdminCategoryScheduleDesignUpdateSection">
         <element name="sectionHeader" type="button" selector="div[data-index='schedule_design_update'] .fieldset-wrapper-title" timeout="30"/>
         <element name="sectionBody" type="text" selector="div[data-index='schedule_design_update'] .admin__fieldset-wrapper-content"/>
-        <element name="customDesignFrom" type="input" selector="input[name='custom_design_from']"/>
+        <element name="customDesignFrom" type="input" selector="div[data-index='schedule_design_update'] input[name='custom_design_from']"/>
     </section>
 </sections>

From 8a091cc5ac9f654751fa7495abae33b26ea75e6d Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 22 Oct 2020 12:18:33 +0300
Subject: [PATCH 614/671] MC-34156: Cannot save product in store view scope
 without Magento_Catalog::edit_product_design ACL

---
 .../Initialization/Helper/AttributeFilter.php |   2 +-
 .../Model/Product/AuthorizationTest.php       | 170 ++++++++++++++++++
 2 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php

diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
index 49165c85f85d7..1d6939acacfd0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php
@@ -80,7 +80,7 @@ private function prepareDefaultData(array $attributeList, string $attributeCode,
             // For non-numeric types set the attributeValue to 'false' to trigger their removal from the db
             if ($attributeType === 'varchar' || $attributeType === 'text' || $attributeType === 'datetime') {
                 $attribute->setIsRequired(false);
-                $productData[$attributeCode] = false;
+                $productData[$attributeCode] = $attribute->getDefaultValue() ?: false;
             } else {
                 $productData[$attributeCode] = null;
             }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php
new file mode 100644
index 0000000000000..80de1b3a19270
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\Product;
+
+use Laminas\Stdlib\Parameters;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
+use Magento\Catalog\Model\Product;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\AuthorizationException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Verify additional authorization for product operations
+ */
+class AuthorizationTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Helper
+     */
+    private $initializationHelper;
+
+    /**
+     * @var HttpRequest
+     */
+    private $request;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @inheridoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->initializationHelper = $this->objectManager->get(Helper::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->request = $this->objectManager->get(HttpRequest::class);
+    }
+
+    /**
+     * Verify AuthorizedSavingOf
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @param array $data
+     *
+     * @dataProvider postRequestData
+     */
+    public function testAuthorizedSavingOf(array $data): void
+    {
+        $this->request->setPost(new Parameters($data));
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        $product = $this->initializationHelper->initialize($product);
+        $this->assertEquals('simple_new', $product->getName());
+        $this->assertEquals(
+            'container2',
+            $product->getCustomAttribute('options_container')->getValue()
+        );
+    }
+
+    /**
+     * @return array
+     */
+    public function postRequestData(): array
+    {
+        return [
+            [
+                [
+                    'product' => [
+                        'name' => 'simple_new',
+                        'custom_design' => '',
+                        'page_layout' => '',
+                        'options_container' => 'container2',
+                        'custom_layout_update' => '',
+                        'custom_design_from' => '',
+                        'custom_design_to' => '',
+                        'custom_layout_update_file' => '',
+                    ],
+                    'use_default' => [
+                        'custom_design' => '1',
+                        'page_layout' => '1',
+                        'options_container' => '1',
+                        'custom_layout' => '1',
+                        'custom_design_from' => '1',
+                        'custom_design_to' => '1',
+                        'custom_layout_update_file' => '1',
+                    ],
+                ]
+            ],
+            [
+                [
+                    'product' => [
+                        'name' => 'simple_new',
+                        'page_layout' => '',
+                        'options_container' => 'container2',
+                        'custom_design' => '',
+                        'custom_design_from' => '',
+                        'custom_design_to' => '',
+                        'custom_layout' => '',
+                        'custom_layout_update_file' => '__no_update__',
+                    ],
+                    'use_default' => null,
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * Verify AuthorizedSavingOf when change design attributes
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @param array $data
+     *
+     * @dataProvider postRequestDataException
+     * @throws AuthorizationException
+     */
+    public function testAuthorizedSavingOfWithException(array $data): void
+    {
+        $this->expectException(AuthorizationException::class);
+        $this->expectErrorMessage('Not allowed to edit the product\'s design attributes');
+        $this->request->setPost(new Parameters($data));
+
+        /** @var Product $product */
+        $product = $this->productRepository->get('simple');
+
+        $this->initializationHelper->initialize($product);
+    }
+
+    /**
+     * @return array
+     */
+    public function postRequestDataException(): array
+    {
+        return [
+            [
+                [
+                    'product' => [
+                        'name' => 'simple_new',
+                        'page_layout' => '1column',
+                        'options_container' => 'container2',
+                        'custom_design' => '',
+                        'custom_design_from' => '',
+                        'custom_design_to' => '',
+                        'custom_layout' => '',
+                        'custom_layout_update_file' => '__no_update__',
+                    ],
+                    'use_default' => null,
+                ],
+            ],
+        ];
+    }
+}

From e113cd980c0567ded9e1db5cae5e2ac397ffd4dc Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Thu, 22 Oct 2020 15:10:25 +0300
Subject: [PATCH 615/671] MC-38433: CSV import ignores "dropdown" and
 "textarea" for additional attributes

---
 .../Import/Product/Type/AbstractType.php      |   1 +
 .../Import/Product/Type/AbstractTypeTest.php  | 162 +++++++++++-------
 2 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 6571b16c87565..bd17cfd2cd7f1 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -533,6 +533,7 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
             if ($attrParams['is_static']) {
                 continue;
             }
+            $attrCode = mb_strtolower($attrCode);
             if (isset($rowData[$attrCode]) && strlen(trim($rowData[$attrCode]))) {
                 if (in_array($attrParams['type'], ['select', 'boolean'])) {
                     $resultAttrs[$attrCode] = $attrParams['options'][strtolower($rowData[$attrCode])];
diff --git a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
index 08915fb31a8aa..9453075f99e7c 100644
--- a/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
+++ b/app/code/Magento/CatalogImportExport/Test/Unit/Model/Import/Product/Type/AbstractTypeTest.php
@@ -6,6 +6,7 @@
  */
 namespace Magento\CatalogImportExport\Test\Unit\Model\Import\Product\Type;
 
+use Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory as AttributeCollectionFactory;
 use Magento\CatalogImportExport\Model\Import\Product;
 use Magento\CatalogImportExport\Model\Import\Product\RowValidatorInterface;
 use Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType as AbstractType;
@@ -13,6 +14,7 @@
 use Magento\Eav\Model\Entity\Attribute;
 use Magento\Eav\Model\Entity\Attribute\Set;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory as AttributeSetCollectionFactory;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
@@ -68,12 +70,12 @@ protected function setUp(): void
     {
         $this->entityModel = $this->createMock(Product::class);
         $attrSetColFactory = $this->createPartialMock(
-            \Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\CollectionFactory::class,
+            AttributeSetCollectionFactory::class,
             ['create']
         );
         $attrSetCollection = $this->createMock(Collection::class);
         $attrColFactory = $this->createPartialMock(
-            \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory::class,
+            AttributeCollectionFactory::class,
             ['create']
         );
         $attributeSet = $this->createMock(Set::class);
@@ -100,14 +102,22 @@ protected function setUp(): void
             )
             ->disableOriginalConstructor()
             ->getMock();
-        $attribute->expects($this->any())->method('getIsVisible')->willReturn(true);
-        $attribute->expects($this->any())->method('getIsGlobal')->willReturn(true);
-        $attribute->expects($this->any())->method('getIsRequired')->willReturn(true);
-        $attribute->expects($this->any())->method('getIsUnique')->willReturn(true);
-        $attribute->expects($this->any())->method('getFrontendLabel')->willReturn('frontend_label');
-        $attribute->expects($this->any())->method('getApplyTo')->willReturn(['simple']);
-        $attribute->expects($this->any())->method('getDefaultValue')->willReturn('default_value');
-        $attribute->expects($this->any())->method('usesSource')->willReturn(true);
+        $attribute->method('getIsVisible')
+            ->willReturn(true);
+        $attribute->method('getIsGlobal')
+            ->willReturn(true);
+        $attribute->method('getIsRequired')
+            ->willReturn(true);
+        $attribute->method('getIsUnique')
+            ->willReturn(true);
+        $attribute->method('getFrontendLabel')
+            ->willReturn('frontend_label');
+        $attribute->method('getApplyTo')
+            ->willReturn(['simple']);
+        $attribute->method('getDefaultValue')
+            ->willReturn('default_value');
+        $attribute->method('usesSource')
+            ->willReturn(true);
 
         $entityAttributes = [
             [
@@ -123,38 +133,54 @@ protected function setUp(): void
         $attribute2 = clone $attribute;
         $attribute3 = clone $attribute;
 
-        $attribute1->expects($this->any())->method('getId')->willReturn('1');
-        $attribute1->expects($this->any())->method('getAttributeCode')->willReturn('attr_code');
-        $attribute1->expects($this->any())->method('getFrontendInput')->willReturn('multiselect');
-        $attribute1->expects($this->any())->method('isStatic')->willReturn(true);
-
-        $attribute2->expects($this->any())->method('getId')->willReturn('2');
-        $attribute2->expects($this->any())->method('getAttributeCode')->willReturn('boolean_attribute');
-        $attribute2->expects($this->any())->method('getFrontendInput')->willReturn('boolean');
-        $attribute2->expects($this->any())->method('isStatic')->willReturn(false);
-
-        $attribute3->expects($this->any())->method('getId')->willReturn('3');
-        $attribute3->expects($this->any())->method('getAttributeCode')->willReturn('text_attribute');
-        $attribute3->expects($this->any())->method('getFrontendInput')->willReturn('text');
-        $attribute3->expects($this->any())->method('isStatic')->willReturn(false);
-
-        $this->entityModel->expects($this->any())->method('getEntityTypeId')->willReturn(3);
-        $this->entityModel->expects($this->any())->method('getAttributeOptions')->willReturnOnConsecutiveCalls(
-            ['option1', 'option2'],
-            ['yes' => 1, 'no' => 0]
-        );
-        $attrSetColFactory->expects($this->any())->method('create')->willReturn($attrSetCollection);
-        $attrSetCollection->expects($this->any())->method('setEntityTypeFilter')->willReturn([$attributeSet]);
-        $attrColFactory->expects($this->any())->method('create')->willReturn($attrCollection);
-        $attrCollection->expects($this->any())
-            ->method('setAttributeSetFilter')
+        $attribute1->method('getId')
+            ->willReturn('1');
+        $attribute1->method('getAttributeCode')
+            ->willReturn('attr_code');
+        $attribute1->method('getFrontendInput')
+            ->willReturn('multiselect');
+        $attribute1->method('isStatic')
+            ->willReturn(true);
+
+        $attribute2->method('getId')
+            ->willReturn('2');
+        $attribute2->method('getAttributeCode')
+            ->willReturn('boolean_attribute');
+        $attribute2->method('getFrontendInput')
+            ->willReturn('boolean');
+        $attribute2->method('isStatic')
+            ->willReturn(false);
+
+        $attribute3->method('getId')
+            ->willReturn('3');
+        $attribute3->method('getAttributeCode')
+            ->willReturn('Text_attribute');
+        $attribute3->method('getFrontendInput')
+            ->willReturn('text');
+        $attribute3->method('isStatic')
+            ->willReturn(false);
+
+        $this->entityModel->method('getEntityTypeId')
+            ->willReturn(3);
+        $this->entityModel->method('getAttributeOptions')
+            ->willReturnOnConsecutiveCalls(
+                ['option1', 'option2'],
+                ['yes' => 1, 'no' => 0]
+            );
+        $attrSetColFactory->method('create')
+            ->willReturn($attrSetCollection);
+        $attrSetCollection->method('setEntityTypeFilter')
+            ->willReturn([$attributeSet]);
+        $attrColFactory->method('create')
+            ->willReturn($attrCollection);
+        $attrCollection->method('setAttributeSetFilter')
             ->willReturn([$attribute1, $attribute2, $attribute3]);
-        $attributeSet->expects($this->any())->method('getId')->willReturn(1);
-        $attributeSet->expects($this->any())->method('getAttributeSetName')->willReturn('attribute_set_name');
+        $attributeSet->method('getId')
+            ->willReturn(1);
+        $attributeSet->method('getAttributeSetName')
+            ->willReturn('attribute_set_name');
 
-        $attrCollection
-            ->expects($this->any())
-            ->method('addFieldToFilter')
+        $attrCollection->method('addFieldToFilter')
             ->with(
                 ['main_table.attribute_id', 'main_table.attribute_code'],
                 [
@@ -193,19 +219,26 @@ protected function setUp(): void
                 'getConnection',
             ]
         );
-        $this->select->expects($this->any())->method('from')->willReturnSelf();
-        $this->select->expects($this->any())->method('where')->willReturnSelf();
-        $this->select->expects($this->any())->method('joinLeft')->willReturnSelf();
-        $this->connection->expects($this->any())->method('select')->willReturn($this->select);
+        $this->select->method('from')
+            ->willReturnSelf();
+        $this->select->method('where')
+            ->willReturnSelf();
+        $this->select->method('joinLeft')
+            ->willReturnSelf();
+        $this->connection->method('select')
+            ->willReturn($this->select);
         $connection = $this->createMock(Mysql::class);
-        $connection->expects($this->any())->method('quoteInto')->willReturn('query');
-        $this->select->expects($this->any())->method('getConnection')->willReturn($connection);
-        $this->connection->expects($this->any())->method('insertOnDuplicate')->willReturnSelf();
-        $this->connection->expects($this->any())->method('delete')->willReturnSelf();
-        $this->connection->expects($this->any())->method('quoteInto')->willReturn('');
-        $this->connection
-            ->expects($this->any())
-            ->method('fetchAll')
+        $connection->method('quoteInto')
+            ->willReturn('query');
+        $this->select->method('getConnection')
+            ->willReturn($connection);
+        $this->connection->method('insertOnDuplicate')
+            ->willReturnSelf();
+        $this->connection->method('delete')
+            ->willReturnSelf();
+        $this->connection->method('quoteInto')
+            ->willReturn('');
+        $this->connection->method('fetchAll')
             ->willReturn($entityAttributes);
 
         $this->resource = $this->createPartialMock(
@@ -215,12 +248,10 @@ protected function setUp(): void
                 'getTableName',
             ]
         );
-        $this->resource->expects($this->any())->method('getConnection')->willReturn(
-            $this->connection
-        );
-        $this->resource->expects($this->any())->method('getTableName')->willReturn(
-            'tableName'
-        );
+        $this->resource->method('getConnection')
+            ->willReturn($this->connection);
+        $this->resource->method('getTableName')
+            ->willReturn('tableName');
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->simpleType = $this->objectManagerHelper->getObject(
@@ -233,9 +264,7 @@ protected function setUp(): void
             ]
         );
 
-        $this->abstractType = $this->getMockBuilder(
-            \Magento\CatalogImportExport\Model\Import\Product\Type\AbstractType::class
-        )
+        $this->abstractType = $this->getMockBuilder(AbstractType::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
     }
@@ -277,8 +306,10 @@ public function testIsRowValidSuccess()
     {
         $rowData = ['_attribute_set' => 'attribute_set_name'];
         $rowNum = 1;
-        $this->entityModel->expects($this->any())->method('getRowScope')->willReturn(null);
-        $this->entityModel->expects($this->never())->method('addRowError');
+        $this->entityModel->method('getRowScope')
+            ->willReturn(null);
+        $this->entityModel->expects($this->never())
+            ->method('addRowError');
         $this->setPropertyValue(
             $this->simpleType,
             '_attributes',
@@ -296,8 +327,9 @@ public function testIsRowValidError()
             'sku' => 'sku'
         ];
         $rowNum = 1;
-        $this->entityModel->expects($this->any())->method('getRowScope')->willReturn(1);
-        $this->entityModel->expects($this->once())->method('addRowError')
+        $this->entityModel->method('getRowScope')
+            ->willReturn(1);
+        $this->entityModel->method('addRowError')
             ->with(
                 RowValidatorInterface::ERROR_VALUE_IS_REQUIRED,
                 1,

From f43937b0081af90943aeff631447da654e086be4 Mon Sep 17 00:00:00 2001
From: engcom-Echo <engcom-vendorworker-echo@adobe.com>
Date: Thu, 22 Oct 2020 15:35:25 +0300
Subject: [PATCH 616/671] MC-34156: Cannot save product in store view scope
 without Magento_Catalog::edit_product_design ACL

---
 app/code/Magento/Catalog/Model/Product/Authorization.php | 2 +-
 .../Magento/Catalog/Model/Product/AuthorizationTest.php  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/Authorization.php b/app/code/Magento/Catalog/Model/Product/Authorization.php
index b8aa8f70ba70f..4022eb34e65e3 100644
--- a/app/code/Magento/Catalog/Model/Product/Authorization.php
+++ b/app/code/Magento/Catalog/Model/Product/Authorization.php
@@ -159,7 +159,7 @@ public function authorizeSavingOf(ProductInterface $product): void
                     if (!$savedProduct->getSku()) {
                         throw NoSuchEntityException::singleField('id', $product->getId());
                     }
-                    $oldData = $product->getOrigData();
+                    $oldData = $savedProduct->getData();
                 }
             }
             if ($this->hasProductChanged($product, $oldData)) {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php
index 80de1b3a19270..e2b80a975502f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php
@@ -19,6 +19,8 @@
 
 /**
  * Verify additional authorization for product operations
+ *
+ * @magentoAppArea adminhtml
  */
 class AuthorizationTest extends TestCase
 {
@@ -43,7 +45,7 @@ class AuthorizationTest extends TestCase
     private $productRepository;
 
     /**
-     * @inheridoc
+     * @inheritdoc
      */
     protected function setUp(): void
     {
@@ -103,7 +105,7 @@ public function postRequestData(): array
                         'custom_design_to' => '1',
                         'custom_layout_update_file' => '1',
                     ],
-                ]
+                ],
             ],
             [
                 [
@@ -118,7 +120,7 @@ public function postRequestData(): array
                         'custom_layout_update_file' => '__no_update__',
                     ],
                     'use_default' => null,
-                ]
+                ],
             ],
         ];
     }
@@ -130,7 +132,6 @@ public function postRequestData(): array
      * @param array $data
      *
      * @dataProvider postRequestDataException
-     * @throws AuthorizationException
      */
     public function testAuthorizedSavingOfWithException(array $data): void
     {

From 078919e3771fa662caa8c7d8378e5fd99b131b57 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 22 Oct 2020 17:05:35 +0300
Subject: [PATCH 617/671] MC-38589: [MFTF]
 AdminEnhancedMediaGalleryVerifyAssetFilterTest failed because of bad design

---
 .../Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
index 24259edbfe669..90ae7a5f10368 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
@@ -9,7 +9,7 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminEnhancedMediaGalleryVerifyFilterByAssetTest">
         <annotations>
-            <features value="MediaGallery"/>
+            <features value="MediaGalleryUi"/>
             <stories value="Story 58: User sees entities where asset is used in"/>
             <title value="User sees entities where asset is used in"/>
             <description value="User sees entities where asset is used in"/>

From 2a68e712b11d201e00bc4357a8c6e89a43151a4b Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 22 Oct 2020 12:45:34 -0500
Subject: [PATCH 618/671] 29251 test web-api test fix

---
 .../BuyRequest/SuperAttributeDataProvider.php | 39 +++++++++-
 .../Model/Cart/AddSimpleProductToCart.php     | 71 ++-----------------
 2 files changed, 41 insertions(+), 69 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
index 4a613254ddf84..d9c8ade39f621 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -8,6 +8,8 @@
 namespace Magento\ConfigurableProductGraphQl\Model\Cart\BuyRequest;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\CatalogInventory\Api\StockStateInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -16,6 +18,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Quote\Model\Quote;
 
 /**
  * DataProvider for building super attribute options in buy requests
@@ -42,22 +45,30 @@ class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
      */
     private $metadataPool;
 
+    /**
+     * @var StockStateInterface
+     */
+    private $stockState;
+
     /**
      * @param ArrayManager $arrayManager
      * @param ProductRepositoryInterface $productRepository
      * @param OptionCollection $optionCollection
      * @param MetadataPool $metadataPool
+     * @param StockStateInterface $stockState
      */
     public function __construct(
         ArrayManager $arrayManager,
         ProductRepositoryInterface $productRepository,
         OptionCollection $optionCollection,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool,
+        StockStateInterface $stockState
     ) {
         $this->arrayManager = $arrayManager;
         $this->productRepository = $productRepository;
         $this->optionCollection = $optionCollection;
         $this->metadataPool = $metadataPool;
+        $this->stockState = $stockState;
     }
 
     /**
@@ -65,18 +76,36 @@ public function __construct(
      */
     public function execute(array $cartItemData): array
     {
+
         $parentSku = $this->arrayManager->get('parent_sku', $cartItemData);
         if ($parentSku === null) {
             return [];
         }
         $sku = $this->arrayManager->get('data/sku', $cartItemData);
-
+        $qty = $this->arrayManager->get('data/quantity', $cartItemData);
+        $cart = $this->arrayManager->get('model', $cartItemData);
+        if (!$cart instanceof Quote) {
+            throw new LocalizedException(__('"model" value should be specified'));
+        }
         try {
             $parentProduct = $this->productRepository->get($parentSku);
             $product = $this->productRepository->get($sku);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
         }
+
+
+        // Child stock check has to be performed a catalog by default would not show/check it
+        $childProduct = $this->productRepository->get($sku, false, null, true);
+
+        $result = $this->stockState->checkQuoteItemQty($childProduct->getId(), $qty, $qty, $qty, $cart->getStoreId());
+
+        if ($result->getHasError() ) {
+            throw new LocalizedException(
+                __($result->getMessage())
+            );
+        }
+
         $configurableProductLinks = $parentProduct->getExtensionAttributes()->getConfigurableProductLinks();
         if (!in_array($product->getId(), $configurableProductLinks)) {
             throw new GraphQlInputException(__('Could not find specified product.'));
@@ -95,6 +124,12 @@ public function execute(array $cartItemData): array
                 }
             }
         }
+        // Some options might be disabled and/or available when parent and child sku are provided
+        if (empty($superAttributesData)) {
+            throw new LocalizedException(
+                __('The product with SKU %sku is out of stock.', ['sku' => $parentSku])
+            );
+        }
         return ['super_attribute' => $superAttributesData];
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 4b76a1ea5bd15..12eebe9b926e8 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -9,13 +9,11 @@
 
 use Exception;
 use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder;
-use Magento\CatalogInventory\Api\StockStateInterface;
 
 /**
  * Add simple product to cart
@@ -32,24 +30,16 @@ class AddSimpleProductToCart
      */
     private $buyRequestBuilder;
 
-    /**
-     * @var StockStateInterface
-     */
-    private $stockState;
-
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param BuyRequestBuilder $buyRequestBuilder
-     * @param StockStateInterface $stockState
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
-        BuyRequestBuilder $buyRequestBuilder,
-        StockStateInterface $stockState
+        BuyRequestBuilder $buyRequestBuilder
     ) {
         $this->productRepository = $productRepository;
         $this->buyRequestBuilder = $buyRequestBuilder;
-        $this->stockState = $stockState;
     }
 
     /**
@@ -62,41 +52,17 @@ public function __construct(
      */
     public function execute(Quote $cart, array $cartItemData): void
     {
+        $cartItemData['model'] = $cart;
         $sku = $this->extractSku($cartItemData);
-        $childSku = $this->extractChildSku($cartItemData);
-        $childSkuQty = $this->extractChildSkuQuantity($cartItemData);
+
         try {
             $product = $this->productRepository->get($sku, false, null, true);
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(__('Could not find a product with SKU "%sku"', ['sku' => $sku]));
         }
 
-        if ($childSku) {
-            $childProduct = $this->productRepository->get($childSku, false, null, true);
-
-            $result = $this->stockState->checkQuoteItemQty(
-                $childProduct->getId(), $childSkuQty, $childSkuQty, $childSkuQty, $cart->getStoreId()
-            );
-
-            if ($result->getHasError() ) {
-                throw new GraphQlInputException(
-                    __(
-                        'Could not add the product with SKU %sku to the shopping cart: %message',
-                        ['sku' => $childSku, 'message' => __($result->getMessage())]
-                    )
-                );
-            }
-        }
-
         try {
-           $buyRequest = $this->buyRequestBuilder->build($cartItemData);
-           // Some options might be disabled and not available
-           if (empty($buyRequest['super_attribute'])) {
-               throw new LocalizedException(
-                   __('The product with SKU %sku is out of stock.', ['sku' => $childSku])
-               );
-           }
-           $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
+            $result = $cart->addProduct($product, $this->buyRequestBuilder->build($cartItemData));
         } catch (Exception $e) {
             throw new GraphQlInputException(
                 __(
@@ -134,33 +100,4 @@ private function extractSku(array $cartItemData): string
         }
         return (string)$cartItemData['data']['sku'];
     }
-
-    /**
-     * Extract option child SKU from cart item data
-     *
-     * @param array $cartItemData
-     * @return string
-     * @throws GraphQlInputException
-     */
-    private function extractChildSku(array $cartItemData): ?string
-    {
-        if (isset($cartItemData['data']['sku'])) {
-            return (string)$cartItemData['data']['sku'];
-        }
-    }
-
-    /**
-     * Extract option child SKU from cart item data
-     *
-     * @param array $cartItemData
-     * @return string
-     * @throws GraphQlInputException
-     */
-    private function extractChildSkuQuantity(array $cartItemData): ?string
-    {
-        if (empty($cartItemData['data']['quantity'])) {
-            throw new GraphQlInputException(__('Missed "quantity" in cart item data'));
-        }
-        return (string)$cartItemData['data']['quantity'];
-    }
 }

From 8baf70fd62ac58d95e33d1e00510504aa1a9abd4 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Thu, 22 Oct 2020 17:27:15 -0500
Subject: [PATCH 619/671] MC-37726: Price filter uses base currency for ranges

---
 .../LayeredNavigation/Builder/Price.php       |  2 +-
 .../Model/Resolver/Aggregations.php           | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Price.php b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Price.php
index 02b638edbdce8..1e2cc99663731 100644
--- a/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Price.php
+++ b/app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Price.php
@@ -72,7 +72,7 @@ public function build(AggregationInterface $aggregation, ?int $storeId): array
             );
         }
 
-        return [$result];
+        return [self::PRICE_BUCKET => $result];
     }
 
     /**
diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
index 47a1d1f977f9b..7d10762d0f3b6 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
@@ -7,10 +7,12 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
+use Magento\Directory\Model\PriceCurrency;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -28,16 +30,24 @@ class Aggregations implements ResolverInterface
      */
     private $layerBuilder;
 
+    /**
+     * @var PriceCurrency
+     */
+    private $priceCurrency;
+
     /**
      * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
+     * @param PriceCurrency $priceCurrency
      * @param LayerBuilder $layerBuilder
      */
     public function __construct(
         \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider,
-        LayerBuilder $layerBuilder
+        LayerBuilder $layerBuilder,
+        PriceCurrency $priceCurrency = null
     ) {
         $this->filtersDataProvider = $filtersDataProvider;
         $this->layerBuilder = $layerBuilder;
+        $this->priceCurrency = $priceCurrency ?: ObjectManager::getInstance()->get(PriceCurrency::class);
     }
 
     /**
@@ -60,7 +70,16 @@ public function resolve(
             /** @var StoreInterface $store */
             $store = $context->getExtensionAttributes()->getStore();
             $storeId = (int)$store->getId();
-            return $this->layerBuilder->build($aggregations, $storeId);
+            $results = $this->layerBuilder->build($aggregations, $storeId);
+            if (isset($results['price_bucket'])) {
+                foreach ($results['price_bucket']['options'] as &$value) {
+                    list($from, $to) = explode('-', $value['label']);
+                    $newLabel = $this->priceCurrency->convertAndRound($from) . '-' . $this->priceCurrency->convertAndRound($to);
+                    $value['label'] = $newLabel;
+                    $value['value'] = str_replace('-', '_', $newLabel);
+                }
+            }
+            return $results;
         } else {
             return [];
         }

From c53bb9b6cb544514354852a482e137d62bbbf932 Mon Sep 17 00:00:00 2001
From: Viktor Petryk <victor.petryk@transoftgroup.com>
Date: Fri, 23 Oct 2020 12:27:36 +0300
Subject: [PATCH 620/671] MC-37213: [MFTF]
 AdminMediaGalleryCatalogUiUsedInProductFilterTest is flaky

---
 .../AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml
index 32a07d6f6273f..a48256a4c2d29 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterOnTest.xml
@@ -29,7 +29,7 @@
             <magentoCLI command="config:set {{WysiwygDisabledByDefault.path}} {{WysiwygDisabledByDefault.value}}" stepKey="disableWYSIWYG"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
             <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToAssertEmptyUsedIn"/>
             <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
             <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
@@ -41,7 +41,7 @@
             <actionGroup ref="AdminEnhancedMediaGalleryClickDeleteImagesButtonActionGroup" stepKey="clickDeleteSelectedButton"/>
             <actionGroup ref="AdminEnhancedMediaGalleryConfirmDeleteImagesActionGroup" stepKey="deleteImages"/>
 
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView2"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersAfterDeleteImages"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 

From 08ba757ff90f3515fdaa74495ef4b31937e64b1c Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 23 Oct 2020 13:23:45 +0300
Subject: [PATCH 621/671] MC-37884: [GraphQL] Cart Price Rule for the Whole
 Cart with coupon does not apply

---
 .../QuoteGraphQl/Model/Resolver/CartPrices.php  | 17 ++++++++++++++++-
 .../Quote/Guest/ApplyCouponsToCartTest.php      | 13 +++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
index 6a57a7662af09..5eb4d090a0f7b 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
@@ -14,6 +14,7 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address\Total;
 use Magento\Quote\Model\Quote\TotalsCollector;
+use Magento\SalesRule\Model\Spi\QuoteResetAppliedRulesInterface;
 
 /**
  * @inheritdoc
@@ -25,13 +26,21 @@ class CartPrices implements ResolverInterface
      */
     private $totalsCollector;
 
+    /**
+     * @var QuoteResetAppliedRulesInterface
+     */
+    private $resetAppliedRules;
+
     /**
      * @param TotalsCollector $totalsCollector
+     * @param QuoteResetAppliedRulesInterface $resetAppliedRules
      */
     public function __construct(
-        TotalsCollector $totalsCollector
+        TotalsCollector $totalsCollector,
+        QuoteResetAppliedRulesInterface $resetAppliedRules
     ) {
         $this->totalsCollector = $totalsCollector;
+        $this->resetAppliedRules = $resetAppliedRules;
     }
 
     /**
@@ -45,6 +54,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         /** @var Quote $quote */
         $quote = $value['model'];
+        /**
+         * To calculate a right discount value
+         * before calculate totals
+         * need to reset Cart Fixed Rules in the quote
+         */
+        $this->resetAppliedRules->execute($quote);
         $cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
         $currency = $quote->getQuoteCurrencyCode();
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
index d33d0ee0569cd..a9dadccaa5373 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php
@@ -21,6 +21,9 @@ class ApplyCouponsToCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -36,12 +39,17 @@ protected function setUp(): void
     public function testApplyCouponsToCart()
     {
         $couponCode = '2?ds5!2d';
+        $expectedGrandTotal = 15.00;
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupons'][0]['code']);
+        self::assertEquals(
+            $expectedGrandTotal,
+            $response['applyCouponToCart']['cart']['prices']['grand_total']['value']
+        );
     }
 
     /**
@@ -146,6 +154,11 @@ private function getQuery(string $maskedQuoteId, string $couponCode): string
       applied_coupons {
         code
       }
+      prices {
+        grand_total {
+          value
+        }
+      }
     }
   }
 }

From 32be7bb1080b72d619262c1d575886450981c1b4 Mon Sep 17 00:00:00 2001
From: mastiuhin-olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Fri, 23 Oct 2020 13:54:01 +0300
Subject: [PATCH 622/671] MC-33288: [2.4][MSI][MFTF]
 StorefrontLoggedInCustomerCreateOrderAllOptionQuantityConfigurableProductCustomStockTest
 fails because of bad design

---
 .../Model/ResourceModel/Product/Relation.php  | 49 ++++++++++-
 .../ResourceModel/Product/RelationTest.php    | 86 +++++++++++++++++++
 2 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/RelationTest.php

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
index c855fc5371b46..deba2b555d5cc 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
@@ -5,13 +5,37 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
+use Magento\Framework\Model\ResourceModel\Db\Context;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Catalog\Api\Data\ProductInterface;
+
 /**
  * Catalog Product Relations Resource model
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-class Relation extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Relation extends AbstractDb
 {
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
+    /**
+     * @param Context $context
+     * @param null $connectionName
+     * @param MetadataPool $metadataPool
+     */
+    public function __construct(
+        Context $context,
+        $connectionName = null,
+        MetadataPool $metadataPool
+    ) {
+        parent::__construct($context, $connectionName);
+        $this->metadataPool = $metadataPool;
+    }
+
     /**
      * Initialize resource model and define main table
      *
@@ -109,4 +133,27 @@ public function removeRelations($parentId, $childIds)
         }
         return $this;
     }
+
+    /**
+     * Finds parent relations by given children ids.
+     *
+     * @param array $childrenIds Child products entity ids.
+     * @return array Parent products entity ids.
+     */
+    public function getRelationsByChildren(array $childrenIds): array
+    {
+        $connection = $this->getConnection();
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)
+            ->getLinkField();
+        $select = $connection->select()
+            ->from(
+                ['cpe' => $this->getTable('catalog_product_entity')],
+                'entity_id'
+            )->join(
+                ['relation' => $this->getTable('catalog_product_relation')],
+                'relation.parent_id = cpe.' . $linkField
+            )->where('child_id IN(?)', $childrenIds);
+
+        return $connection->fetchCol($select);
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/RelationTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/RelationTest.php
new file mode 100644
index 0000000000000..e9fa6d5bf96b7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/ResourceModel/Product/RelationTest.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\ConfigurableProduct\Model\ResourceModel\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Relation;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Tests Catalog Product Relation resource model.
+ *
+ * @see Relation
+ */
+class RelationTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Relation
+     */
+    private $model;
+
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->model = $this->objectManager->get(Relation::class);
+        $this->productRepository = $this->objectManager->get(ProductRepositoryInterface::class);
+        $this->searchCriteriaBuilder = $this->objectManager->get(SearchCriteriaBuilder::class);
+    }
+
+    /**
+     * Tests that getRelationsByChildren will return parent products entity ids of child products entity ids.
+     *
+     * @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+     */
+    public function testGetRelationsByChildren(): void
+    {
+        // Find configurable products options
+        $productOptionSkus = ['simple_10', 'simple_20', 'simple_30', 'simple_40'];
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', $productOptionSkus, 'in')
+            ->create();
+        $productOptions = $this->productRepository->getList($searchCriteria)
+            ->getItems();
+
+        $productOptionsIds = [];
+
+        foreach ($productOptions as $productOption) {
+            $productOptionsIds[] = $productOption->getId();
+        }
+
+        // Find configurable products
+        $searchCriteria = $this->searchCriteriaBuilder->addFilter('sku', ['configurable', 'configurable_12345'], 'in')
+            ->create();
+        $configurableProducts = $this->productRepository->getList($searchCriteria)
+            ->getItems();
+
+        // Assert there are configurable products ids in result of getRelationsByChildren method.
+        $result = $this->model->getRelationsByChildren($productOptionsIds);
+
+        foreach ($configurableProducts as $configurableProduct) {
+            $this->assertContains($configurableProduct->getId(), $result);
+        }
+    }
+}

From bee2147b02fe43df6e1333ef1ae5a8bf52676c04 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 23 Oct 2020 14:57:53 +0300
Subject: [PATCH 623/671] MC-37884: [GraphQL] Cart Price Rule for the Whole
 Cart with coupon does not apply

---
 .../QuoteGraphQl/Model/Resolver/CartPrices.php      | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
index 5eb4d090a0f7b..66cc9ed11ed9f 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
@@ -14,7 +14,6 @@
 use Magento\Quote\Model\Quote;
 use Magento\Quote\Model\Quote\Address\Total;
 use Magento\Quote\Model\Quote\TotalsCollector;
-use Magento\SalesRule\Model\Spi\QuoteResetAppliedRulesInterface;
 
 /**
  * @inheritdoc
@@ -26,21 +25,13 @@ class CartPrices implements ResolverInterface
      */
     private $totalsCollector;
 
-    /**
-     * @var QuoteResetAppliedRulesInterface
-     */
-    private $resetAppliedRules;
-
     /**
      * @param TotalsCollector $totalsCollector
-     * @param QuoteResetAppliedRulesInterface $resetAppliedRules
      */
     public function __construct(
-        TotalsCollector $totalsCollector,
-        QuoteResetAppliedRulesInterface $resetAppliedRules
+        TotalsCollector $totalsCollector
     ) {
         $this->totalsCollector = $totalsCollector;
-        $this->resetAppliedRules = $resetAppliedRules;
     }
 
     /**
@@ -59,7 +50,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
          * before calculate totals
          * need to reset Cart Fixed Rules in the quote
          */
-        $this->resetAppliedRules->execute($quote);
+        $quote->setCartFixedRules([]);
         $cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
         $currency = $quote->getQuoteCurrencyCode();
 

From 414621cc8517448529d9412958ae290e7650202c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 23 Oct 2020 15:56:57 +0300
Subject: [PATCH 624/671] MC-38620: Merge release branch into 2.4-develop

- Revert "Updating root composer files for publication service for 2.4.1"
This reverts commit 445b0f1a
---
 composer.json | 513 +++++++++++++++++++++++++-------------------------
 1 file changed, 256 insertions(+), 257 deletions(-)

diff --git a/composer.json b/composer.json
index b42794e0ba557..57fbfaaa35c2b 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "version": "2.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-bcmath": "*",
@@ -83,31 +82,6 @@
         "webonyx/graphql-php": "^0.13.8",
         "wikimedia/less.php": "~1.8.0"
     },
-    "suggest": {
-        "ext-pcntl": "Need for run processes in parallel mode"
-    },
-    "autoload": {
-        "exclude-from-classmap": [
-            "**/dev/**",
-            "**/update/**",
-            "**/Test/**"
-        ],
-        "files": [
-            "app/etc/NonComposerComponentRegistration.php"
-        ],
-        "psr-0": {
-            "": [
-                "app/code/",
-                "generated/code/"
-            ]
-        },
-        "psr-4": {
-            "Magento\\": "app/code/Magento/",
-            "Magento\\Framework\\": "lib/internal/Magento/Framework/",
-            "Magento\\Setup\\": "setup/src/Magento/Setup/",
-            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
-        }
-    },
     "require-dev": {
         "allure-framework/allure-phpunit": "~1.2.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
@@ -123,261 +97,286 @@
         "sebastian/phpcpd": "~5.0.0",
         "squizlabs/php_codesniffer": "~3.5.4"
     },
-    "conflict": {
-        "gene/bluefoot": "*"
+    "suggest": {
+        "ext-pcntl": "Need for run processes in parallel mode"
     },
     "replace": {
-        "magento/module-marketplace": "100.4.0",
-        "magento/module-admin-analytics": "100.4.1",
-        "magento/module-admin-notification": "100.4.0",
-        "magento/module-advanced-pricing-import-export": "100.4.1",
-        "magento/module-amqp": "100.4.0",
-        "magento/module-amqp-store": "100.4.0",
-        "magento/module-analytics": "100.4.1",
-        "magento/module-asynchronous-operations": "100.4.1",
-        "magento/module-authorization": "100.4.1",
-        "magento/module-advanced-search": "100.4.0",
-        "magento/module-backend": "102.0.1",
-        "magento/module-backup": "100.4.1",
-        "magento/module-bundle": "101.0.1",
-        "magento/module-bundle-graph-ql": "100.4.1",
-        "magento/module-bundle-import-export": "100.4.0",
-        "magento/module-cache-invalidate": "100.4.0",
-        "magento/module-captcha": "100.4.1",
-        "magento/module-cardinal-commerce": "100.4.0",
-        "magento/module-catalog": "104.0.1",
-        "magento/module-catalog-customer-graph-ql": "100.4.1",
-        "magento/module-catalog-analytics": "100.4.0",
-        "magento/module-catalog-import-export": "101.1.1",
-        "magento/module-catalog-inventory": "100.4.1",
-        "magento/module-catalog-inventory-graph-ql": "100.4.0",
-        "magento/module-catalog-rule": "101.2.1",
-        "magento/module-catalog-rule-graph-ql": "100.4.0",
-        "magento/module-catalog-rule-configurable": "100.4.0",
-        "magento/module-catalog-search": "102.0.1",
-        "magento/module-catalog-url-rewrite": "100.4.1",
-        "magento/module-catalog-widget": "100.4.1",
-        "magento/module-checkout": "100.4.1",
-        "magento/module-checkout-agreements": "100.4.0",
-        "magento/module-checkout-agreements-graph-ql": "100.4.0",
-        "magento/module-cms": "104.0.1",
-        "magento/module-cms-url-rewrite": "100.4.1",
-        "magento/module-config": "101.2.1",
-        "magento/module-configurable-import-export": "100.4.0",
-        "magento/module-configurable-product": "100.4.1",
-        "magento/module-configurable-product-sales": "100.4.0",
-        "magento/module-contact": "100.4.1",
-        "magento/module-cookie": "100.4.1",
-        "magento/module-cron": "100.4.1",
-        "magento/module-currency-symbol": "100.4.0",
-        "magento/module-customer": "103.0.1",
-        "magento/module-customer-analytics": "100.4.0",
-        "magento/module-customer-downloadable-graph-ql": "100.4.0",
-        "magento/module-customer-import-export": "100.4.1",
-        "magento/module-deploy": "100.4.1",
-        "magento/module-developer": "100.4.1",
-        "magento/module-dhl": "100.4.0",
-        "magento/module-directory": "100.4.1",
-        "magento/module-directory-graph-ql": "100.4.0",
-        "magento/module-downloadable": "100.4.1",
-        "magento/module-downloadable-graph-ql": "100.4.1",
-        "magento/module-downloadable-import-export": "100.4.0",
-        "magento/module-eav": "102.1.1",
-        "magento/module-elasticsearch": "101.0.1",
-        "magento/module-elasticsearch-6": "100.4.1",
-        "magento/module-elasticsearch-7": "100.4.1",
-        "magento/module-email": "101.1.1",
-        "magento/module-encryption-key": "100.4.0",
-        "magento/module-fedex": "100.4.1",
-        "magento/module-gift-message": "100.4.0",
-        "magento/module-gift-message-graph-ql": "100.4.0",
-        "magento/module-google-adwords": "100.4.0",
-        "magento/module-google-analytics": "100.4.0",
-        "magento/module-google-optimizer": "100.4.1",
-        "magento/module-graph-ql": "100.4.1",
-        "magento/module-graph-ql-cache": "100.4.0",
-        "magento/module-catalog-graph-ql": "100.4.1",
-        "magento/module-catalog-cms-graph-ql": "100.4.0",
-        "magento/module-catalog-url-rewrite-graph-ql": "100.4.0",
-        "magento/module-configurable-product-graph-ql": "100.4.1",
-        "magento/module-customer-graph-ql": "100.4.1",
-        "magento/module-eav-graph-ql": "100.4.0",
-        "magento/module-swatches-graph-ql": "100.4.1",
-        "magento/module-tax-graph-ql": "100.4.0",
-        "magento/module-url-rewrite-graph-ql": "100.4.0",
-        "magento/module-cms-url-rewrite-graph-ql": "100.4.0",
-        "magento/module-weee-graph-ql": "100.4.0",
-        "magento/module-cms-graph-ql": "100.4.0",
-        "magento/module-grouped-import-export": "100.4.0",
-        "magento/module-grouped-product": "100.4.1",
-        "magento/module-grouped-catalog-inventory": "100.4.0",
-        "magento/module-grouped-product-graph-ql": "100.4.1",
-        "magento/module-import-export": "101.0.1",
-        "magento/module-indexer": "100.4.1",
-        "magento/module-instant-purchase": "100.4.0",
-        "magento/module-integration": "100.4.1",
-        "magento/module-layered-navigation": "100.4.1",
-        "magento/module-login-as-customer": "100.4.1",
-        "magento/module-login-as-customer-admin-ui": "100.4.1",
-        "magento/module-login-as-customer-api": "100.4.1",
-        "magento/module-login-as-customer-assistance": "100.4.0",
-        "magento/module-login-as-customer-frontend-ui": "100.4.1",
-        "magento/module-login-as-customer-log": "100.4.0",
-        "magento/module-login-as-customer-quote": "100.4.0",
-        "magento/module-login-as-customer-page-cache": "100.4.1",
-        "magento/module-login-as-customer-sales": "100.4.1",
-        "magento/module-media-content": "100.4.1",
-        "magento/module-media-content-api": "100.4.1",
-        "magento/module-media-content-catalog": "100.4.1",
-        "magento/module-media-content-cms": "100.4.1",
-        "magento/module-media-gallery": "100.4.1",
-        "magento/module-media-gallery-api": "101.0.1",
-        "magento/module-media-gallery-ui": "100.4.0",
-        "magento/module-media-gallery-ui-api": "100.4.0",
-        "magento/module-media-gallery-integration": "100.4.0",
-        "magento/module-media-gallery-synchronization": "100.4.0",
-        "magento/module-media-gallery-synchronization-api": "100.4.0",
-        "magento/module-media-content-synchronization": "100.4.0",
-        "magento/module-media-content-synchronization-api": "100.4.0",
-        "magento/module-media-content-synchronization-catalog": "100.4.0",
-        "magento/module-media-content-synchronization-cms": "100.4.0",
-        "magento/module-media-gallery-synchronization-metadata": "100.4.0",
-        "magento/module-media-gallery-metadata": "100.4.0",
-        "magento/module-media-gallery-metadata-api": "100.4.0",
-        "magento/module-media-gallery-catalog-ui": "100.4.0",
-        "magento/module-media-gallery-cms-ui": "100.4.0",
-        "magento/module-media-gallery-catalog-integration": "100.4.0",
-        "magento/module-media-gallery-catalog": "100.4.0",
+        "magento/module-marketplace": "*",
+        "magento/module-admin-analytics": "*",
+        "magento/module-admin-notification": "*",
+        "magento/module-advanced-pricing-import-export": "*",
+        "magento/module-amqp": "*",
+        "magento/module-amqp-store": "*",
+        "magento/module-analytics": "*",
+        "magento/module-asynchronous-operations": "*",
+        "magento/module-authorization": "*",
+        "magento/module-advanced-search": "*",
+        "magento/module-backend": "*",
+        "magento/module-backup": "*",
+        "magento/module-bundle": "*",
+        "magento/module-bundle-graph-ql": "*",
+        "magento/module-bundle-import-export": "*",
+        "magento/module-cache-invalidate": "*",
+        "magento/module-captcha": "*",
+        "magento/module-cardinal-commerce": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-customer-graph-ql": "*",
+        "magento/module-catalog-analytics": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-inventory-graph-ql": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-catalog-rule-graph-ql": "*",
+        "magento/module-catalog-rule-configurable": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-catalog-widget": "*",
+        "magento/module-checkout": "*",
+        "magento/module-checkout-agreements": "*",
+        "magento/module-checkout-agreements-graph-ql": "*",
+        "magento/module-cms": "*",
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-import-export": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-configurable-product-sales": "*",
+        "magento/module-contact": "*",
+        "magento/module-cookie": "*",
+        "magento/module-cron": "*",
+        "magento/module-currency-symbol": "*",
+        "magento/module-customer": "*",
+        "magento/module-customer-analytics": "*",
+        "magento/module-customer-downloadable-graph-ql": "*",
+        "magento/module-customer-import-export": "*",
+        "magento/module-deploy": "*",
+        "magento/module-developer": "*",
+        "magento/module-dhl": "*",
+        "magento/module-directory": "*",
+        "magento/module-directory-graph-ql": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-downloadable-graph-ql": "*",
+        "magento/module-downloadable-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-elasticsearch": "*",
+        "magento/module-elasticsearch-6": "*",
+        "magento/module-elasticsearch-7": "*",
+        "magento/module-email": "*",
+        "magento/module-encryption-key": "*",
+        "magento/module-fedex": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-gift-message-graph-ql": "*",
+        "magento/module-google-adwords": "*",
+        "magento/module-google-analytics": "*",
+        "magento/module-google-optimizer": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-graph-ql-cache": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-catalog-cms-graph-ql": "*",
+        "magento/module-catalog-url-rewrite-graph-ql": "*",
+        "magento/module-configurable-product-graph-ql": "*",
+        "magento/module-customer-graph-ql": "*",
+        "magento/module-eav-graph-ql": "*",
+        "magento/module-swatches-graph-ql": "*",
+        "magento/module-tax-graph-ql": "*",
+        "magento/module-url-rewrite-graph-ql": "*",
+        "magento/module-cms-url-rewrite-graph-ql": "*",
+        "magento/module-weee-graph-ql": "*",
+        "magento/module-cms-graph-ql": "*",
+        "magento/module-grouped-import-export": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-grouped-catalog-inventory": "*",
+        "magento/module-grouped-product-graph-ql": "*",
+        "magento/module-import-export": "*",
+        "magento/module-indexer": "*",
+        "magento/module-instant-purchase": "*",
+        "magento/module-integration": "*",
+        "magento/module-layered-navigation": "*",
+        "magento/module-login-as-customer": "*",
+        "magento/module-login-as-customer-admin-ui": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-login-as-customer-assistance": "*",
+        "magento/module-login-as-customer-frontend-ui": "*",
+        "magento/module-login-as-customer-log": "*",
+        "magento/module-login-as-customer-quote": "*",
+        "magento/module-login-as-customer-page-cache": "*",
+        "magento/module-login-as-customer-sales": "*",
+        "magento/module-media-content": "*",
+        "magento/module-media-content-api": "*",
+        "magento/module-media-content-catalog": "*",
+        "magento/module-media-content-cms": "*",
+        "magento/module-media-gallery": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-ui": "*",
+        "magento/module-media-gallery-ui-api": "*",
+        "magento/module-media-gallery-integration": "*",
+        "magento/module-media-gallery-synchronization": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-media-content-synchronization": "*",
+        "magento/module-media-content-synchronization-api": "*",
+        "magento/module-media-content-synchronization-catalog": "*",
+        "magento/module-media-content-synchronization-cms": "*",
+        "magento/module-media-gallery-synchronization-metadata": "*",
+        "magento/module-media-gallery-metadata": "*",
+        "magento/module-media-gallery-metadata-api": "*",
+        "magento/module-media-gallery-catalog-ui": "*",
+        "magento/module-media-gallery-cms-ui": "*",
+        "magento/module-media-gallery-catalog-integration": "*",
+        "magento/module-media-gallery-catalog": "*",
         "magento/module-media-gallery-renditions": "*",
         "magento/module-media-gallery-renditions-api": "*",
-        "magento/module-media-storage": "100.4.0",
-        "magento/module-message-queue": "100.4.1",
-        "magento/module-msrp": "100.4.0",
-        "magento/module-msrp-configurable-product": "100.4.0",
-        "magento/module-msrp-grouped-product": "100.4.0",
-        "magento/module-multishipping": "100.4.1",
-        "magento/module-mysql-mq": "100.4.0",
-        "magento/module-new-relic-reporting": "100.4.0",
-        "magento/module-newsletter": "100.4.1",
-        "magento/module-newsletter-graph-ql": "100.4.0",
-        "magento/module-offline-payments": "100.4.0",
-        "magento/module-offline-shipping": "100.4.0",
-        "magento/module-page-cache": "100.4.1",
-        "magento/module-payment": "100.4.1",
-        "magento/module-paypal": "101.0.1",
-        "magento/module-paypal-captcha": "100.4.0",
-        "magento/module-paypal-graph-ql": "100.4.1",
-        "magento/module-persistent": "100.4.1",
-        "magento/module-product-alert": "100.4.1",
-        "magento/module-product-video": "100.4.1",
-        "magento/module-quote": "101.2.1",
-        "magento/module-quote-analytics": "100.4.1",
-        "magento/module-quote-bundle-options": "100.4.0",
-        "magento/module-quote-configurable-options": "100.4.0",
-        "magento/module-quote-downloadable-links": "100.4.0",
-        "magento/module-quote-graph-ql": "100.4.1",
-        "magento/module-related-product-graph-ql": "100.4.0",
-        "magento/module-release-notification": "100.4.0",
-        "magento/module-reports": "100.4.1",
-        "magento/module-require-js": "100.4.0",
-        "magento/module-review": "100.4.1",
-        "magento/module-review-graph-ql": "100.4.0",
-        "magento/module-review-analytics": "100.4.0",
-        "magento/module-robots": "101.1.0",
-        "magento/module-rss": "100.4.0",
-        "magento/module-rule": "100.4.0",
-        "magento/module-sales": "103.0.1",
-        "magento/module-sales-analytics": "100.4.0",
-        "magento/module-sales-graph-ql": "100.4.1",
-        "magento/module-sales-inventory": "100.4.0",
-        "magento/module-sales-rule": "101.2.1",
-        "magento/module-sales-sequence": "100.4.1",
-        "magento/module-sample-data": "100.4.1",
-        "magento/module-search": "101.1.1",
-        "magento/module-security": "100.4.1",
-        "magento/module-send-friend": "100.4.0",
-        "magento/module-send-friend-graph-ql": "100.4.0",
-        "magento/module-shipping": "100.4.1",
-        "magento/module-sitemap": "100.4.1",
-        "magento/module-store": "101.1.1",
-        "magento/module-store-graph-ql": "100.4.1",
-        "magento/module-swagger": "100.4.0",
-        "magento/module-swagger-webapi": "100.4.0",
-        "magento/module-swagger-webapi-async": "100.4.0",
-        "magento/module-swatches": "100.4.1",
-        "magento/module-swatches-layered-navigation": "100.4.0",
-        "magento/module-tax": "100.4.1",
-        "magento/module-tax-import-export": "100.4.1",
-        "magento/module-theme": "101.1.1",
-        "magento/module-theme-graph-ql": "100.4.0",
-        "magento/module-translation": "100.4.1",
-        "magento/module-ui": "101.2.1",
-        "magento/module-ups": "100.4.1",
-        "magento/module-url-rewrite": "102.0.1",
-        "magento/module-user": "101.2.1",
-        "magento/module-usps": "100.4.0",
-        "magento/module-variable": "100.4.0",
-        "magento/module-vault": "101.2.1",
-        "magento/module-vault-graph-ql": "100.4.0",
-        "magento/module-version": "100.4.0",
-        "magento/module-webapi": "100.4.0",
-        "magento/module-webapi-async": "100.4.0",
-        "magento/module-webapi-security": "100.4.0",
-        "magento/module-weee": "100.4.1",
-        "magento/module-widget": "101.2.1",
-        "magento/module-wishlist": "101.2.1",
-        "magento/module-wishlist-graph-ql": "100.4.1",
-        "magento/module-wishlist-analytics": "100.4.0",
-        "magento/theme-adminhtml-backend": "100.4.1",
-        "magento/theme-frontend-blank": "100.4.1",
-        "magento/theme-frontend-luma": "100.4.1",
-        "magento/language-de_de": "100.4.0",
-        "magento/language-en_us": "100.4.0",
-        "magento/language-es_es": "100.4.0",
-        "magento/language-fr_fr": "100.4.0",
-        "magento/language-nl_nl": "100.4.0",
-        "magento/language-pt_br": "100.4.0",
-        "magento/language-zh_hans_cn": "100.4.0",
-        "magento/framework": "103.0.1",
-        "magento/framework-amqp": "100.4.0",
-        "magento/framework-bulk": "101.0.0",
-        "magento/framework-message-queue": "100.4.1",
+        "magento/module-media-storage": "*",
+        "magento/module-message-queue": "*",
+        "magento/module-msrp": "*",
+        "magento/module-msrp-configurable-product": "*",
+        "magento/module-msrp-grouped-product": "*",
+        "magento/module-multishipping": "*",
+        "magento/module-mysql-mq": "*",
+        "magento/module-new-relic-reporting": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-newsletter-graph-ql": "*",
+        "magento/module-offline-payments": "*",
+        "magento/module-offline-shipping": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-payment": "*",
+        "magento/module-paypal": "*",
+        "magento/module-paypal-captcha": "*",
+        "magento/module-paypal-graph-ql": "*",
+        "magento/module-persistent": "*",
+        "magento/module-product-alert": "*",
+        "magento/module-product-video": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-analytics": "*",
+        "magento/module-quote-bundle-options": "*",
+        "magento/module-quote-configurable-options": "*",
+        "magento/module-quote-downloadable-links": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/module-related-product-graph-ql": "*",
+        "magento/module-release-notification": "*",
+        "magento/module-reports": "*",
+        "magento/module-require-js": "*",
+        "magento/module-review": "*",
+        "magento/module-review-graph-ql": "*",
+        "magento/module-review-analytics": "*",
+        "magento/module-robots": "*",
+        "magento/module-rss": "*",
+        "magento/module-rule": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-analytics": "*",
+        "magento/module-sales-graph-ql": "*",
+        "magento/module-sales-inventory": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-sample-data": "*",
+        "magento/module-search": "*",
+        "magento/module-security": "*",
+        "magento/module-send-friend": "*",
+        "magento/module-send-friend-graph-ql": "*",
+        "magento/module-shipping": "*",
+        "magento/module-sitemap": "*",
+        "magento/module-store": "*",
+        "magento/module-store-graph-ql": "*",
+        "magento/module-swagger": "*",
+        "magento/module-swagger-webapi": "*",
+        "magento/module-swagger-webapi-async": "*",
+        "magento/module-swatches": "*",
+        "magento/module-swatches-layered-navigation": "*",
+        "magento/module-tax": "*",
+        "magento/module-tax-import-export": "*",
+        "magento/module-theme": "*",
+        "magento/module-theme-graph-ql": "*",
+        "magento/module-translation": "*",
+        "magento/module-ui": "*",
+        "magento/module-ups": "*",
+        "magento/module-url-rewrite": "*",
+        "magento/module-user": "*",
+        "magento/module-usps": "*",
+        "magento/module-variable": "*",
+        "magento/module-vault": "*",
+        "magento/module-vault-graph-ql": "*",
+        "magento/module-version": "*",
+        "magento/module-webapi": "*",
+        "magento/module-webapi-async": "*",
+        "magento/module-webapi-security": "*",
+        "magento/module-weee": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-wishlist-graph-ql": "*",
+        "magento/module-wishlist-analytics": "*",
+        "magento/theme-adminhtml-backend": "*",
+        "magento/theme-frontend-blank": "*",
+        "magento/theme-frontend-luma": "*",
+        "magento/language-de_de": "*",
+        "magento/language-en_us": "*",
+        "magento/language-es_es": "*",
+        "magento/language-fr_fr": "*",
+        "magento/language-nl_nl": "*",
+        "magento/language-pt_br": "*",
+        "magento/language-zh_hans_cn": "*",
+        "magento/framework": "*",
+        "magento/framework-amqp": "*",
+        "magento/framework-bulk": "*",
+        "magento/framework-message-queue": "*",
         "trentrichardson/jquery-timepicker-addon": "1.4.3",
         "components/jquery": "1.11.0",
         "blueimp/jquery-file-upload": "5.6.14",
         "components/jqueryui": "1.10.4",
         "twbs/bootstrap": "3.1.0",
         "tinymce/tinymce": "3.4.7",
-        "magento/module-tinymce-3": "100.4.1",
-        "magento/module-csp": "100.4.0"
+        "magento/module-tinymce-3": "*",
+        "magento/module-csp": "*"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/",
-            "Magento\\Sniffs\\": "dev/tests/static/framework/Magento/Sniffs/",
-            "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
-            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
-            "Magento\\Tools\\": "dev/tools/Magento/Tools/",
-            "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/"
-        }
+    "conflict": {
+        "gene/bluefoot": "*"
     },
-    "prefer-stable": true,
     "extra": {
         "component_paths": {
-            "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
+            "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
             "components/jquery": [
                 "lib/web/jquery.js",
                 "lib/web/jquery/jquery.min.js",
                 "lib/web/jquery/jquery-migrate.js"
             ],
+            "blueimp/jquery-file-upload": "lib/web/jquery/fileUploader",
             "components/jqueryui": [
                 "lib/web/jquery/jquery-ui.js"
             ],
-            "tinymce/tinymce": "lib/web/tiny_mce_4",
-            "trentrichardson/jquery-timepicker-addon": "lib/web/jquery/jquery-ui-timepicker-addon.js",
             "twbs/bootstrap": [
                 "lib/web/jquery/jquery.tabs.js"
+            ],
+            "tinymce/tinymce": "lib/web/tiny_mce_4"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Magento\\Framework\\": "lib/internal/Magento/Framework/",
+            "Magento\\Setup\\": "setup/src/Magento/Setup/",
+            "Magento\\": "app/code/Magento/",
+            "Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
+        },
+        "psr-0": {
+            "": [
+                "app/code/",
+                "generated/code/"
             ]
+        },
+        "files": [
+            "app/etc/NonComposerComponentRegistration.php"
+        ],
+        "exclude-from-classmap": [
+            "**/dev/**",
+            "**/update/**",
+            "**/Test/**"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Magento\\Sniffs\\": "dev/tests/static/framework/Magento/Sniffs/",
+            "Magento\\Tools\\": "dev/tools/Magento/Tools/",
+            "Magento\\Tools\\Sanity\\": "dev/build/publication/sanity/Magento/Tools/Sanity/",
+            "Magento\\TestFramework\\Inspection\\": "dev/tests/static/framework/Magento/TestFramework/Inspection/",
+            "Magento\\TestFramework\\Utility\\": "dev/tests/static/framework/Magento/TestFramework/Utility/",
+            "Magento\\PhpStan\\": "dev/tests/static/framework/Magento/PhpStan/"
         }
-    }
+    },
+    "prefer-stable": true
 }

From af21c7c05107489f1f0c5ecfbb00eb80070760b9 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 23 Oct 2020 16:04:36 +0300
Subject: [PATCH 625/671] MC-38620: Merge release branch into 2.4-develop

- Revert "Updating composer versions for version-setter for 2.4.1"
This reverts commit 7037dec9
---
 app/code/Magento/AdminAnalytics/composer.json | 22 +++---
 .../Magento/AdminNotification/composer.json   | 24 +++----
 .../AdvancedPricingImportExport/composer.json | 28 ++++----
 app/code/Magento/AdvancedSearch/composer.json | 28 ++++----
 app/code/Magento/Amqp/composer.json           | 18 +++--
 app/code/Magento/AmqpStore/composer.json      | 22 +++---
 app/code/Magento/Analytics/composer.json      | 18 +++--
 .../AsynchronousOperations/composer.json      | 26 ++++---
 app/code/Magento/Authorization/composer.json  | 16 ++---
 app/code/Magento/Backend/composer.json        | 48 ++++++-------
 app/code/Magento/Backup/composer.json         | 20 +++---
 app/code/Magento/Bundle/composer.json         | 50 +++++++------
 app/code/Magento/BundleGraphQl/composer.json  | 26 ++++---
 .../Magento/BundleImportExport/composer.json  | 26 ++++---
 .../Magento/CacheInvalidate/composer.json     | 16 ++---
 app/code/Magento/Captcha/composer.json        | 24 +++----
 .../Magento/CardinalCommerce/composer.json    | 20 +++---
 app/code/Magento/Catalog/composer.json        | 70 +++++++++----------
 .../Magento/CatalogAnalytics/composer.json    | 14 ++--
 .../Magento/CatalogCmsGraphQl/composer.json   | 22 +++---
 .../CatalogCustomerGraphQl/composer.json      | 18 +++--
 app/code/Magento/CatalogGraphQl/composer.json | 32 ++++-----
 .../Magento/CatalogImportExport/composer.json | 34 +++++----
 .../Magento/CatalogInventory/composer.json    | 28 ++++----
 .../CatalogInventoryGraphQl/composer.json     | 16 ++---
 app/code/Magento/CatalogRule/composer.json    | 32 ++++-----
 .../CatalogRuleConfigurable/composer.json     | 22 +++---
 .../Magento/CatalogRuleGraphQl/composer.json  | 14 ++--
 app/code/Magento/CatalogSearch/composer.json  | 38 +++++-----
 .../Magento/CatalogUrlRewrite/composer.json   | 32 ++++-----
 .../CatalogUrlRewriteGraphQl/composer.json    | 22 +++---
 app/code/Magento/CatalogWidget/composer.json  | 32 ++++-----
 app/code/Magento/Checkout/composer.json       | 54 +++++++-------
 .../Magento/CheckoutAgreements/composer.json  | 22 +++---
 .../CheckoutAgreementsGraphQl/composer.json   | 18 +++--
 app/code/Magento/Cms/composer.json            | 34 +++++----
 app/code/Magento/CmsGraphQl/composer.json     | 24 +++----
 app/code/Magento/CmsUrlRewrite/composer.json  | 20 +++---
 .../CmsUrlRewriteGraphQl/composer.json        | 22 +++---
 app/code/Magento/Config/composer.json         | 28 ++++----
 .../ConfigurableImportExport/composer.json    | 26 ++++---
 .../Magento/ConfigurableProduct/composer.json | 50 +++++++------
 .../ConfigurableProductGraphQl/composer.json  | 22 +++---
 .../ConfigurableProductSales/composer.json    | 22 +++---
 app/code/Magento/Contact/composer.json        | 22 +++---
 app/code/Magento/Cookie/composer.json         | 18 +++--
 app/code/Magento/Cron/composer.json           | 18 +++--
 app/code/Magento/Csp/composer.json            | 16 ++---
 app/code/Magento/CurrencySymbol/composer.json | 24 +++----
 app/code/Magento/Customer/composer.json       | 54 +++++++-------
 .../Magento/CustomerAnalytics/composer.json   | 14 ++--
 .../CustomerDownloadableGraphQl/composer.json | 18 +++--
 .../Magento/CustomerGraphQl/composer.json     | 26 ++++---
 .../CustomerImportExport/composer.json        | 26 ++++---
 app/code/Magento/Deploy/composer.json         | 22 +++---
 app/code/Magento/Developer/composer.json      | 18 +++--
 app/code/Magento/Dhl/composer.json            | 34 +++++----
 app/code/Magento/Directory/composer.json      | 20 +++---
 .../Magento/DirectoryGraphQl/composer.json    | 16 ++---
 app/code/Magento/Downloadable/composer.json   | 48 ++++++-------
 .../Magento/DownloadableGraphQl/composer.json | 28 ++++----
 .../DownloadableImportExport/composer.json    | 26 ++++---
 app/code/Magento/Eav/composer.json            | 24 +++----
 app/code/Magento/EavGraphQl/composer.json     | 16 ++---
 app/code/Magento/Elasticsearch/composer.json  | 32 ++++-----
 app/code/Magento/Elasticsearch6/composer.json | 24 +++----
 app/code/Magento/Elasticsearch7/composer.json | 24 +++----
 app/code/Magento/Email/composer.json          | 34 +++++----
 app/code/Magento/EncryptionKey/composer.json  | 18 +++--
 app/code/Magento/Fedex/composer.json          | 30 ++++----
 app/code/Magento/GiftMessage/composer.json    | 34 +++++----
 .../Magento/GiftMessageGraphQl/composer.json  | 16 ++---
 app/code/Magento/GoogleAdwords/composer.json  | 18 +++--
 .../Magento/GoogleAnalytics/composer.json     | 22 +++---
 .../Magento/GoogleOptimizer/composer.json     | 26 ++++---
 app/code/Magento/GraphQl/composer.json        | 18 +++--
 app/code/Magento/GraphQlCache/composer.json   | 14 ++--
 .../GroupedCatalogInventory/composer.json     | 20 +++---
 .../Magento/GroupedImportExport/composer.json | 24 +++----
 app/code/Magento/GroupedProduct/composer.json | 42 ++++++-----
 .../GroupedProductGraphQl/composer.json       | 16 ++---
 app/code/Magento/ImportExport/composer.json   | 26 ++++---
 app/code/Magento/Indexer/composer.json        | 16 ++---
 .../Magento/InstantPurchase/composer.json     | 18 +++--
 app/code/Magento/Integration/composer.json    | 28 ++++----
 .../Magento/LayeredNavigation/composer.json   | 18 +++--
 .../Magento/LoginAsCustomer/composer.json     | 26 +++----
 .../LoginAsCustomerAdminUi/composer.json      | 33 ++++-----
 .../Magento/LoginAsCustomerApi/composer.json  | 14 ++--
 .../LoginAsCustomerAssistance/composer.json   | 31 ++++----
 .../LoginAsCustomerFrontendUi/composer.json   | 21 +++---
 .../Magento/LoginAsCustomerLog/composer.json  | 31 ++++----
 .../LoginAsCustomerPageCache/composer.json    | 25 +++----
 .../LoginAsCustomerQuote/composer.json        | 23 +++---
 .../LoginAsCustomerSales/composer.json        | 23 +++---
 app/code/Magento/Marketplace/composer.json    | 16 ++---
 app/code/Magento/MediaContent/composer.json   | 14 ++--
 .../Magento/MediaContentApi/composer.json     | 12 ++--
 .../Magento/MediaContentCatalog/composer.json | 18 +++--
 .../Magento/MediaContentCms/composer.json     | 14 ++--
 .../MediaContentSynchronization/composer.json | 21 +++---
 .../composer.json                             | 11 ++-
 .../composer.json                             | 16 ++---
 .../composer.json                             | 16 ++---
 app/code/Magento/MediaGallery/composer.json   | 14 ++--
 .../Magento/MediaGalleryApi/composer.json     | 10 ++-
 .../Magento/MediaGalleryCatalog/composer.json | 14 ++--
 .../composer.json                             | 24 +++----
 .../MediaGalleryCatalogUi/composer.json       | 20 +++---
 .../Magento/MediaGalleryCmsUi/composer.json   | 14 ++--
 .../MediaGalleryIntegration/composer.json     | 32 ++++-----
 .../MediaGalleryMetadata/composer.json        | 12 ++--
 .../MediaGalleryMetadataApi/composer.json     | 10 ++-
 .../MediaGallerySynchronization/composer.json | 16 ++---
 .../composer.json                             | 12 ++--
 .../composer.json                             | 16 ++---
 app/code/Magento/MediaGalleryUi/composer.json | 31 ++++----
 .../Magento/MediaGalleryUiApi/composer.json   | 13 ++--
 app/code/Magento/MediaStorage/composer.json   | 30 ++++----
 app/code/Magento/MessageQueue/composer.json   | 16 ++---
 app/code/Magento/Msrp/composer.json           | 28 ++++----
 .../MsrpConfigurableProduct/composer.json     | 20 +++---
 .../Magento/MsrpGroupedProduct/composer.json  | 20 +++---
 app/code/Magento/Multishipping/composer.json  | 34 +++++----
 app/code/Magento/MysqlMq/composer.json        | 18 +++--
 .../Magento/NewRelicReporting/composer.json   | 26 ++++---
 app/code/Magento/Newsletter/composer.json     | 32 ++++-----
 .../Magento/NewsletterGraphQl/composer.json   | 22 +++---
 .../Magento/OfflinePayments/composer.json     | 20 +++---
 .../Magento/OfflineShipping/composer.json     | 36 +++++-----
 app/code/Magento/PageCache/composer.json      | 20 +++---
 app/code/Magento/Payment/composer.json        | 28 ++++----
 app/code/Magento/Paypal/composer.json         | 48 ++++++-------
 app/code/Magento/PaypalCaptcha/composer.json  | 22 +++---
 app/code/Magento/PaypalGraphQl/composer.json  | 34 +++++----
 app/code/Magento/Persistent/composer.json     | 26 ++++---
 app/code/Magento/ProductAlert/composer.json   | 26 ++++---
 app/code/Magento/ProductVideo/composer.json   | 28 ++++----
 app/code/Magento/Quote/composer.json          | 44 ++++++------
 app/code/Magento/QuoteAnalytics/composer.json | 14 ++--
 .../Magento/QuoteBundleOptions/composer.json  | 12 ++--
 .../QuoteConfigurableOptions/composer.json    | 12 ++--
 .../QuoteDownloadableLinks/composer.json      | 12 ++--
 app/code/Magento/QuoteGraphQl/composer.json   | 34 +++++----
 .../RelatedProductGraphQl/composer.json       | 18 +++--
 .../Magento/ReleaseNotification/composer.json | 22 +++---
 app/code/Magento/Reports/composer.json        | 46 ++++++------
 app/code/Magento/RequireJs/composer.json      | 14 ++--
 app/code/Magento/Review/composer.json         | 34 +++++----
 .../Magento/ReviewAnalytics/composer.json     | 14 ++--
 app/code/Magento/ReviewGraphQl/composer.json  | 22 +++---
 app/code/Magento/Robots/composer.json         | 18 +++--
 app/code/Magento/Rss/composer.json            | 20 +++---
 app/code/Magento/Rule/composer.json           | 22 +++---
 app/code/Magento/Sales/composer.json          | 64 ++++++++---------
 app/code/Magento/SalesAnalytics/composer.json | 14 ++--
 app/code/Magento/SalesGraphQl/composer.json   | 24 +++----
 app/code/Magento/SalesInventory/composer.json | 22 +++---
 app/code/Magento/SalesRule/composer.json      | 54 +++++++-------
 app/code/Magento/SalesSequence/composer.json  | 14 ++--
 app/code/Magento/SampleData/composer.json     | 16 ++---
 app/code/Magento/Search/composer.json         | 24 +++----
 app/code/Magento/Security/composer.json       | 22 +++---
 app/code/Magento/SendFriend/composer.json     | 26 ++++---
 .../Magento/SendFriendGraphQl/composer.json   | 16 ++---
 app/code/Magento/Shipping/composer.json       | 46 ++++++------
 app/code/Magento/Sitemap/composer.json        | 34 +++++----
 app/code/Magento/Store/composer.json          | 32 ++++-----
 app/code/Magento/StoreGraphQl/composer.json   | 14 ++--
 app/code/Magento/Swagger/composer.json        | 14 ++--
 app/code/Magento/SwaggerWebapi/composer.json  | 16 ++---
 .../Magento/SwaggerWebapiAsync/composer.json  | 18 +++--
 app/code/Magento/Swatches/composer.json       | 38 +++++-----
 .../Magento/SwatchesGraphQl/composer.json     | 16 ++---
 .../SwatchesLayeredNavigation/composer.json   | 14 ++--
 app/code/Magento/Tax/composer.json            | 44 ++++++------
 app/code/Magento/TaxGraphQl/composer.json     | 16 ++---
 .../Magento/TaxImportExport/composer.json     | 24 +++----
 app/code/Magento/Theme/composer.json          | 40 +++++------
 app/code/Magento/ThemeGraphQl/composer.json   | 14 ++--
 app/code/Magento/Tinymce3/composer.json       | 24 +++----
 app/code/Magento/Translation/composer.json    | 24 +++----
 app/code/Magento/Ui/composer.json             | 26 ++++---
 app/code/Magento/Ups/composer.json            | 30 ++++----
 app/code/Magento/UrlRewrite/composer.json     | 28 ++++----
 .../Magento/UrlRewriteGraphQl/composer.json   | 16 ++---
 app/code/Magento/User/composer.json           | 28 ++++----
 app/code/Magento/Usps/composer.json           | 30 ++++----
 app/code/Magento/Variable/composer.json       | 22 +++---
 app/code/Magento/Vault/composer.json          | 29 ++++----
 app/code/Magento/VaultGraphQl/composer.json   | 14 ++--
 app/code/Magento/Version/composer.json        | 14 ++--
 app/code/Magento/Webapi/composer.json         | 26 ++++---
 app/code/Magento/WebapiAsync/composer.json    | 24 +++----
 app/code/Magento/WebapiSecurity/composer.json | 16 ++---
 app/code/Magento/Weee/composer.json           | 40 +++++------
 app/code/Magento/WeeeGraphQl/composer.json    | 20 +++---
 app/code/Magento/Widget/composer.json         | 30 ++++----
 app/code/Magento/Wishlist/composer.json       | 48 ++++++-------
 .../Magento/WishlistAnalytics/composer.json   | 14 ++--
 .../Magento/WishlistGraphQl/composer.json     | 17 +++--
 .../adminhtml/Magento/backend/composer.json   | 14 ++--
 .../frontend/Magento/blank/composer.json      | 14 ++--
 .../frontend/Magento/luma/composer.json       | 16 ++---
 app/i18n/Magento/de_DE/composer.json          |  6 +-
 app/i18n/Magento/en_US/composer.json          |  6 +-
 app/i18n/Magento/es_ES/composer.json          |  6 +-
 app/i18n/Magento/fr_FR/composer.json          |  6 +-
 app/i18n/Magento/nl_NL/composer.json          |  6 +-
 app/i18n/Magento/pt_BR/composer.json          |  6 +-
 app/i18n/Magento/zh_Hans_CN/composer.json     |  6 +-
 .../Magento/Framework/Amqp/composer.json      | 18 +++--
 .../Magento/Framework/Bulk/composer.json      | 18 +++--
 .../Framework/MessageQueue/composer.json      | 18 +++--
 lib/internal/Magento/Framework/composer.json  | 10 ++-
 215 files changed, 2308 insertions(+), 2739 deletions(-)

diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
index 69a1a44212a2c..cf60b1d88ae55 100644
--- a/app/code/Magento/AdminAnalytics/composer.json
+++ b/app/code/Magento/AdminAnalytics/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-admin-analytics",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-release-notification": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-ui": "*",
+        "magento/module-release-notification": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index 3b3251458449e..d421fc869621b 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-admin-notification",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-config": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
index d5124bdd0953d..ea6a39fba2c3d 100644
--- a/app/code/Magento/AdvancedPricingImportExport/composer.json
+++ b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-advanced-pricing-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-import-export": "101.1.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
index 9da312cc176de..720309b619e43 100644
--- a/app/code/Magento/AdvancedSearch/composer.json
+++ b/app/code/Magento/AdvancedSearch/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-advanced-search",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-search": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-search": "101.1.*",
-        "magento/module-store": "101.1.*",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
         "php": "~7.3.0||~7.4.0"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
index 8faeaa24be85c..9e7a035112b04 100644
--- a/app/code/Magento/Amqp/composer.json
+++ b/app/code/Magento/Amqp/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-amqp",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*",
-        "magento/framework-amqp": "100.4.*",
-        "magento/framework-message-queue": "100.4.*",
+        "magento/framework": "*",
+        "magento/framework-amqp": "*",
+        "magento/framework-message-queue": "*",
         "php": "~7.3.0||~7.4.0"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/AmqpStore/composer.json b/app/code/Magento/AmqpStore/composer.json
index f886ad8cd9217..70a10810ece21 100644
--- a/app/code/Magento/AmqpStore/composer.json
+++ b/app/code/Magento/AmqpStore/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-amqp-store",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*",
-        "magento/framework-amqp": "100.4.*",
-        "magento/module-store": "101.1.*",
+        "magento/framework": "*",
+        "magento/framework-amqp": "*",
+        "magento/module-store": "*",
         "php": "~7.3.0||~7.4.0"
     },
     "suggest": {
-        "magento/module-asynchronous-operations": "100.4.*",
-        "magento/framework-message-queue": "100.4.*"
+        "magento/module-asynchronous-operations": "*",
+        "magento/framework-message-queue": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index 5f635c21979ed..84f8af066bf11 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-integration": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-integration": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
index a70ead26df02c..b5de631418e72 100644
--- a/app/code/Magento/AsynchronousOperations/composer.json
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-asynchronous-operations",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
-        "magento/framework": "103.0.*",
-        "magento/framework-message-queue": "100.4.*",
-        "magento/framework-bulk": "101.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-ui": "101.2.*",
+        "magento/framework": "*",
+        "magento/framework-message-queue": "*",
+        "magento/framework-bulk": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-ui": "*",
         "php": "~7.3.0||~7.4.0"
     },
     "suggest": {
-        "magento/module-admin-notification": "100.4.*",
+        "magento/module-admin-notification": "*",
         "magento/module-logging": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
index 3da4582ee5071..401444404ca3e 100644
--- a/app/code/Magento/Authorization/composer.json
+++ b/app/code/Magento/Authorization/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-authorization",
     "description": "Authorization module provides access to Magento ACL functionality.",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index fc3b62d645bfc..ee5491057d861 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -1,38 +1,37 @@
 {
     "name": "magento/module-backend",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "102.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backup": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-developer": "100.4.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-reports": "100.4.*",
-        "magento/module-require-js": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-security": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-translation": "100.4.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backup": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-developer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-require-js": "*",
+        "magento/module-sales": "*",
+        "magento/module-security": "*",
+        "magento/module-store": "*",
+        "magento/module-translation": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-theme": "101.1.*"
+        "magento/module-theme": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,4 +41,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index 18949cdb04456..9a5904beda550 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-backup",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-cron": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cron": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index 1d584dc896dec..1b5ca24ee098c 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -1,39 +1,38 @@
 {
     "name": "magento/module-bundle",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-catalog-rule": "101.2.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-gift-message": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.4.*",
-        "magento/module-bundle-sample-data": "Sample Data version: 100.4.*",
-        "magento/module-sales-rule": "101.2.*"
+        "magento/module-webapi": "*",
+        "magento/module-bundle-sample-data": "*",
+        "magento/module-sales-rule": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -43,4 +42,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
index 1d0cca1b02786..e3c54719f4d0e 100644
--- a/app/code/Magento/BundleGraphQl/composer.json
+++ b/app/code/Magento/BundleGraphQl/composer.json
@@ -2,23 +2,22 @@
     "name": "magento/module-bundle-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-catalog": "*",
+        "magento/module-bundle": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/module-store": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-graph-ql": "*",
+        "magento/framework": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-bundle": "101.0.*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-quote-graph-ql": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-sales-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
index a1134382212ab..faca3eac9a721 100644
--- a/app/code/Magento/BundleImportExport/composer.json
+++ b/app/code/Magento/BundleImportExport/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-bundle-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-bundle": "101.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-import-export": "101.1.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*"
+        "magento/framework": "*",
+        "magento/module-bundle": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
index 385683d208b10..7801554c890e1 100644
--- a/app/code/Magento/CacheInvalidate/composer.json
+++ b/app/code/Magento/CacheInvalidate/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-cache-invalidate",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-page-cache": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-page-cache": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
index 5f9c0d31d7fbf..3c3aa58c3fe2f 100644
--- a/app/code/Magento/Captcha/composer.json
+++ b/app/code/Magento/Captcha/composer.json
@@ -1,27 +1,26 @@
 {
     "name": "magento/module-captcha",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-authorization": "100.4.*",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*",
+        "magento/module-authorization": "*",
         "laminas/laminas-captcha": "^2.7.1",
         "laminas/laminas-db": "^2.8.2",
         "laminas/laminas-session": "^2.7.3"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,4 +30,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
index 0c560942989fa..8b2989ef915e1 100644
--- a/app/code/Magento/CardinalCommerce/composer.json
+++ b/app/code/Magento/CardinalCommerce/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-cardinal-commerce",
     "description": "Provides a possibility to enable 3-D Secure 2.0 support for payment methods.",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-payment": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 42e7ad2c1d5e8..6dde1d76e5e81 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -1,49 +1,48 @@
 {
     "name": "magento/module-catalog",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "104.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-asynchronous-operations": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-catalog-rule": "101.2.*",
-        "magento/module-catalog-url-rewrite": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-indexer": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-msrp": "100.4.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-product-alert": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-url-rewrite": "102.0.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-wishlist": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-asynchronous-operations": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-checkout": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-indexer": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-msrp": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-product-alert": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-url-rewrite": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-catalog-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-cookie": "*",
+        "magento/module-sales": "*",
+        "magento/module-catalog-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -53,4 +52,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 0efaa58bede19..43fb4c8a6f433 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-catalog-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-analytics": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-analytics": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogCmsGraphQl/composer.json b/app/code/Magento/CatalogCmsGraphQl/composer.json
index 38c79b614b63e..aa7a742f2f315 100644
--- a/app/code/Magento/CatalogCmsGraphQl/composer.json
+++ b/app/code/Magento/CatalogCmsGraphQl/composer.json
@@ -2,22 +2,21 @@
     "name": "magento/module-catalog-cms-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-cms-graph-ql": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-cms-graph-ql": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*",
+        "magento/module-cms": "*",
+        "magento/module-catalog-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogCustomerGraphQl/composer.json b/app/code/Magento/CatalogCustomerGraphQl/composer.json
index ebb5040875c2a..a7c887af0379b 100644
--- a/app/code/Magento/CatalogCustomerGraphQl/composer.json
+++ b/app/code/Magento/CatalogCustomerGraphQl/composer.json
@@ -2,19 +2,18 @@
     "name": "magento/module-catalog-customer-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-store": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/module-store": "101.1.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index 50757cd357a86..46d7454a6d7e2 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -2,27 +2,26 @@
     "name": "magento/module-catalog-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-eav": "102.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-search": "101.1.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-eav-graph-ql": "100.4.*",
-        "magento/module-catalog-search": "102.0.*",
-        "magento/framework": "103.0.*",
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-eav": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "magento/module-eav-graph-ql": "*",
+        "magento/module-catalog-search": "*",
+        "magento/framework": "*",
+        "magento/module-graph-ql": "*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "100.4.*",
-        "magento/module-store-graph-ql": "100.4.*"
+        "magento/module-graph-ql-cache": "*",
+        "magento/module-store-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 9a8ab5adde9fd..92a6620827990 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -1,30 +1,29 @@
 {
     "name": "magento/module-catalog-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-ctype": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-catalog-url-rewrite": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-authorization": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-authorization": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,4 +33,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index e55114501b28a..b810e6613aebb 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-catalog-inventory",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,4 +30,3 @@
     },
     "abandoned": "magento/inventory-composer-metapackage"
 }
-
diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
index 9138144e82c8f..d6d5b01091341 100644
--- a/app/code/Magento/CatalogInventoryGraphQl/composer.json
+++ b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-catalog-inventory-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index e1d4f361ef731..7c40ca8a9a33a 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -1,30 +1,29 @@
 {
     "name": "magento/module-catalog-rule",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-rule": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-import-export": "101.0.*",
-        "magento/module-catalog-rule-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-import-export": "*",
+        "magento/module-catalog-rule-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,4 +33,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
index 95bd798a6f507..19274fbae146f 100644
--- a/app/code/Magento/CatalogRuleConfigurable/composer.json
+++ b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-catalog-rule-configurable",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-rule": "101.2.*",
-        "magento/module-configurable-product": "100.4.*"
+        "magento/module-catalog": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-configurable-product": "*"
     },
     "suggest": {
-        "magento/module-catalog-rule": "101.2.*"
+        "magento/module-catalog-rule": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogRuleGraphQl/composer.json b/app/code/Magento/CatalogRuleGraphQl/composer.json
index aed9eef07394e..c82d9bb20ddab 100644
--- a/app/code/Magento/CatalogRuleGraphQl/composer.json
+++ b/app/code/Magento/CatalogRuleGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-catalog-rule-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-catalog-rule": "101.2.*"
+        "magento/module-catalog-rule": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 201447c73a031..1efece402fd84 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -1,33 +1,32 @@
 {
     "name": "magento/module-catalog-search",
     "description": "Catalog search",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "102.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-indexer": "100.4.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-search": "101.1.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-indexer": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -37,4 +36,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index 16f804631b29b..fe489bcf0a3a0 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -1,30 +1,29 @@
 {
     "name": "magento/module-catalog-url-rewrite",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-import-export": "101.1.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-url-rewrite": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-url-rewrite": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.4.*"
+        "magento/module-webapi": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,4 +33,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
index 20012a583e2ef..3b64d51b85568 100644
--- a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -2,22 +2,21 @@
     "name": "magento/module-catalog-url-rewrite-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/framework": "103.0.*"
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-catalog-url-rewrite": "100.4.*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/module-url-rewrite-graph-ql": "100.4.*"
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-url-rewrite-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
index 0ddbd5d7201dc..305fb3ec47ad6 100644
--- a/app/code/Magento/CatalogWidget/composer.json
+++ b/app/code/Magento/CatalogWidget/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-catalog-widget",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-rule": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-wishlist": "101.2.*",
-        "magento/module-theme": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-theme": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 9474d0942726a..5f7b5425667e5 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -1,41 +1,40 @@
 {
     "name": "magento/module-checkout",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-msrp": "100.4.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-sales-rule": "101.2.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-captcha": "100.4.*",
-        "magento/module-authorization": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-msrp": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-captcha": "*",
+        "magento/module-authorization": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.4.*"
+        "magento/module-cookie": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -45,4 +44,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
index b9e1011bc7172..1741de53e8637 100644
--- a/app/code/Magento/CheckoutAgreements/composer.json
+++ b/app/code/Magento/CheckoutAgreements/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-checkout-agreements",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-checkout": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
index ab59af7c0746f..26b80a4457b4a 100644
--- a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
+++ b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
@@ -2,20 +2,19 @@
     "name": "magento/module-checkout-agreements-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-checkout-agreements": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-checkout-agreements": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 600ea98cceb16..8d69320102b5e 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -1,31 +1,30 @@
 {
     "name": "magento/module-cms",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "104.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-email": "101.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-variable": "100.4.*",
-        "magento/module-widget": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-email": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-variable": "*",
+        "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-cms-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-cms-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,4 +34,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
index e98d8501711c6..0e4c849fe8344 100644
--- a/app/code/Magento/CmsGraphQl/composer.json
+++ b/app/code/Magento/CmsGraphQl/composer.json
@@ -2,23 +2,22 @@
     "name": "magento/module-cms-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-widget": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-graph-ql-cache": "100.4.*",
-        "magento/module-store-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*",
+        "magento/module-graph-ql-cache": "*",
+        "magento/module-store-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index e4c1baef35c36..80e150771975f 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-cms-url-rewrite",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-url-rewrite": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-store": "*",
+        "magento/module-url-rewrite": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
index 5a0f1c6d393ab..d8fbbb4c2e6fd 100644
--- a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
@@ -2,22 +2,21 @@
     "name": "magento/module-cms-url-rewrite-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-url-rewrite-graph-ql": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-store": "*",
+        "magento/module-url-rewrite-graph-ql": "*"
     },
     "suggest": {
-        "magento/module-cms-url-rewrite": "100.4.*",
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-catalog-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 95611a0acecfb..63eca42a6ac48 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-config",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-cron": "100.4.*",
-        "magento/module-deploy": "100.4.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-email": "101.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cron": "*",
+        "magento/module-deploy": "*",
+        "magento/module-directory": "*",
+        "magento/module-email": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index 7da2c2c3b886c..e27510166a421 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-configurable-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-import-export": "101.1.*",
-        "magento/module-configurable-product": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 0e8afa3bbb2f8..7b1b1a18416f5 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -1,39 +1,38 @@
 {
     "name": "magento/module-configurable-product",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-msrp": "100.4.*",
-        "magento/module-webapi": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-sales-rule": "101.2.*",
-        "magento/module-product-video": "100.4.*",
-        "magento/module-configurable-sample-data": "Sample Data version: 100.4.*",
-        "magento/module-product-links-sample-data": "Sample Data version: 100.4.*",
-        "magento/module-tax": "100.4.*"
+        "magento/module-msrp": "*",
+        "magento/module-webapi": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-product-video": "*",
+        "magento/module-configurable-sample-data": "*",
+        "magento/module-product-links-sample-data": "*",
+        "magento/module-tax": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -43,4 +42,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index c2b06b3a8f9e0..295efb65b1978 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -2,21 +2,20 @@
     "name": "magento/module-configurable-product-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-catalog": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-quote": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/framework": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-configurable-product": "100.4.*",
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-quote-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ConfigurableProductSales/composer.json b/app/code/Magento/ConfigurableProductSales/composer.json
index 8b8d2467c58cf..edac2b7782dcc 100644
--- a/app/code/Magento/ConfigurableProductSales/composer.json
+++ b/app/code/Magento/ConfigurableProductSales/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-configurable-product-sales",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-configurable-product": "100.4.*"
+        "magento/module-configurable-product": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index 1eb955166e5e8..1600c1e0c2543 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-contact",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Cookie/composer.json b/app/code/Magento/Cookie/composer.json
index 2a47b375d35d9..5a47a5c7993bf 100644
--- a/app/code/Magento/Cookie/composer.json
+++ b/app/code/Magento/Cookie/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-cookie",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-backend": "102.0.*"
+        "magento/module-backend": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index a40fd986bee27..00da35140744b 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-cron",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Csp/composer.json b/app/code/Magento/Csp/composer.json
index af4759029168b..352735712b1b0 100644
--- a/app/code/Magento/Csp/composer.json
+++ b/app/code/Magento/Csp/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-csp",
     "description": "CSP module enables Content Security Policies for Magento",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CurrencySymbol/composer.json b/app/code/Magento/CurrencySymbol/composer.json
index 8a5536844630f..746cfa0ed033d 100644
--- a/app/code/Magento/CurrencySymbol/composer.json
+++ b/app/code/Magento/CurrencySymbol/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-currency-symbol",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index 51a533c1eda19..db3108a78e9aa 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -1,41 +1,40 @@
 {
     "name": "magento/module-customer",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "103.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-integration": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-newsletter": "100.4.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-wishlist": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-integration": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.4.*",
-        "magento/module-customer-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-cookie": "*",
+        "magento/module-customer-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -45,4 +44,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index 56bca0fb02456..abd9e93d89583 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-customer-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-customer": "*",
+        "magento/module-analytics": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-analytics": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CustomerDownloadableGraphQl/composer.json b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
index 5518f0cb68f6b..f7cdbb0dc86d6 100644
--- a/app/code/Magento/CustomerDownloadableGraphQl/composer.json
+++ b/app/code/Magento/CustomerDownloadableGraphQl/composer.json
@@ -2,20 +2,19 @@
     "name": "magento/module-customer-downloadable-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-downloadable-graph-ql": "100.4.*",
-        "magento/module-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
+        "magento/module-downloadable-graph-ql": "*",
+        "magento/module-graph-ql": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-catalog-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CustomerGraphQl/composer.json b/app/code/Magento/CustomerGraphQl/composer.json
index 82c85db4ce6fa..2ec396ca8ee92 100644
--- a/app/code/Magento/CustomerGraphQl/composer.json
+++ b/app/code/Magento/CustomerGraphQl/composer.json
@@ -2,23 +2,22 @@
     "name": "magento/module-customer-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-authorization": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-integration": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*",
+        "magento/module-directory": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-newsletter": "100.4.*",
-        "magento/module-integration": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/framework": "103.0.*",
-        "magento/module-directory": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 2773a9295f239..8104ea01875a6 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-customer-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index 752b7551777f2..d8668dbb84874 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-deploy",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-require-js": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-config": "*",
+        "magento/module-require-js": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "cli_commands.php",
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index 14c1fb91706a9..c5c949ec45f62 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-developer",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Dhl/composer.json b/app/code/Magento/Dhl/composer.json
index 4f359ba46f25d..d81ae0d7b4969 100644
--- a/app/code/Magento/Dhl/composer.json
+++ b/app/code/Magento/Dhl/composer.json
@@ -1,32 +1,31 @@
 {
     "name": "magento/module-dhl",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-checkout": "100.4.*"
+        "magento/module-checkout": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -36,4 +35,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index d9c54914a790a..e3646d38fe64d 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-directory",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/DirectoryGraphQl/composer.json b/app/code/Magento/DirectoryGraphQl/composer.json
index 3c74e1d497969..ef473e1c43b94 100644
--- a/app/code/Magento/DirectoryGraphQl/composer.json
+++ b/app/code/Magento/DirectoryGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-directory-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-directory": "*",
+        "magento/module-store": "*",
+        "magento/module-graph-ql": "*",
+        "magento/framework": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-directory": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 045bfdd234ffa..992bdbd1e263c 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -1,38 +1,37 @@
 {
     "name": "magento/module-downloadable",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-gift-message": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-downloadable-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-downloadable-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,4 +41,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
index 8eba317d8b413..d03a5953506e5 100644
--- a/app/code/Magento/DownloadableGraphQl/composer.json
+++ b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -2,25 +2,24 @@
     "name": "magento/module-downloadable-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-quote-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/module-sales-graph-ql": "100.4.*"
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-sales-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/DownloadableImportExport/composer.json b/app/code/Magento/DownloadableImportExport/composer.json
index 230c4a04b17ad..6dd7043fc02a9 100644
--- a/app/code/Magento/DownloadableImportExport/composer.json
+++ b/app/code/Magento/DownloadableImportExport/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-downloadable-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-import-export": "101.1.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-import-export": "101.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-import-export": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index b94035e5b518f..5636b0d05841c 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-eav",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "102.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/EavGraphQl/composer.json b/app/code/Magento/EavGraphQl/composer.json
index 962768a55d178..ba4138f67cf62 100644
--- a/app/code/Magento/EavGraphQl/composer.json
+++ b/app/code/Magento/EavGraphQl/composer.json
@@ -2,19 +2,18 @@
     "name": "magento/module-eav-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-eav": "102.1.*"
+        "magento/framework": "*",
+        "magento/module-eav": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index ade8dbeb3429f..b79ae7bc5cc47 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-elasticsearch",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-advanced-search": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-search": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-search": "101.1.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/framework": "103.0.*",
+        "magento/module-advanced-search": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-search": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/framework": "*",
         "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Elasticsearch6/composer.json b/app/code/Magento/Elasticsearch6/composer.json
index f68744be48139..1ee92c0b0a3b3 100644
--- a/app/code/Magento/Elasticsearch6/composer.json
+++ b/app/code/Magento/Elasticsearch6/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-elasticsearch-6",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-advanced-search": "100.4.*",
-        "magento/module-catalog-search": "102.0.*",
-        "magento/module-search": "101.1.*",
-        "magento/module-elasticsearch": "101.0.*",
+        "magento/framework": "*",
+        "magento/module-advanced-search": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-search": "*",
+        "magento/module-elasticsearch": "*",
         "elasticsearch/elasticsearch": "~7.7.0"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Elasticsearch7/composer.json b/app/code/Magento/Elasticsearch7/composer.json
index ab2c52a2b9b32..1e59ceaebaf84 100644
--- a/app/code/Magento/Elasticsearch7/composer.json
+++ b/app/code/Magento/Elasticsearch7/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-elasticsearch-7",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-elasticsearch": "101.0.*",
+        "magento/framework": "*",
+        "magento/module-elasticsearch": "*",
         "elasticsearch/elasticsearch": "~7.7.0",
-        "magento/module-advanced-search": "100.4.*",
-        "magento/module-catalog-search": "102.0.*"
+        "magento/module-advanced-search": "*",
+        "magento/module-catalog-search": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*",
-        "magento/module-search": "101.1.*"
+        "magento/module-config": "*",
+        "magento/module-search": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index c5cee1c6610fd..334bbcf9d4617 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -1,31 +1,30 @@
 {
     "name": "magento/module-email",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-require-js": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-variable": "100.4.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-require-js": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-variable": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-theme": "101.1.*"
+        "magento/module-theme": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,4 +34,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 9efe0d770e7c3..6677a5b181f83 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-encryption-key",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 46835867dde94..575311e148457 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-fedex",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index 389964813fa57..cdf0533c3270d 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -1,31 +1,30 @@
 {
     "name": "magento/module-gift-message",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-eav": "102.1.*",
-        "magento/module-multishipping": "100.4.*"
+        "magento/module-eav": "*",
+        "magento/module-multishipping": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,4 +34,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GiftMessageGraphQl/composer.json b/app/code/Magento/GiftMessageGraphQl/composer.json
index ba8f9ebd37db1..48088f2a48a32 100644
--- a/app/code/Magento/GiftMessageGraphQl/composer.json
+++ b/app/code/Magento/GiftMessageGraphQl/composer.json
@@ -2,19 +2,18 @@
     "name": "magento/module-gift-message-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-gift-message": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-gift-message": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index 8043d7eba9488..a37470115584f 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-google-adwords",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GoogleAnalytics/composer.json b/app/code/Magento/GoogleAnalytics/composer.json
index 3f068a0f8361d..64d210c4f4811 100644
--- a/app/code/Magento/GoogleAnalytics/composer.json
+++ b/app/code/Magento/GoogleAnalytics/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-google-analytics",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cookie": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-cookie": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 2f496d75f9042..426526a922ec8 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-google-optimizer",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-google-analytics": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-cms": "*",
+        "magento/module-google-analytics": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GraphQl/composer.json b/app/code/Magento/GraphQl/composer.json
index ffb6c0fbc7d94..401e77a787acf 100644
--- a/app/code/Magento/GraphQl/composer.json
+++ b/app/code/Magento/GraphQl/composer.json
@@ -2,20 +2,19 @@
     "name": "magento/module-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-eav": "102.1.*",
-        "magento/framework": "103.0.*",
-        "magento/module-webapi": "100.4.*"
+        "magento/module-eav": "*",
+        "magento/framework": "*",
+        "magento/module-webapi": "*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "100.4.*"
+        "magento/module-graph-ql-cache": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GraphQlCache/composer.json b/app/code/Magento/GraphQlCache/composer.json
index 57b470cb512b9..4cfdd0c4f660a 100644
--- a/app/code/Magento/GraphQlCache/composer.json
+++ b/app/code/Magento/GraphQlCache/composer.json
@@ -2,17 +2,16 @@
     "name": "magento/module-graph-ql-cache",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-graph-ql": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-graph-ql": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GroupedCatalogInventory/composer.json b/app/code/Magento/GroupedCatalogInventory/composer.json
index 668bf4428e4ff..0d91d939494a8 100644
--- a/app/code/Magento/GroupedCatalogInventory/composer.json
+++ b/app/code/Magento/GroupedCatalogInventory/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-grouped-catalog-inventory",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-grouped-product": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-grouped-product": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GroupedImportExport/composer.json b/app/code/Magento/GroupedImportExport/composer.json
index 90c595a9e531e..8806058c2bfc8 100644
--- a/app/code/Magento/GroupedImportExport/composer.json
+++ b/app/code/Magento/GroupedImportExport/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-grouped-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-import-export": "101.1.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-grouped-product": "100.4.*",
-        "magento/module-import-export": "101.0.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-import-export": "*",
+        "magento/module-eav": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-import-export": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 2d0958c694875..554b0c239c8fb 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -1,35 +1,34 @@
 {
     "name": "magento/module-grouped-product",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-msrp": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-wishlist": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-msrp": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-grouped-product-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-grouped-product-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -39,4 +38,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/GroupedProductGraphQl/composer.json b/app/code/Magento/GroupedProductGraphQl/composer.json
index e3dd433f606e5..5784acb5f5d04 100644
--- a/app/code/Magento/GroupedProductGraphQl/composer.json
+++ b/app/code/Magento/GroupedProductGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-grouped-product-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-grouped-product": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/framework": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-grouped-product": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 251a477cab76f..3be5c03dc2828 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-ctype": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 9451b257e8a01..07d652e9fa2b5 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-indexer",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 89623cc92d2fe..0807926b755a0 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -6,17 +6,16 @@
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-vault": "101.2.*",
-        "magento/framework": "103.0.*"
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-quote": "*",
+        "magento/module-vault": "*",
+        "magento/framework": "*"
     },
     "autoload": {
         "files": [
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index 34a2e17f4f087..c85e84284b43f 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-integration",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-security": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-user": "101.2.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-security": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/LayeredNavigation/composer.json b/app/code/Magento/LayeredNavigation/composer.json
index 1c8cd342d071e..fa3c90dbbd774 100644
--- a/app/code/Magento/LayeredNavigation/composer.json
+++ b/app/code/Magento/LayeredNavigation/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-layered-navigation",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
index 09f2957e8ab29..e58ec90e8f8bb 100755
--- a/app/code/Magento/LoginAsCustomer/composer.json
+++ b/app/code/Magento/LoginAsCustomer/composer.json
@@ -1,29 +1,25 @@
 {
     "name": "magento/module-login-as-customer",
     "description": "Allow for admin to enter a customer account",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-login-as-customer-api": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-backend": "102.0.*"
+        "magento/module-backend": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomer\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/composer.json b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
index 90694eeb1d1d0..b6291226827a8 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
@@ -1,31 +1,28 @@
 {
     "name": "magento/module-login-as-customer-admin-ui",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
+    "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-login-as-customer-api": "100.4.*",
-        "magento/module-login-as-customer-frontend-ui": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-login-as-customer-frontend-ui": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer": "100.4.*"
+        "magento/module-login-as-customer": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerAdminUi\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerApi/composer.json b/app/code/Magento/LoginAsCustomerApi/composer.json
index ba88a33748821..b48319b61398f 100644
--- a/app/code/Magento/LoginAsCustomerApi/composer.json
+++ b/app/code/Magento/LoginAsCustomerApi/composer.json
@@ -1,23 +1,19 @@
 {
     "name": "magento/module-login-as-customer-api",
     "description": "Allow for admin to enter a customer account",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerApi\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerAssistance/composer.json b/app/code/Magento/LoginAsCustomerAssistance/composer.json
index 9c6ac755ed809..a02852533b950 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/composer.json
+++ b/app/code/Magento/LoginAsCustomerAssistance/composer.json
@@ -1,30 +1,27 @@
 {
     "name": "magento/module-login-as-customer-assistance",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
+    "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-login-as-customer": "100.4.*",
-        "magento/module-login-as-customer-api": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*",
+        "magento/module-login-as-customer": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer-admin-ui": "100.4.*"
+        "magento/module-login-as-customer-admin-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerAssistance\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
index a4d772dd2f0e2..279d8ae3ec79e 100644
--- a/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerFrontendUi/composer.json
@@ -1,25 +1,22 @@
 {
     "name": "magento/module-login-as-customer-frontend-ui",
+    "description": "",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-login-as-customer-api": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*"
-    },
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerFrontendUi\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerLog/composer.json b/app/code/Magento/LoginAsCustomerLog/composer.json
index 85cd7de469078..cf888f8cb1a59 100644
--- a/app/code/Magento/LoginAsCustomerLog/composer.json
+++ b/app/code/Magento/LoginAsCustomerLog/composer.json
@@ -1,30 +1,27 @@
 {
     "name": "magento/module-login-as-customer-log",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
+    "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-login-as-customer-api": "100.4.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-login-as-customer-api": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer": "100.4.*"
+        "magento/module-login-as-customer": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerLog\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
index d16bb45538b09..84d7f2e2a6730 100644
--- a/app/code/Magento/LoginAsCustomerPageCache/composer.json
+++ b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -1,27 +1,24 @@
 {
     "name": "magento/module-login-as-customer-page-cache",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
+    "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-login-as-customer-api": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-page-cache": "100.4.*"
+        "magento/module-page-cache": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
+        "files": [ "registration.php" ],
         "psr-4": {
             "Magento\\LoginAsCustomerPageCache\\": ""
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerQuote/composer.json b/app/code/Magento/LoginAsCustomerQuote/composer.json
index 089cc8d2f2eb0..556ffc0d3be43 100644
--- a/app/code/Magento/LoginAsCustomerQuote/composer.json
+++ b/app/code/Magento/LoginAsCustomerQuote/composer.json
@@ -1,21 +1,21 @@
 {
     "name": "magento/module-login-as-customer-quote",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
+    "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-quote": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-quote": "*"
     },
     "suggest": {
-        "magento/module-login-as-customer-api": "100.4.*"
+        "magento/module-login-as-customer-api": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
index 63295a7cebb8f..3891504e54092 100644
--- a/app/code/Magento/LoginAsCustomerSales/composer.json
+++ b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -1,21 +1,21 @@
 {
     "name": "magento/module-login-as-customer-sales",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
+    "description": "",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-user": "101.2.*",
-        "magento/module-login-as-customer-api": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-user": "*",
+        "magento/module-login-as-customer-api": "*"
     },
     "suggest": {
-        "magento/module-sales": "103.0.*"
+        "magento/module-sales": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Marketplace/composer.json b/app/code/Magento/Marketplace/composer.json
index 442825c378948..42bbcf151a17b 100644
--- a/app/code/Magento/Marketplace/composer.json
+++ b/app/code/Magento/Marketplace/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-marketplace",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaContent/composer.json b/app/code/Magento/MediaContent/composer.json
index 22655d67ab269..4dc2b3eba0f68 100644
--- a/app/code/Magento/MediaContent/composer.json
+++ b/app/code/Magento/MediaContent/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-media-content",
     "description": "Magento module provides the implementation for managing relations between content and media files used in that content",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-content-api": "*",
+        "magento/module-media-gallery-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-content-api": "100.4.*",
-        "magento/module-media-gallery-api": "101.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaContentApi/composer.json b/app/code/Magento/MediaContentApi/composer.json
index a89c7e1a56c58..fd1f2f9a0f265 100644
--- a/app/code/Magento/MediaContentApi/composer.json
+++ b/app/code/Magento/MediaContentApi/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-media-content-api",
     "description": "Magento module provides the API interfaces for managing relations between content and media files used in that content",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-media-gallery-api": "*",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,4 +20,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaContentCatalog/composer.json b/app/code/Magento/MediaContentCatalog/composer.json
index c8c82ce54e609..2b19bc95f6ed3 100644
--- a/app/code/Magento/MediaContentCatalog/composer.json
+++ b/app/code/Magento/MediaContentCatalog/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-media-content-catalog",
     "description": "Magento module provides the implementation of MediaContent functionality for Magento_Catalog module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-media-content-api": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-media-content-api": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-store": "101.1.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaContentCms/composer.json b/app/code/Magento/MediaContentCms/composer.json
index 5ab23bff4aa6e..ea32fdd7a49fa 100644
--- a/app/code/Magento/MediaContentCms/composer.json
+++ b/app/code/Magento/MediaContentCms/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-media-content-cms",
     "description": "Magento module provides the implementation of MediaContent functionality for Magento_Cms module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/module-media-content-api": "*",
+        "magento/module-cms": "*",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/module-media-content-api": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaContentSynchronization/composer.json b/app/code/Magento/MediaContentSynchronization/composer.json
index c69fad7fc8ceb..c4ee6ca1b0cf3 100644
--- a/app/code/Magento/MediaContentSynchronization/composer.json
+++ b/app/code/Magento/MediaContentSynchronization/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-media-content-synchronization",
     "description": "Magento module provides implementation of the media content data synchronization.",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/framework-bulk": "*",
-        "magento/module-media-content-synchronization-api": "100.4.*",
-        "magento/module-media-content-api": "100.4.*",
-        "magento/module-asynchronous-operations": "*"
+        "magento/module-media-content-synchronization-api": "*",
+        "magento/module-media-content-api": "*",
+        "magento/framework-message-queue": "*"
     },
     "suggest": {
-        "magento/module-media-gallery-synchronization": "100.4.*"
+        "magento/module-media-gallery-synchronization": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
diff --git a/app/code/Magento/MediaContentSynchronizationApi/composer.json b/app/code/Magento/MediaContentSynchronizationApi/composer.json
index bc31a91df288b..398aaf1de8071 100644
--- a/app/code/Magento/MediaContentSynchronizationApi/composer.json
+++ b/app/code/Magento/MediaContentSynchronizationApi/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-media-content-synchronization-api",
     "description": "Magento module responsible for the media content synchronization implementation API",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-content-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-content-api": "*"
-    },
     "autoload": {
         "files": [
             "registration.php"
diff --git a/app/code/Magento/MediaContentSynchronizationCatalog/composer.json b/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
index b4746f335a654..733f29d3a42c2 100644
--- a/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
+++ b/app/code/Magento/MediaContentSynchronizationCatalog/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-media-content-synchronization-catalog",
     "description": "Magento module provides the implementation of MediaContentSynchronization functionality for Magento_Catalog module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-content-synchronization-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-media-content-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-content-synchronization-api": "100.4.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*",
-        "magento/module-media-content-api": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaContentSynchronizationCms/composer.json b/app/code/Magento/MediaContentSynchronizationCms/composer.json
index 1e83d61ae1b8c..9028b9dacd0a2 100644
--- a/app/code/Magento/MediaContentSynchronizationCms/composer.json
+++ b/app/code/Magento/MediaContentSynchronizationCms/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-media-content-synchronization-cms",
     "description": "Magento module provides the implementation of MediaContentSynchronization functionality for Magento_Cms module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-content-synchronization-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-media-content-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-content-synchronization-api": "100.4.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*",
-        "magento/module-media-content-api": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGallery/composer.json b/app/code/Magento/MediaGallery/composer.json
index ff098785c27c6..d430a174a9738 100644
--- a/app/code/Magento/MediaGallery/composer.json
+++ b/app/code/Magento/MediaGallery/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-media-gallery",
     "description": "Magento module responsible for media handling",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-cms": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-cms": "104.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryApi/composer.json b/app/code/Magento/MediaGalleryApi/composer.json
index d2b6985699c72..8bea8ee95b55a 100644
--- a/app/code/Magento/MediaGalleryApi/composer.json
+++ b/app/code/Magento/MediaGalleryApi/composer.json
@@ -1,16 +1,15 @@
 {
     "name": "magento/module-media-gallery-api",
     "description": "Magento module responsible for media gallery asset attributes storage and management",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "101.0.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,4 +19,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryCatalog/composer.json b/app/code/Magento/MediaGalleryCatalog/composer.json
index c77e76985cc89..192d86684aa76 100644
--- a/app/code/Magento/MediaGalleryCatalog/composer.json
+++ b/app/code/Magento/MediaGalleryCatalog/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-media-gallery-catalog",
     "description": "Magento module responsible for catalog gallery processor delete operation handling",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-catalog": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-catalog": "104.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryCatalogIntegration/composer.json b/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
index 80e8d398a0086..efabb70da9f39 100644
--- a/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
+++ b/app/code/Magento/MediaGalleryCatalogIntegration/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-media-gallery-catalog-integration",
     "description": "Magento module responsible for extending catalog image uploader functionality",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*",
-        "magento/module-media-gallery-ui-api": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-media-gallery-ui-api": "*"
     },
     "suggest": {
-        "magento/module-catalog": "104.0.*"
+        "magento/module-catalog": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryCatalogUi/composer.json b/app/code/Magento/MediaGalleryCatalogUi/composer.json
index 2299ec3079b35..985d581beff25 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/composer.json
+++ b/app/code/Magento/MediaGalleryCatalogUi/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-media-gallery-catalog-ui",
     "description": "Magento module that implement category grid for media gallery.",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryCmsUi/composer.json b/app/code/Magento/MediaGalleryCmsUi/composer.json
index f45a802a86e00..1ecfb9a3c8855 100644
--- a/app/code/Magento/MediaGalleryCmsUi/composer.json
+++ b/app/code/Magento/MediaGalleryCmsUi/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-media-gallery-cms-ui",
     "description": "Cms related UI elements in the magento media gallery",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-cms": "*",
+        "magento/module-backend": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-backend": "102.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryIntegration/composer.json b/app/code/Magento/MediaGalleryIntegration/composer.json
index 61db48751bd94..a9709da81222e 100644
--- a/app/code/Magento/MediaGalleryIntegration/composer.json
+++ b/app/code/Magento/MediaGalleryIntegration/composer.json
@@ -1,24 +1,26 @@
 {
     "name": "magento/module-media-gallery-integration",
     "description": "Magento module responsible for integration of enhanced media gallery",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-ui-api": "100.4.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-media-gallery-ui-api": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-ui": "*"
+    },
+    "require-dev": {
+        "magento/module-cms": "*"
     },
     "suggest": {
-        "magento/module-catalog": "104.0.*",
-        "magento/module-cms": "104.0.*"
+        "magento/module-catalog": "*",
+        "magento/module-cms": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,9 +28,5 @@
         "psr-4": {
             "Magento\\MediaGalleryIntegration\\": ""
         }
-    },
-    "require-dev": {
-        "magento/module-cms": "*"
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryMetadata/composer.json b/app/code/Magento/MediaGalleryMetadata/composer.json
index 0c085040ed450..c2ce66ce64c36 100644
--- a/app/code/Magento/MediaGalleryMetadata/composer.json
+++ b/app/code/Magento/MediaGalleryMetadata/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-media-gallery-metadata",
     "description": "Magento module responsible for images metadata processing",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-metadata-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-metadata-api": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,4 +20,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryMetadataApi/composer.json b/app/code/Magento/MediaGalleryMetadataApi/composer.json
index 9ad2057bf30d9..f8673884b050c 100644
--- a/app/code/Magento/MediaGalleryMetadataApi/composer.json
+++ b/app/code/Magento/MediaGalleryMetadataApi/composer.json
@@ -1,16 +1,15 @@
 {
     "name": "magento/module-media-gallery-metadata-api",
     "description": "Magento module responsible for media gallery metadata implementation API",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,4 +19,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGallerySynchronization/composer.json b/app/code/Magento/MediaGallerySynchronization/composer.json
index cd07f2b07e396..f9d642dd02568 100644
--- a/app/code/Magento/MediaGallerySynchronization/composer.json
+++ b/app/code/Magento/MediaGallerySynchronization/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-media-gallery-synchronization",
     "description": "Magento module provides implementation of the media gallery data synchronization.",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/framework-message-queue": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*",
-        "magento/framework-message-queue": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGallerySynchronizationApi/composer.json b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
index 7c07b904301df..19bab75dd5f42 100644
--- a/app/code/Magento/MediaGallerySynchronizationApi/composer.json
+++ b/app/code/Magento/MediaGallerySynchronizationApi/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-media-gallery-synchronization-api",
     "description": "Magento module responsible for the media gallery synchronization implementation API",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,4 +20,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json b/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
index c037034b9f216..0674014026b24 100644
--- a/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
+++ b/app/code/Magento/MediaGallerySynchronizationMetadata/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-media-gallery-synchronization-metadata",
     "description": "Magento module responsible for images metadata synchronization",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-metadata-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-media-gallery-metadata-api": "100.4.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MediaGalleryUi/composer.json b/app/code/Magento/MediaGalleryUi/composer.json
index 938c6e3f097bf..204e0b37c3bf8 100644
--- a/app/code/Magento/MediaGalleryUi/composer.json
+++ b/app/code/Magento/MediaGalleryUi/composer.json
@@ -1,27 +1,26 @@
 {
     "name": "magento/module-media-gallery-ui",
     "description": "Magento module responsible for the media gallery UI implementation",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-media-gallery-ui-api": "100.4.*",
-        "magento/module-media-gallery-api": "101.0.*",
-        "magento/module-media-gallery-metadata-api": "100.4.*",
-        "magento/module-media-gallery-synchronization-api": "100.4.*",
-        "magento/module-media-content-api": "100.4.*",
-        "magento/module-cms": "104.0.*",
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-ui": "*",
+        "magento/module-store": "*",
+        "magento/module-media-gallery-ui-api": "*",
+        "magento/module-media-gallery-api": "*",
+        "magento/module-media-gallery-metadata-api": "*",
+        "magento/module-media-gallery-synchronization-api": "*",
+        "magento/module-media-content-api": "*",
+        "magento/module-cms": "*",
         "magento/module-directory": "*",
         "magento/module-authorization": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
diff --git a/app/code/Magento/MediaGalleryUiApi/composer.json b/app/code/Magento/MediaGalleryUiApi/composer.json
index cb31d2a42dc67..d577f50523f13 100644
--- a/app/code/Magento/MediaGalleryUiApi/composer.json
+++ b/app/code/Magento/MediaGalleryUiApi/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-media-gallery-ui-api",
     "description": "Magento module responsible for the media gallery UI implementation API",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "suggest": {
         "magento/module-cms": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
diff --git a/app/code/Magento/MediaStorage/composer.json b/app/code/Magento/MediaStorage/composer.json
index f82969d6a90d3..cb1057febb23e 100644
--- a/app/code/Magento/MediaStorage/composer.json
+++ b/app/code/Magento/MediaStorage/composer.json
@@ -1,27 +1,26 @@
 {
     "name": "magento/module-media-storage",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/framework-bulk": "101.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-asynchronous-operations": "100.4.*",
-        "magento/module-authorization": "100.4.*"
+        "magento/framework": "*",
+        "magento/framework-bulk": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-theme": "*",
+        "magento/module-asynchronous-operations": "*",
+        "magento/module-authorization": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,4 +30,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
index 994288c14f5c9..57603f0a73acc 100644
--- a/app/code/Magento/MessageQueue/composer.json
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -1,21 +1,20 @@
 {
     "name": "magento/module-message-queue",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
-        "magento/framework": "103.0.*",
-        "magento/framework-message-queue": "100.4.*",
+        "magento/framework": "*",
+        "magento/framework-message-queue": "*",
         "magento/magento-composer-installer": "*",
         "php": "~7.3.0||~7.4.0"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 29f328a219ac1..5c9d2e4cf58fa 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-msrp",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*"
     },
     "suggest": {
-        "magento/module-bundle": "101.0.*",
-        "magento/module-msrp-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-bundle": "*",
+        "magento/module-msrp-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MsrpConfigurableProduct/composer.json b/app/code/Magento/MsrpConfigurableProduct/composer.json
index 352971f7772dc..53d274a3c4006 100644
--- a/app/code/Magento/MsrpConfigurableProduct/composer.json
+++ b/app/code/Magento/MsrpConfigurableProduct/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-msrp-configurable-product",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-msrp": "100.4.*",
-        "magento/module-configurable-product": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-msrp": "*",
+        "magento/module-configurable-product": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MsrpGroupedProduct/composer.json b/app/code/Magento/MsrpGroupedProduct/composer.json
index b77c21b583595..5c426b5910ad7 100644
--- a/app/code/Magento/MsrpGroupedProduct/composer.json
+++ b/app/code/Magento/MsrpGroupedProduct/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-msrp-grouped-product",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-msrp": "100.4.*",
-        "magento/module-grouped-product": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-msrp": "*",
+        "magento/module-grouped-product": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 77ff7f8fdec33..8834603562332 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -1,29 +1,28 @@
 {
     "name": "magento/module-multishipping",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-captcha": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-captcha": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,4 +32,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
index 508adbcf69acc..225b3a091a462 100644
--- a/app/code/Magento/MysqlMq/composer.json
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-mysql-mq",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*",
-        "magento/framework-message-queue": "100.4.*",
+        "magento/framework": "*",
+        "magento/framework-message-queue": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-store": "101.1.*",
+        "magento/module-store": "*",
         "php": "~7.3.0||~7.4.0"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index c098476a0af20..ca4c72d5a3aad 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-new-relic-reporting",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-configurable-product": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 3ef7c63be0459..790370c328644 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-newsletter",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-email": "101.1.*",
-        "magento/module-require-js": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cms": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-email": "*",
+        "magento/module-require-js": "*",
+        "magento/module-store": "*",
+        "magento/module-widget": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/NewsletterGraphQl/composer.json b/app/code/Magento/NewsletterGraphQl/composer.json
index e55f7915448bb..92352a8a9adfe 100644
--- a/app/code/Magento/NewsletterGraphQl/composer.json
+++ b/app/code/Magento/NewsletterGraphQl/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-newsletter-graph-ql",
     "description": "Provides GraphQl functionality for the newsletter subscriptions.",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
+    "type": "magento2-module",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-newsletter": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-customer": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/OfflinePayments/composer.json b/app/code/Magento/OfflinePayments/composer.json
index 3b88c1161e932..56c7eb2778c48 100644
--- a/app/code/Magento/OfflinePayments/composer.json
+++ b/app/code/Magento/OfflinePayments/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-offline-payments",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-payment": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-payment": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 00e5e2deedc31..7cd6f05f8ad1c 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -1,32 +1,31 @@
 {
     "name": "magento/module-offline-shipping",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-sales-rule": "101.2.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-checkout": "100.4.*",
-        "magento/module-offline-shipping-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-checkout": "*",
+        "magento/module-offline-shipping-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -36,4 +35,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 991f2967e0fc9..506fd54886d92 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-page-cache",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-config": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index 37df1e5c84606..72246c5698f80 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-payment",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index e71f4eee3450c..1b35fae2de1bc 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -1,39 +1,38 @@
 {
     "name": "magento/module-paypal",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-instant-purchase": "100.4.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-vault": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-instant-purchase": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-vault": "*"
     },
     "suggest": {
-        "magento/module-checkout-agreements": "100.4.*"
+        "magento/module-checkout-agreements": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -43,4 +42,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/PaypalCaptcha/composer.json b/app/code/Magento/PaypalCaptcha/composer.json
index bedfad57a4090..b88eb2f1a552e 100644
--- a/app/code/Magento/PaypalCaptcha/composer.json
+++ b/app/code/Magento/PaypalCaptcha/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-paypal-captcha",
     "description": "Provides CAPTCHA validation for PayPal Payflow Pro",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-captcha": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-captcha": "*",
+        "magento/module-checkout": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-paypal": "101.0.*"
+        "magento/module-paypal": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/PaypalGraphQl/composer.json b/app/code/Magento/PaypalGraphQl/composer.json
index 00d549a1f86ee..285217da64d72 100644
--- a/app/code/Magento/PaypalGraphQl/composer.json
+++ b/app/code/Magento/PaypalGraphQl/composer.json
@@ -1,31 +1,30 @@
 {
     "name": "magento/module-paypal-graph-ql",
     "description": "GraphQl support for Paypal",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-paypal": "101.0.*",
-        "magento/module-quote-graph-ql": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-vault": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-quote": "*",
+        "magento/module-checkout": "*",
+        "magento/module-paypal": "*",
+        "magento/module-quote-graph-ql": "*",
+        "magento/module-sales": "*",
+        "magento/module-payment": "*",
+        "magento/module-store": "*",
+        "magento/module-vault": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-store-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*",
+        "magento/module-store-graph-ql": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,4 +34,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Persistent/composer.json b/app/code/Magento/Persistent/composer.json
index 5a260afc1947e..68fe5cb47c00e 100644
--- a/app/code/Magento/Persistent/composer.json
+++ b/app/code/Magento/Persistent/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-persistent",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-cron": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-cron": "*",
+        "magento/module-customer": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ProductAlert/composer.json b/app/code/Magento/ProductAlert/composer.json
index 69753d3edaf70..bfe2a43b373ce 100644
--- a/app/code/Magento/ProductAlert/composer.json
+++ b/app/code/Magento/ProductAlert/composer.json
@@ -1,27 +1,26 @@
 {
     "name": "magento/module-product-alert",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,4 +30,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index 38c1e2aa09fc0..b7268338398a7 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -1,29 +1,28 @@
 {
     "name": "magento/module-product-video",
     "description": "Add Video to Products",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-customer": "103.0.*",
-        "magento/module-config": "101.2.*"
+        "magento/module-customer": "*",
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,4 +32,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index fa7f2430f1c2e..31312fae26e78 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -1,36 +1,35 @@
 {
     "name": "magento/module-quote",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-sales-sequence": "100.4.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-payment": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*"
     },
     "suggest": {
-        "magento/module-webapi": "100.4.*"
+        "magento/module-webapi": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -40,4 +39,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index 19e70e0326d57..4bfb7172c4c83 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-quote-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*",
+        "magento/module-analytics": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-analytics": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/QuoteBundleOptions/composer.json b/app/code/Magento/QuoteBundleOptions/composer.json
index 2d6cd95f82761..a2651272018a8 100644
--- a/app/code/Magento/QuoteBundleOptions/composer.json
+++ b/app/code/Magento/QuoteBundleOptions/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-quote-bundle-options",
     "description": "Magento module provides data provider for creating buy request for bundle products",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,4 +20,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/QuoteConfigurableOptions/composer.json b/app/code/Magento/QuoteConfigurableOptions/composer.json
index 0411ce38850c3..51d6933d5c6d6 100644
--- a/app/code/Magento/QuoteConfigurableOptions/composer.json
+++ b/app/code/Magento/QuoteConfigurableOptions/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-quote-configurable-options",
     "description": "Magento module provides data provider for creating buy request for configurable products",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,4 +20,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/QuoteDownloadableLinks/composer.json b/app/code/Magento/QuoteDownloadableLinks/composer.json
index a098f1c196fd1..ad120dea96263 100644
--- a/app/code/Magento/QuoteDownloadableLinks/composer.json
+++ b/app/code/Magento/QuoteDownloadableLinks/composer.json
@@ -1,17 +1,16 @@
 {
     "name": "magento/module-quote-downloadable-links",
     "description": "Magento module provides data provider for creating buy request for links of downloadable products",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-quote": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -21,4 +20,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/QuoteGraphQl/composer.json b/app/code/Magento/QuoteGraphQl/composer.json
index 9327504d78941..25f089cf75a62 100644
--- a/app/code/Magento/QuoteGraphQl/composer.json
+++ b/app/code/Magento/QuoteGraphQl/composer.json
@@ -2,28 +2,27 @@
     "name": "magento/module-quote-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-customer-graph-ql": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-gift-message": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-quote": "*",
+        "magento/module-checkout": "*",
+        "magento/module-catalog": "*",
+        "magento/module-store": "*",
+        "magento/module-customer": "*",
+        "magento/module-customer-graph-ql": "*",
+        "magento/module-sales": "*",
+        "magento/module-directory": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-gift-message": "*"
     },
     "suggest": {
-        "magento/module-graph-ql-cache": "100.4.*"
+        "magento/module-graph-ql-cache": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,4 +32,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/RelatedProductGraphQl/composer.json b/app/code/Magento/RelatedProductGraphQl/composer.json
index 5b2fa809ef789..2cb851d56e58e 100644
--- a/app/code/Magento/RelatedProductGraphQl/composer.json
+++ b/app/code/Magento/RelatedProductGraphQl/composer.json
@@ -2,20 +2,19 @@
     "name": "magento/module-related-product-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/framework": "103.0.*"
+        "magento/module-catalog": "*",
+        "magento/module-catalog-graph-ql": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,4 +24,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index d59f25a07b456..c2e347bc66ef0 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-release-notification",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-user": "101.2.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-ui": "101.2.*",
-        "magento/framework": "103.0.*"
+        "magento/module-user": "*",
+        "magento/module-backend": "*",
+        "magento/module-ui": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 1560ed99b6971..f1fe6c1e2c83a 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -1,35 +1,34 @@
 {
     "name": "magento/module-reports",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-review": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-sales-rule": "101.2.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-wishlist": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-eav": "*",
+        "magento/module-quote": "*",
+        "magento/module-review": "*",
+        "magento/module-sales": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -39,4 +38,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/RequireJs/composer.json b/app/code/Magento/RequireJs/composer.json
index 9835ed7a6d9d9..9c3b84e88df53 100644
--- a/app/code/Magento/RequireJs/composer.json
+++ b/app/code/Magento/RequireJs/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-require-js",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 530828348fe3d..5a428ae15fd67 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -1,31 +1,30 @@
 {
     "name": "magento/module-review",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-newsletter": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-newsletter": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-cookie": "100.4.*",
-        "magento/module-review-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-cookie": "*",
+        "magento/module-review-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,4 +34,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index 04f8f7b96deb4..d18ec43a93ac1 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-review-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-review": "*",
+        "magento/module-analytics": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-review": "100.4.*",
-        "magento/module-analytics": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ReviewGraphQl/composer.json b/app/code/Magento/ReviewGraphQl/composer.json
index 9bb3d32aa62b5..819ddefd76213 100644
--- a/app/code/Magento/ReviewGraphQl/composer.json
+++ b/app/code/Magento/ReviewGraphQl/composer.json
@@ -2,22 +2,21 @@
     "name": "magento/module-review-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-review": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/framework": "103.0.*"
+        "magento/module-catalog": "*",
+        "magento/module-review": "*",
+        "magento/module-store": "*",
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-graph-ql-cache": "100.4.*"
+        "magento/module-graph-ql": "*",
+        "magento/module-graph-ql-cache": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Robots/composer.json b/app/code/Magento/Robots/composer.json
index 486a817d02118..2035010b0ce8b 100644
--- a/app/code/Magento/Robots/composer.json
+++ b/app/code/Magento/Robots/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-robots",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.1.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-theme": "101.1.*"
+        "magento/module-theme": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index 26493fdcd774d..bd845acc12f9a 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-rss",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Rule/composer.json b/app/code/Magento/Rule/composer.json
index 882c7a7660bda..0ab2b6780dcad 100644
--- a/app/code/Magento/Rule/composer.json
+++ b/app/code/Magento/Rule/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-rule",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-eav": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index 12f4188747357..411ad3739d560 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -1,46 +1,45 @@
 {
     "name": "magento/module-sales",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "103.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-bundle": "101.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-gift-message": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-reports": "100.4.*",
-        "magento/module-sales-rule": "101.2.*",
-        "magento/module-sales-sequence": "100.4.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-wishlist": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-bundle": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-gift-message": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-sales-rule": "*",
+        "magento/module-sales-sequence": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-widget": "*",
+        "magento/module-wishlist": "*"
     },
     "suggest": {
-        "magento/module-sales-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-sales-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -50,4 +49,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index 5e57e330c1c5f..ca7926f2d8b5a 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-sales-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-analytics": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-analytics": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
index 1d7cf3da05685..b85d8c0f852da 100644
--- a/app/code/Magento/SalesGraphQl/composer.json
+++ b/app/code/Magento/SalesGraphQl/composer.json
@@ -2,22 +2,21 @@
     "name": "magento/module-sales-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-catalog": "*",
+        "magento/module-tax": "*",
+        "magento/module-quote": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-shipping": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-graph-ql": "100.4.*",
-        "magento/module-shipping": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SalesInventory/composer.json b/app/code/Magento/SalesInventory/composer.json
index fbf4820f4d110..6a91b04a7c0d9 100644
--- a/app/code/Magento/SalesInventory/composer.json
+++ b/app/code/Magento/SalesInventory/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-sales-inventory",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 65fd55a2b3806..572e191093275 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -1,41 +1,40 @@
 {
     "name": "magento/module-sales-rule",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-rule": "101.2.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-reports": "100.4.*",
-        "magento/module-rule": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-widget": "101.2.*",
-        "magento/module-captcha": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-authorization": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-rule": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-rule": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-widget": "*",
+        "magento/module-captcha": "*",
+        "magento/module-checkout": "*",
+        "magento/module-authorization": "*"
     },
     "suggest": {
-        "magento/module-sales-rule-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-sales-rule-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -45,4 +44,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SalesSequence/composer.json b/app/code/Magento/SalesSequence/composer.json
index a39c350628c8a..a0f9cb45cafc8 100644
--- a/app/code/Magento/SalesSequence/composer.json
+++ b/app/code/Magento/SalesSequence/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-sales-sequence",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index baa802aa8753c..30efc94bc9274 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -1,22 +1,21 @@
 {
     "name": "magento/module-sample-data",
     "description": "Sample Data fixtures",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/sample-data-media": "Sample Data version: 100.4.*"
+        "magento/sample-data-media": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "cli_commands.php",
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index 945a016262d2b..3df1dc5935ad8 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-search",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog-search": "102.0.*",
-        "magento/module-reports": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog-search": "*",
+        "magento/module-reports": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Security/composer.json b/app/code/Magento/Security/composer.json
index 6b3ac2c37ef29..4978f0c628f96 100644
--- a/app/code/Magento/Security/composer.json
+++ b/app/code/Magento/Security/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-security",
     "description": "Security management module",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-customer": "103.0.*"
+        "magento/module-customer": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SendFriend/composer.json b/app/code/Magento/SendFriend/composer.json
index cf8ef2f923eb3..17c908ab33e3e 100644
--- a/app/code/Magento/SendFriend/composer.json
+++ b/app/code/Magento/SendFriend/composer.json
@@ -1,25 +1,24 @@
 {
     "name": "magento/module-send-friend",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-captcha": "100.4.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-theme": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-customer": "*",
+        "magento/module-store": "*",
+        "magento/module-captcha": "*",
+        "magento/module-authorization": "*",
+        "magento/module-theme": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +28,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SendFriendGraphQl/composer.json b/app/code/Magento/SendFriendGraphQl/composer.json
index b0ce37458b1c5..456780c1c1841 100644
--- a/app/code/Magento/SendFriendGraphQl/composer.json
+++ b/app/code/Magento/SendFriendGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-send-friend-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-send-friend": "*",
+        "magento/module-graph-ql": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-send-friend": "100.4.*",
-        "magento/module-graph-ql": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index ca9c0486b25df..5ea8430226ad8 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -1,38 +1,37 @@
 {
     "name": "magento/module-shipping",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-gd": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-contact": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-contact": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-fedex": "100.4.*",
-        "magento/module-ups": "100.4.*",
-        "magento/module-config": "101.2.*"
+        "magento/module-fedex": "*",
+        "magento/module-ups": "*",
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,4 +41,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 64ab7b60e17ab..6a9f20ac8bddf 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -1,31 +1,30 @@
 {
     "name": "magento/module-sitemap",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-url-rewrite": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-robots": "101.1.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-robots": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -35,4 +34,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index 870a77578672b..e6f7f0d5ac274 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -1,30 +1,29 @@
 {
     "name": "magento/module-store",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-ui": "*",
+        "magento/module-customer": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*"
     },
     "suggest": {
-        "magento/module-deploy": "100.4.*"
+        "magento/module-deploy": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -34,4 +33,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/StoreGraphQl/composer.json b/app/code/Magento/StoreGraphQl/composer.json
index 42023b2403e91..a7cab5851a9ee 100644
--- a/app/code/Magento/StoreGraphQl/composer.json
+++ b/app/code/Magento/StoreGraphQl/composer.json
@@ -2,17 +2,16 @@
     "name": "magento/module-store-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-graph-ql": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-graph-ql": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Swagger/composer.json b/app/code/Magento/Swagger/composer.json
index 2cffb5d716d54..759e72350b0a6 100644
--- a/app/code/Magento/Swagger/composer.json
+++ b/app/code/Magento/Swagger/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-swagger",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SwaggerWebapi/composer.json b/app/code/Magento/SwaggerWebapi/composer.json
index 09c078448232d..78021f7cb4ec5 100644
--- a/app/code/Magento/SwaggerWebapi/composer.json
+++ b/app/code/Magento/SwaggerWebapi/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-swagger-webapi",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-swagger": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-swagger": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json
index d42e387499e8a..283b2fe1f1758 100644
--- a/app/code/Magento/SwaggerWebapiAsync/composer.json
+++ b/app/code/Magento/SwaggerWebapiAsync/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-swagger-webapi-async",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-swagger": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-swagger": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 4198e66b8f06a..2c9b7a03ba011 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -1,33 +1,32 @@
 {
     "name": "magento/module-swatches",
     "description": "Add Swatches to Products",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-configurable-product": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-config": "*",
+        "magento/module-configurable-product": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*"
     },
     "suggest": {
-        "magento/module-layered-navigation": "100.4.*",
-        "magento/module-swatches-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-layered-navigation": "*",
+        "magento/module-swatches-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -37,4 +36,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SwatchesGraphQl/composer.json b/app/code/Magento/SwatchesGraphQl/composer.json
index 87d6ff61e5fe2..1b98b4044a2ff 100644
--- a/app/code/Magento/SwatchesGraphQl/composer.json
+++ b/app/code/Magento/SwatchesGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-swatches-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-swatches": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-graph-ql": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.1",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-swatches": "100.4.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-graph-ql": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/SwatchesLayeredNavigation/composer.json b/app/code/Magento/SwatchesLayeredNavigation/composer.json
index f0f794db094f2..3b987f8096f18 100644
--- a/app/code/Magento/SwatchesLayeredNavigation/composer.json
+++ b/app/code/Magento/SwatchesLayeredNavigation/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-swatches-layered-navigation",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/magento-composer-installer": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 1b43e4c5ac6fd..2fe0597c85a63 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -1,36 +1,35 @@
 {
     "name": "magento/module-tax",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-reports": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-reports": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-tax-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-tax-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -40,4 +39,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/TaxGraphQl/composer.json b/app/code/Magento/TaxGraphQl/composer.json
index 0b4805fe24493..b97e414cacb67 100644
--- a/app/code/Magento/TaxGraphQl/composer.json
+++ b/app/code/Magento/TaxGraphQl/composer.json
@@ -2,19 +2,18 @@
     "name": "magento/module-tax-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-tax": "100.4.*",
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-tax": "*",
+        "magento/module-catalog-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/TaxImportExport/composer.json b/app/code/Magento/TaxImportExport/composer.json
index 0d4ea14db838f..01c069b4299c1 100644
--- a/app/code/Magento/TaxImportExport/composer.json
+++ b/app/code/Magento/TaxImportExport/composer.json
@@ -1,24 +1,23 @@
 {
     "name": "magento/module-tax-import-export",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-directory": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -28,4 +27,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 97e1664ed563e..63779c6f9bf5d 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -1,34 +1,33 @@
 {
     "name": "magento/module-theme",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.1.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-media-storage": "100.4.*",
-        "magento/module-require-js": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-widget": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-cms": "*",
+        "magento/module-config": "*",
+        "magento/module-customer": "*",
+        "magento/module-eav": "*",
+        "magento/module-media-storage": "*",
+        "magento/module-require-js": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-theme-sample-data": "Sample Data version: 100.4.*",
-        "magento/module-deploy": "100.4.*",
-        "magento/module-directory": "100.4.*"
+        "magento/module-theme-sample-data": "*",
+        "magento/module-deploy": "*",
+        "magento/module-directory": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -38,4 +37,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/ThemeGraphQl/composer.json b/app/code/Magento/ThemeGraphQl/composer.json
index d2308d43f1670..cee740d449b37 100644
--- a/app/code/Magento/ThemeGraphQl/composer.json
+++ b/app/code/Magento/ThemeGraphQl/composer.json
@@ -2,18 +2,17 @@
     "name": "magento/module-theme-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
     "suggest": {
-        "magento/module-store-graph-ql": "100.4.*"
+        "magento/module-store-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Tinymce3/composer.json b/app/code/Magento/Tinymce3/composer.json
index b5ab9f5d6b680..0b8cf6824295e 100644
--- a/app/code/Magento/Tinymce3/composer.json
+++ b/app/code/Magento/Tinymce3/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-tinymce-3",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-variable": "100.4.*",
-        "magento/module-widget": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-ui": "*",
+        "magento/module-variable": "*",
+        "magento/module-widget": "*"
     },
     "suggest": {
-        "magento/module-cms": "104.0.*"
+        "magento/module-cms": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 7813065f14141..7f67749fa88f4 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-translation",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-developer": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-developer": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*"
     },
     "suggest": {
-        "magento/module-deploy": "100.4.*"
+        "magento/module-deploy": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index b856a805b1010..b4aeda0fc1e6a 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -1,27 +1,26 @@
 {
     "name": "magento/module-ui",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-user": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-eav": "*",
+        "magento/module-store": "*",
+        "magento/module-user": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,4 +30,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index 1115802f21fa6..fa8962f0af592 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -1,29 +1,28 @@
 {
     "name": "magento/module-ups",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-config": "101.2.*"
+        "magento/module-config": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,4 +32,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 9e1146fa7fe44..44ca51e8bcbe2 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-url-rewrite",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "102.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-url-rewrite": "100.4.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-cms-url-rewrite": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-url-rewrite": "*",
+        "magento/module-cms": "*",
+        "magento/module-cms-url-rewrite": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/UrlRewriteGraphQl/composer.json b/app/code/Magento/UrlRewriteGraphQl/composer.json
index 15b97a44941cb..766ad3ab46ebd 100644
--- a/app/code/Magento/UrlRewriteGraphQl/composer.json
+++ b/app/code/Magento/UrlRewriteGraphQl/composer.json
@@ -2,19 +2,18 @@
     "name": "magento/module-url-rewrite-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-url-rewrite": "102.0.*"
+        "magento/framework": "*",
+        "magento/module-url-rewrite": "*"
     },
     "suggest": {
-        "magento/module-graph-ql": "100.4.*"
+        "magento/module-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index 9242b5461d5df..6ba4be749cc7c 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-user",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-email": "101.1.*",
-        "magento/module-integration": "100.4.*",
-        "magento/module-security": "100.4.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-email": "*",
+        "magento/module-integration": "*",
+        "magento/module-security": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 8648000e4b08e..3d5c0669c679d 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -1,28 +1,27 @@
 {
     "name": "magento/module-usps",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "lib-libxml": "*",
-        "magento/framework": "103.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-shipping": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-config": "*",
+        "magento/module-directory": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-shipping": "*",
+        "magento/module-store": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -32,4 +31,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index 52231c86a49ca..e6eed40a814db 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -1,23 +1,22 @@
 {
     "name": "magento/module-variable",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-config": "101.2.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-store": "*",
+        "magento/module-config": "*",
+        "magento/module-ui": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -27,4 +26,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index 7dacdfe0d6e26..31d5ceb906246 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -1,25 +1,25 @@
 {
     "name": "magento/module-vault",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
+    "description": "",
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-payment": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-payment": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -29,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/VaultGraphQl/composer.json b/app/code/Magento/VaultGraphQl/composer.json
index 9e7832c8ee184..aff9a700fbcad 100644
--- a/app/code/Magento/VaultGraphQl/composer.json
+++ b/app/code/Magento/VaultGraphQl/composer.json
@@ -2,17 +2,16 @@
     "name": "magento/module-vault-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-vault": "*",
+        "magento/module-graph-ql": "*"
+    },
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-vault": "101.2.*",
-        "magento/module-graph-ql": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Version/composer.json b/app/code/Magento/Version/composer.json
index d1a9f535b7c2d..d2b2127446c21 100644
--- a/app/code/Magento/Version/composer.json
+++ b/app/code/Magento/Version/composer.json
@@ -1,19 +1,18 @@
 {
     "name": "magento/module-version",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -23,4 +22,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 0313c903d367a..11382cc318554 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -1,27 +1,26 @@
 {
     "name": "magento/module-webapi",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-authorization": "100.4.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-integration": "100.4.*",
-        "magento/module-store": "101.1.*"
+        "magento/framework": "*",
+        "magento/module-authorization": "*",
+        "magento/module-backend": "*",
+        "magento/module-integration": "*",
+        "magento/module-store": "*"
     },
     "suggest": {
-        "magento/module-user": "101.2.*",
-        "magento/module-customer": "103.0.*"
+        "magento/module-user": "*",
+        "magento/module-customer": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -31,4 +30,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/WebapiAsync/composer.json b/app/code/Magento/WebapiAsync/composer.json
index 715dd1e0be707..e0c6a96f1ffe6 100644
--- a/app/code/Magento/WebapiAsync/composer.json
+++ b/app/code/Magento/WebapiAsync/composer.json
@@ -1,26 +1,25 @@
 {
     "name": "magento/module-webapi-async",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/framework-message-queue": "100.4.*",
-        "magento/module-webapi": "100.4.*",
-        "magento/module-asynchronous-operations": "100.4.*"
+        "magento/framework": "*",
+        "magento/framework-message-queue": "*",
+        "magento/module-webapi": "*",
+        "magento/module-asynchronous-operations": "*"
     },
     "suggest": {
-        "magento/module-user": "101.2.*",
-        "magento/module-customer": "103.0.*"
+        "magento/module-user": "*",
+        "magento/module-customer": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -30,4 +29,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/WebapiSecurity/composer.json b/app/code/Magento/WebapiSecurity/composer.json
index adcbf01fe212b..5b48ed8644709 100644
--- a/app/code/Magento/WebapiSecurity/composer.json
+++ b/app/code/Magento/WebapiSecurity/composer.json
@@ -1,20 +1,19 @@
 {
     "name": "magento/module-webapi-security",
     "description": "WebapiSecurity module provides option to loosen security on some webapi resources.",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-webapi": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-webapi": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -24,4 +23,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Weee/composer.json b/app/code/Magento/Weee/composer.json
index f7da07b15fe74..7024de0f595c7 100644
--- a/app/code/Magento/Weee/composer.json
+++ b/app/code/Magento/Weee/composer.json
@@ -1,34 +1,33 @@
 {
     "name": "magento/module-weee",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-directory": "100.4.*",
-        "magento/module-eav": "102.1.*",
-        "magento/module-page-cache": "100.4.*",
-        "magento/module-quote": "101.2.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-directory": "*",
+        "magento/module-eav": "*",
+        "magento/module-page-cache": "*",
+        "magento/module-quote": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-bundle": "101.0.*"
+        "magento/module-bundle": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -38,4 +37,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/WeeeGraphQl/composer.json b/app/code/Magento/WeeeGraphQl/composer.json
index 9355b5a196ae7..be7e50ab2fca1 100644
--- a/app/code/Magento/WeeeGraphQl/composer.json
+++ b/app/code/Magento/WeeeGraphQl/composer.json
@@ -2,21 +2,20 @@
     "name": "magento/module-weee-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.0",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-tax": "100.4.*",
-        "magento/module-weee": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-store": "*",
+        "magento/module-tax": "*",
+        "magento/module-weee": "*"
     },
     "suggest": {
-        "magento/module-catalog-graph-ql": "100.4.*"
+        "magento/module-catalog-graph-ql": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -26,4 +25,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index 9785dcb9099f8..2cf8429095ce7 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -1,29 +1,28 @@
 {
     "name": "magento/module-widget",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-cms": "104.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-variable": "100.4.*",
-        "magento/module-ui": "101.2.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-cms": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-variable": "*",
+        "magento/module-ui": "*"
     },
     "suggest": {
-        "magento/module-widget-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-widget-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -33,4 +32,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index c08de372b366f..b426ffe01cecc 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -1,38 +1,37 @@
 {
     "name": "magento/module-wishlist",
     "description": "N/A",
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "101.2.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-backend": "102.0.*",
-        "magento/module-catalog": "104.0.*",
-        "magento/module-catalog-inventory": "100.4.*",
-        "magento/module-checkout": "100.4.*",
-        "magento/module-customer": "103.0.*",
-        "magento/module-rss": "100.4.*",
-        "magento/module-sales": "103.0.*",
-        "magento/module-store": "101.1.*",
-        "magento/module-theme": "101.1.*",
-        "magento/module-ui": "101.2.*",
-        "magento/module-captcha": "100.4.*"
+        "magento/framework": "*",
+        "magento/module-backend": "*",
+        "magento/module-catalog": "*",
+        "magento/module-catalog-inventory": "*",
+        "magento/module-checkout": "*",
+        "magento/module-customer": "*",
+        "magento/module-rss": "*",
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-theme": "*",
+        "magento/module-ui": "*",
+        "magento/module-captcha": "*"
     },
     "suggest": {
-        "magento/module-configurable-product": "100.4.*",
-        "magento/module-downloadable": "100.4.*",
-        "magento/module-bundle": "101.0.*",
-        "magento/module-cookie": "100.4.*",
-        "magento/module-grouped-product": "100.4.*",
-        "magento/module-wishlist-sample-data": "Sample Data version: 100.4.*"
+        "magento/module-configurable-product": "*",
+        "magento/module-downloadable": "*",
+        "magento/module-bundle": "*",
+        "magento/module-cookie": "*",
+        "magento/module-grouped-product": "*",
+        "magento/module-wishlist-sample-data": "*"
     },
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -42,4 +41,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 91ad9baeecb37..309257f857ed2 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -1,18 +1,17 @@
 {
     "name": "magento/module-wishlist-analytics",
     "description": "N/A",
+    "require": {
+        "php": "~7.3.0||~7.4.0",
+        "magento/framework": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-analytics": "*"
+    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "version": "100.4.0",
-    "require": {
-        "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/module-wishlist": "101.2.*",
-        "magento/module-analytics": "100.4.*"
-    },
     "autoload": {
         "files": [
             "registration.php"
@@ -22,4 +21,3 @@
         }
     }
 }
-
diff --git a/app/code/Magento/WishlistGraphQl/composer.json b/app/code/Magento/WishlistGraphQl/composer.json
index 84e0cde975b77..58bc738bd24d6 100644
--- a/app/code/Magento/WishlistGraphQl/composer.json
+++ b/app/code/Magento/WishlistGraphQl/composer.json
@@ -2,19 +2,18 @@
     "name": "magento/module-wishlist-graph-ql",
     "description": "N/A",
     "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "magento/module-catalog": "*",
-        "magento/module-catalog-graph-ql": "100.4.*",
-        "magento/module-wishlist": "101.2.*",
-        "magento/module-store": "101.1.*"
+        "magento/module-catalog-graph-ql": "*",
+        "magento/module-wishlist": "*",
+        "magento/module-store": "*"
     },
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index daeffa56c2a62..249441be1753e 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -1,23 +1,21 @@
 {
     "name": "magento/theme-adminhtml-backend",
     "description": "N/A",
-    "type": "magento2-theme",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-theme",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index 2e39bcf46a49c..066d0cd1cc9f2 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -1,23 +1,21 @@
 {
     "name": "magento/theme-frontend-blank",
     "description": "N/A",
-    "type": "magento2-theme",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-theme",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index e3c39dd579604..16bed43fe8cbf 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -1,24 +1,22 @@
 {
     "name": "magento/theme-frontend-luma",
     "description": "N/A",
-    "type": "magento2-theme",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "103.0.*",
-        "magento/theme-frontend-blank": "100.4.*"
+        "magento/framework": "*",
+        "magento/theme-frontend-blank": "*"
     },
+    "type": "magento2-theme",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/de_DE/composer.json b/app/i18n/Magento/de_DE/composer.json
index fd23d037ba459..5a488a3e32c2b 100644
--- a/app/i18n/Magento/de_DE/composer.json
+++ b/app/i18n/Magento/de_DE/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-de_de",
     "description": "German (Germany) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/en_US/composer.json b/app/i18n/Magento/en_US/composer.json
index 194854d58bbe2..1108c70de28a6 100644
--- a/app/i18n/Magento/en_US/composer.json
+++ b/app/i18n/Magento/en_US/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-en_us",
     "description": "English (United States) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/es_ES/composer.json b/app/i18n/Magento/es_ES/composer.json
index 0b49475587d54..5bc3cb5730adf 100644
--- a/app/i18n/Magento/es_ES/composer.json
+++ b/app/i18n/Magento/es_ES/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-es_es",
     "description": "Spanish (Spain) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/fr_FR/composer.json b/app/i18n/Magento/fr_FR/composer.json
index ada414e6a7a32..50c541308673b 100644
--- a/app/i18n/Magento/fr_FR/composer.json
+++ b/app/i18n/Magento/fr_FR/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-fr_fr",
     "description": "French (France) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/nl_NL/composer.json b/app/i18n/Magento/nl_NL/composer.json
index a881eed112ea0..a182e179d4103 100644
--- a/app/i18n/Magento/nl_NL/composer.json
+++ b/app/i18n/Magento/nl_NL/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-nl_nl",
     "description": "Dutch (Netherlands) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/pt_BR/composer.json b/app/i18n/Magento/pt_BR/composer.json
index 6e10bc16f6a79..46734cc09b363 100644
--- a/app/i18n/Magento/pt_BR/composer.json
+++ b/app/i18n/Magento/pt_BR/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-pt_br",
     "description": "Portuguese (Brazil) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/app/i18n/Magento/zh_Hans_CN/composer.json b/app/i18n/Magento/zh_Hans_CN/composer.json
index 8491eced1389f..ce214ce649f56 100644
--- a/app/i18n/Magento/zh_Hans_CN/composer.json
+++ b/app/i18n/Magento/zh_Hans_CN/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "magento/language-zh_hans_cn",
     "description": "Chinese (China) language",
-    "type": "magento2-language",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -9,14 +8,13 @@
     "config": {
         "sort-packages": true
     },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*"
+        "magento/framework": "*"
     },
+    "type": "magento2-language",
     "autoload": {
         "files": [
             "registration.php"
         ]
     }
 }
-
diff --git a/lib/internal/Magento/Framework/Amqp/composer.json b/lib/internal/Magento/Framework/Amqp/composer.json
index c1a34426fe87e..fc65e37d12ecf 100644
--- a/lib/internal/Magento/Framework/Amqp/composer.json
+++ b/lib/internal/Magento/Framework/Amqp/composer.json
@@ -1,27 +1,25 @@
 {
     "name": "magento/framework-amqp",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "type": "magento2-library",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "config": {
-        "sort-packages": true
-    },
-    "version": "100.4.0",
     "require": {
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "php": "~7.3.0||~7.4.0",
         "php-amqplib/php-amqplib": "~2.7.0||~2.10.0"
     },
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
         "psr-4": {
             "Magento\\Framework\\Amqp\\": ""
-        }
+        },
+        "files": [
+            "registration.php"
+        ]
     }
 }
-
diff --git a/lib/internal/Magento/Framework/Bulk/composer.json b/lib/internal/Magento/Framework/Bulk/composer.json
index aa9dad9589657..b8e0992182169 100644
--- a/lib/internal/Magento/Framework/Bulk/composer.json
+++ b/lib/internal/Magento/Framework/Bulk/composer.json
@@ -1,26 +1,24 @@
 {
     "name": "magento/framework-bulk",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "type": "magento2-library",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "config": {
-        "sort-packages": true
-    },
-    "version": "101.0.0",
     "require": {
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
         "psr-4": {
             "Magento\\Framework\\Bulk\\": ""
-        }
+        },
+        "files": [
+            "registration.php"
+        ]
     }
 }
-
diff --git a/lib/internal/Magento/Framework/MessageQueue/composer.json b/lib/internal/Magento/Framework/MessageQueue/composer.json
index 86119b13adb37..056f1d40c39cf 100644
--- a/lib/internal/Magento/Framework/MessageQueue/composer.json
+++ b/lib/internal/Magento/Framework/MessageQueue/composer.json
@@ -1,26 +1,24 @@
 {
     "name": "magento/framework-message-queue",
     "description": "N/A",
+    "config": {
+        "sort-packages": true
+    },
     "type": "magento2-library",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
-    "config": {
-        "sort-packages": true
-    },
-    "version": "100.4.1",
     "require": {
-        "magento/framework": "103.0.*",
+        "magento/framework": "*",
         "php": "~7.3.0||~7.4.0"
     },
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
         "psr-4": {
             "Magento\\Framework\\MessageQueue\\": ""
-        }
+        },
+        "files": [
+            "registration.php"
+        ]
     }
 }
-
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index e33ba5fdfd6b1..dfc81189bf544 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -9,7 +9,6 @@
     "config": {
         "sort-packages": true
     },
-    "version": "103.0.1",
     "require": {
         "php": "~7.3.0||~7.4.0",
         "ext-bcmath": "*",
@@ -54,12 +53,11 @@
         "ext-imagick": "Use Image Magick >=3.0.0 as an optional alternative image processing library"
     },
     "autoload": {
-        "files": [
-            "registration.php"
-        ],
         "psr-4": {
             "Magento\\Framework\\": ""
-        }
+        },
+        "files": [
+            "registration.php"
+        ]
     }
 }
-

From 51b24f430911f2dfacb47cd77b37c8102c34c614 Mon Sep 17 00:00:00 2001
From: eduard13 <e.chitoraga@atwix.com>
Date: Fri, 23 Oct 2020 16:05:16 +0300
Subject: [PATCH 626/671] Excluding the disabled parent category from the
 category breadcrumbs

---
 .../Category/DataProvider/Breadcrumbs.php     |  2 +
 .../Magento/GraphQl/Catalog/CategoryTest.php  | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
index 863e621bd8df3..dcd6f816088dd 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php
@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 
 /**
@@ -46,6 +47,7 @@ public function getData(string $categoryPath): array
             $collection = $this->collectionFactory->create();
             $collection->addAttributeToSelect(['name', 'url_key', 'url_path']);
             $collection->addAttributeToFilter('entity_id', $parentCategoryIds);
+            $collection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, 1);
 
             foreach ($collection as $category) {
                 $breadcrumbsData[] = [
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
index f086a2211b51d..d31a0aa88efc1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoryTest.php
@@ -660,6 +660,45 @@ public function testCategoryImage(?string $imagePrefix)
         $this->assertEquals($expectedImageUrl, $childCategory['image']);
     }
 
+    /**
+     * Testing breadcrumbs that shouldn't include disabled parent categories
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     */
+    public function testBreadCrumbsWithDisabledParentCategory()
+    {
+        $parentCategoryId = 4;
+        $childCategoryId = 5;
+        $category = $this->categoryRepository->get($parentCategoryId);
+        $category->setIsActive(false);
+        $this->categoryRepository->save($category);
+
+        $query = <<<QUERY
+{
+  category(id: {$childCategoryId}) {
+    name
+    breadcrumbs {
+      category_id
+      category_name
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $expectedResponse = [
+            'category' => [
+                'name' => 'Category 1.1.1',
+                'breadcrumbs' => [
+                    [
+                        'category_id' => 3,
+                        'category_name' => "Category 1",
+                    ]
+                ]
+            ]
+        ];
+        $this->assertEquals($expectedResponse, $response);
+    }
+
     /**
      * @return array
      */

From 18b61947a375c86deb67e490e3a89c612ecbcdd3 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Fri, 23 Oct 2020 16:24:07 +0300
Subject: [PATCH 627/671] MC-37954: PLP sort by name is case-sensitive with
 ElasticSearch

---
 .../BatchDataMapper/ProductDataMapper.php     | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
index 9fa001097df87..53472710671a4 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
@@ -90,6 +90,13 @@ class ProductDataMapper implements BatchDataMapperInterface
      */
     private $filterableAttributeTypes;
 
+    /**
+     * @var string[]
+     */
+    private $sortableCaseSensitiveAttributes = [
+        'name',
+    ];
+
     /**
      * @param Builder $builder
      * @param FieldMapperInterface $fieldMapper
@@ -99,6 +106,7 @@ class ProductDataMapper implements BatchDataMapperInterface
      * @param array $excludedAttributes
      * @param array $sortableAttributesValuesToImplode
      * @param array $filterableAttributeTypes
+     * @param array $sortableCaseSensitiveAttributes
      */
     public function __construct(
         Builder $builder,
@@ -108,7 +116,8 @@ public function __construct(
         DataProvider $dataProvider,
         array $excludedAttributes = [],
         array $sortableAttributesValuesToImplode = [],
-        array $filterableAttributeTypes = []
+        array $filterableAttributeTypes = [],
+        array $sortableCaseSensitiveAttributes = []
     ) {
         $this->builder = $builder;
         $this->fieldMapper = $fieldMapper;
@@ -122,6 +131,10 @@ public function __construct(
         $this->dataProvider = $dataProvider;
         $this->attributeOptionsCache = [];
         $this->filterableAttributeTypes = $filterableAttributeTypes;
+        $this->sortableCaseSensitiveAttributes = array_merge(
+            $this->sortableCaseSensitiveAttributes,
+            $sortableCaseSensitiveAttributes
+        );
     }
 
     /**
@@ -298,6 +311,12 @@ function (string $valueId) {
             $attributeValues = [$productId => implode(' ', $attributeValues)];
         }
 
+        if (in_array($attribute->getAttributeCode(), $this->sortableCaseSensitiveAttributes)) {
+            foreach ($attributeValues as $key => $attributeValue) {
+                $attributeValues[$key] = strtolower($attributeValue);
+            }
+        }
+
         return $attributeValues;
     }
 

From 1b9e373af576d2303833c9719b591eb86bed7ceb Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 23 Oct 2020 16:33:41 +0300
Subject: [PATCH 628/671] MC-38620: Merge release branch into 2.4-develop

- fix one composer.json file
---
 app/code/Magento/MediaContentSynchronization/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaContentSynchronization/composer.json b/app/code/Magento/MediaContentSynchronization/composer.json
index c4ee6ca1b0cf3..9f0f4f9588ad6 100644
--- a/app/code/Magento/MediaContentSynchronization/composer.json
+++ b/app/code/Magento/MediaContentSynchronization/composer.json
@@ -7,7 +7,7 @@
         "magento/framework-bulk": "*",
         "magento/module-media-content-synchronization-api": "*",
         "magento/module-media-content-api": "*",
-        "magento/framework-message-queue": "*"
+        "magento/module-asynchronous-operations": "*"
     },
     "suggest": {
         "magento/module-media-gallery-synchronization": "*"

From 0ff2f042dfb2405389e6eaf442b38712fb201b9e Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 23 Oct 2020 16:58:21 +0300
Subject: [PATCH 629/671] MC-38620: Merge release branch into 2.4-develop

- composer update
---
 composer.lock | 1665 +++++++++++++++++--------------------------------
 1 file changed, 570 insertions(+), 1095 deletions(-)

diff --git a/composer.lock b/composer.lock
index 551167152be4d..b06e0e9fa9e5c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "aadcf8a265dd7ecbb86dd3dd4e49bc28",
+    "content-hash": "a03edc1c8ee05f82886eebd6ed288df8",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-file",
@@ -117,21 +117,21 @@
         },
         {
             "name": "colinmollenhour/php-redis-session-abstract",
-            "version": "v1.4.2",
+            "version": "v1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/colinmollenhour/php-redis-session-abstract.git",
-                "reference": "669521218794f125c7b668252f4f576eda65e1e4"
+                "reference": "39ca38da5e0a981bc1a7e39a86693c128784a513"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/669521218794f125c7b668252f4f576eda65e1e4",
-                "reference": "669521218794f125c7b668252f4f576eda65e1e4",
+                "url": "https://api.github.com/repos/colinmollenhour/php-redis-session-abstract/zipball/39ca38da5e0a981bc1a7e39a86693c128784a513",
+                "reference": "39ca38da5e0a981bc1a7e39a86693c128784a513",
                 "shasum": ""
             },
             "require": {
                 "colinmollenhour/credis": "~1.6",
-                "php": "^5.5 || ^7.0"
+                "php": "^5.5 || ^7.0|| ^7.1 || ^7.2"
             },
             "type": "library",
             "autoload": {
@@ -150,20 +150,20 @@
             ],
             "description": "A Redis-based session handler with optimistic locking",
             "homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
-            "time": "2020-01-08T17:41:01+00:00"
+            "time": "2020-10-07T09:47:22+00:00"
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.2.7",
+            "version": "1.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd"
+                "reference": "8a7ecad675253e4654ea05505233285377405215"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/95c63ab2117a72f48f5a55da9740a3273d45b7fd",
-                "reference": "95c63ab2117a72f48f5a55da9740a3273d45b7fd",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8a7ecad675253e4654ea05505233285377405215",
+                "reference": "8a7ecad675253e4654ea05505233285377405215",
                 "shasum": ""
             },
             "require": {
@@ -206,30 +206,20 @@
                 "ssl",
                 "tls"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-04-08T08:27:21+00:00"
+            "time": "2020-08-23T12:54:47+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "1.10.9",
+            "version": "1.10.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "83c3250093d5491600a822e176b107a945baf95a"
+                "reference": "547c9ee73fe26c77af09a0ea16419176b1cdbd12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/83c3250093d5491600a822e176b107a945baf95a",
-                "reference": "83c3250093d5491600a822e176b107a945baf95a",
+                "url": "https://api.github.com/repos/composer/composer/zipball/547c9ee73fe26c77af09a0ea16419176b1cdbd12",
+                "reference": "547c9ee73fe26c77af09a0ea16419176b1cdbd12",
                 "shasum": ""
             },
             "require": {
@@ -296,34 +286,20 @@
                 "dependency",
                 "package"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-16T10:57:00+00:00"
+            "time": "2020-10-13T13:59:09+00:00"
         },
         {
             "name": "composer/semver",
-            "version": "1.5.1",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de"
+                "reference": "38276325bd896f90dfcfe30029aa5db40df387a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
-                "reference": "c6bea70230ef4dd483e6bbcab6005f682ed3a8de",
+                "url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7",
+                "reference": "38276325bd896f90dfcfe30029aa5db40df387a7",
                 "shasum": ""
             },
             "require": {
@@ -371,7 +347,7 @@
                 "validation",
                 "versioning"
             ],
-            "time": "2020-01-13T12:06:48+00:00"
+            "time": "2020-09-27T13:13:07+00:00"
         },
         {
             "name": "composer/spdx-licenses",
@@ -431,34 +407,20 @@
                 "spdx",
                 "validator"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-15T15:35:07+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.2",
+            "version": "1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51"
+                "reference": "ebd27a9866ae8254e873866f795491f02418c5a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
-                "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ebd27a9866ae8254e873866f795491f02418c5a5",
+                "reference": "ebd27a9866ae8254e873866f795491f02418c5a5",
                 "shasum": ""
             },
             "require": {
@@ -489,21 +451,7 @@
                 "Xdebug",
                 "performance"
             ],
-            "funding": [
-                {
-                    "url": "https://packagist.com",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/composer",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-06-04T11:16:35+00:00"
+            "time": "2020-08-19T10:27:58+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -770,23 +718,23 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "v1.3.1",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+                "reference": "60d379c243457e073cff02bc323a2a86cb355631"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
-                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/60d379c243457e073cff02bc323a2a86cb355631",
+                "reference": "60d379c243457e073cff02bc323a2a86cb355631",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.0"
+                "php": ">=5.5"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.0"
+                "symfony/phpunit-bridge": "^4.4 || ^5.1"
             },
             "type": "library",
             "extra": {
@@ -817,20 +765,20 @@
             "keywords": [
                 "promise"
             ],
-            "time": "2016-12-20T10:07:11+00:00"
+            "time": "2020-09-30T07:37:28+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.6.1",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
-                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/53330f47520498c0ae1f61f7e2c90f55690c06a3",
+                "reference": "53330f47520498c0ae1f61f7e2c90f55690c06a3",
                 "shasum": ""
             },
             "require": {
@@ -843,15 +791,15 @@
             },
             "require-dev": {
                 "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
             },
             "suggest": {
-                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6-dev"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
@@ -888,7 +836,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2019-07-01T23:21:34+00:00"
+            "time": "2020-09-30T07:37:11+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -1535,41 +1483,41 @@
         },
         {
             "name": "laminas/laminas-eventmanager",
-            "version": "3.2.1",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-eventmanager.git",
-                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748"
+                "reference": "1940ccf30e058b2fd66f5a9d696f1b5e0027b082"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
-                "reference": "ce4dc0bdf3b14b7f9815775af9dfee80a63b4748",
+                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/1940ccf30e058b2fd66f5a9d696f1b5e0027b082",
+                "reference": "1940ccf30e058b2fd66f5a9d696f1b5e0027b082",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
+                "php": "^7.3 || ^8.0"
             },
             "replace": {
-                "zendframework/zend-eventmanager": "self.version"
+                "zendframework/zend-eventmanager": "^3.2.1"
             },
             "require-dev": {
-                "athletic/athletic": "^0.1",
-                "container-interop/container-interop": "^1.1.0",
+                "container-interop/container-interop": "^1.1",
                 "laminas/laminas-coding-standard": "~1.0.0",
                 "laminas/laminas-stdlib": "^2.7.3 || ^3.0",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+                "phpbench/phpbench": "^0.17.1",
+                "phpunit/phpunit": "^8.5.8"
             },
             "suggest": {
-                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
+                "container-interop/container-interop": "^1.1, to use the lazy listeners feature",
                 "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev",
-                    "dev-develop": "3.3-dev"
+                    "dev-master": "3.3.x-dev",
+                    "dev-develop": "3.4.x-dev"
                 }
             },
             "autoload": {
@@ -1589,20 +1537,20 @@
                 "events",
                 "laminas"
             ],
-            "time": "2019-12-31T16:44:52+00:00"
+            "time": "2020-08-25T11:10:44+00:00"
         },
         {
             "name": "laminas/laminas-feed",
-            "version": "2.12.2",
+            "version": "2.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-feed.git",
-                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654"
+                "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
-                "reference": "8a193ac96ebcb3e16b6ee754ac2a889eefacb654",
+                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3c91415633cb1be6f9d78683d69b7dcbfe6b4012",
+                "reference": "3c91415633cb1be6f9d78683d69b7dcbfe6b4012",
                 "shasum": ""
             },
             "require": {
@@ -1656,7 +1604,7 @@
                 "feed",
                 "laminas"
             ],
-            "time": "2020-03-29T12:36:29+00:00"
+            "time": "2020-08-18T13:45:04+00:00"
         },
         {
             "name": "laminas/laminas-filter",
@@ -1807,26 +1755,20 @@
                 "form",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
             "time": "2020-07-14T13:53:27+00:00"
         },
         {
             "name": "laminas/laminas-http",
-            "version": "2.12.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-http.git",
-                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575"
+                "reference": "33b7942f51ce905ce9bfc8bf28badc501d3904b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/48bd06ffa3a6875e2b77d6852405eb7b1589d575",
-                "reference": "48bd06ffa3a6875e2b77d6852405eb7b1589d575",
+                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/33b7942f51ce905ce9bfc8bf28badc501d3904b5",
+                "reference": "33b7942f51ce905ce9bfc8bf28badc501d3904b5",
                 "shasum": ""
             },
             "require": {
@@ -1849,12 +1791,6 @@
                 "paragonie/certainty": "For automated management of cacert.pem"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.12.x-dev",
-                    "dev-develop": "2.13.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Laminas\\Http\\": "src/"
@@ -1871,13 +1807,7 @@
                 "http client",
                 "laminas"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2020-06-23T15:14:37+00:00"
+            "time": "2020-08-18T17:11:58+00:00"
         },
         {
             "name": "laminas/laminas-hydrator",
@@ -2263,16 +2193,16 @@
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.11.0",
+            "version": "2.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b"
+                "reference": "c154a733b122539ac2c894561996c770db289f70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/4c5545637eea3dc745668ddff1028692ed004c4b",
-                "reference": "4c5545637eea3dc745668ddff1028692ed004c4b",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/c154a733b122539ac2c894561996c770db289f70",
+                "reference": "c154a733b122539ac2c894561996c770db289f70",
                 "shasum": ""
             },
             "require": {
@@ -2282,7 +2212,7 @@
                 "laminas/laminas-stdlib": "^2.7 || ^3.0",
                 "laminas/laminas-validator": "^2.10.2",
                 "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0",
+                "php": "^7.1",
                 "true/punycode": "^2.1"
             },
             "replace": {
@@ -2292,8 +2222,8 @@
                 "laminas/laminas-coding-standard": "~1.0.0",
                 "laminas/laminas-config": "^2.6",
                 "laminas/laminas-crypt": "^2.6 || ^3.0",
-                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1",
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1.4"
+                "laminas/laminas-servicemanager": "^3.2.1",
+                "phpunit/phpunit": "^7.5.20"
             },
             "suggest": {
                 "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
@@ -2301,10 +2231,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "2.11.x-dev",
-                    "dev-develop": "2.12.x-dev"
-                },
                 "laminas": {
                     "component": "Laminas\\Mail",
                     "config-provider": "Laminas\\Mail\\ConfigProvider"
@@ -2325,13 +2251,7 @@
                 "laminas",
                 "mail"
             ],
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2020-06-30T20:17:23+00:00"
+            "time": "2020-08-12T14:51:33+00:00"
         },
         {
             "name": "laminas/laminas-math",
@@ -2443,16 +2363,16 @@
         },
         {
             "name": "laminas/laminas-modulemanager",
-            "version": "2.8.4",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-modulemanager.git",
-                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78"
+                "reference": "789bbd4ab391da9221f265f6bb2d594f8f11855b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/92b1cde1aab5aef687b863face6dd5d9c6751c78",
-                "reference": "92b1cde1aab5aef687b863face6dd5d9c6751c78",
+                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/789bbd4ab391da9221f265f6bb2d594f8f11855b",
+                "reference": "789bbd4ab391da9221f265f6bb2d594f8f11855b",
                 "shasum": ""
             },
             "require": {
@@ -2460,10 +2380,11 @@
                 "laminas/laminas-eventmanager": "^3.2 || ^2.6.3",
                 "laminas/laminas-stdlib": "^3.1 || ^2.7",
                 "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
+                "php": "^5.6 || ^7.0",
+                "webimpress/safe-writer": "^1.0.2 || ^2.1"
             },
             "replace": {
-                "zendframework/zend-modulemanager": "self.version"
+                "zendframework/zend-modulemanager": "^2.8.4"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
@@ -2483,8 +2404,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8.x-dev",
-                    "dev-develop": "2.9.x-dev"
+                    "dev-master": "2.9.x-dev",
+                    "dev-develop": "2.10.x-dev"
                 }
             },
             "autoload": {
@@ -2502,7 +2423,7 @@
                 "laminas",
                 "modulemanager"
             ],
-            "time": "2019-12-31T17:26:56+00:00"
+            "time": "2020-08-25T09:29:22+00:00"
         },
         {
             "name": "laminas/laminas-mvc",
@@ -2952,35 +2873,35 @@
         },
         {
             "name": "laminas/laminas-stdlib",
-            "version": "3.2.1",
+            "version": "3.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6"
+                "reference": "b9d84eaa39fde733356ea948cdef36c631f202b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/2b18347625a2f06a1a485acfbc870f699dbe51c6",
-                "reference": "2b18347625a2f06a1a485acfbc870f699dbe51c6",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/b9d84eaa39fde733356ea948cdef36c631f202b6",
+                "reference": "b9d84eaa39fde733356ea948cdef36c631f202b6",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0"
+                "php": "^7.3 || ^8.0"
             },
             "replace": {
-                "zendframework/zend-stdlib": "self.version"
+                "zendframework/zend-stdlib": "^3.2.1"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~1.0.0",
-                "phpbench/phpbench": "^0.13",
-                "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2"
+                "phpbench/phpbench": "^0.17.1",
+                "phpunit/phpunit": "^9.3.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev",
-                    "dev-develop": "3.3.x-dev"
+                    "dev-master": "3.3.x-dev",
+                    "dev-develop": "3.4.x-dev"
                 }
             },
             "autoload": {
@@ -2998,7 +2919,7 @@
                 "laminas",
                 "stdlib"
             ],
-            "time": "2019-12-31T17:51:15+00:00"
+            "time": "2020-08-25T09:08:16+00:00"
         },
         {
             "name": "laminas/laminas-text",
@@ -3275,31 +3196,27 @@
         },
         {
             "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.0.4",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "fcd87520e4943d968557803919523772475e8ea3"
+                "reference": "6ede70583e101030bcace4dcddd648f760ddf642"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3",
-                "reference": "fcd87520e4943d968557803919523772475e8ea3",
+                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642",
+                "reference": "6ede70583e101030bcace4dcddd648f760ddf642",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^5.6 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1",
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
                 "squizlabs/php_codesniffer": "^3.5"
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev",
-                    "dev-develop": "1.1.x-dev"
-                },
                 "laminas": {
                     "module": "Laminas\\ZendFrameworkBridge"
                 }
@@ -3323,7 +3240,7 @@
                 "laminas",
                 "zf"
             ],
-            "time": "2020-05-20T16:45:56+00:00"
+            "time": "2020-09-14T14:23:00+00:00"
         },
         {
             "name": "magento/composer",
@@ -3489,16 +3406,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "1.25.4",
+            "version": "1.25.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "3022efff205e2448b560c833c6fbbf91c3139168"
+                "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168",
-                "reference": "3022efff205e2448b560c833c6fbbf91c3139168",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1817faadd1846cd08be9a49e905dc68823bc38c0",
+                "reference": "1817faadd1846cd08be9a49e905dc68823bc38c0",
                 "shasum": ""
             },
             "require": {
@@ -3562,7 +3479,7 @@
                 "logging",
                 "psr-3"
             ],
-            "time": "2020-05-22T07:31:27+00:00"
+            "time": "2020-07-23T08:35:51+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -3889,16 +3806,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.28",
+            "version": "2.0.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260"
+                "reference": "497856a8d997f640b4a516062f84228a772a48a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
-                "reference": "d1ca58cf33cb21046d702ae3a7b14fdacd9f3260",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/497856a8d997f640b4a516062f84228a772a48a8",
+                "reference": "497856a8d997f640b4a516062f84228a772a48a8",
                 "shasum": ""
             },
             "require": {
@@ -3907,7 +3824,6 @@
             "require-dev": {
                 "phing/phing": "~2.7",
                 "phpunit/phpunit": "^4.8.35|^5.7|^6.0",
-                "sami/sami": "~2.0",
                 "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
@@ -3977,21 +3893,7 @@
                 "x.509",
                 "x509"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/terrafrost",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpseclib",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-08T09:08:33+00:00"
+            "time": "2020-09-08T04:24:43+00:00"
         },
         {
             "name": "psr/container",
@@ -4309,16 +4211,16 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.8.0",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1"
+                "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
-                "reference": "ff2aa5420bfbc296cf6a0bc785fa5b35736de7c1",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/590cfec960b77fd55e39b7d9246659e95dd6d337",
+                "reference": "590cfec960b77fd55e39b7d9246659e95dd6d337",
                 "shasum": ""
             },
             "require": {
@@ -4354,7 +4256,7 @@
                 "parser",
                 "validator"
             ],
-            "time": "2020-04-30T19:05:18+00:00"
+            "time": "2020-08-25T06:56:57+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -4402,16 +4304,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.10",
+            "version": "v4.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "326b064d804043005526f5a0494cfb49edb59bb0"
+                "reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0",
-                "reference": "326b064d804043005526f5a0494cfb49edb59bb0",
+                "url": "https://api.github.com/repos/symfony/console/zipball/90933b39c7b312fc3ceaa1ddeac7eb48cb953124",
+                "reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124",
                 "shasum": ""
             },
             "require": {
@@ -4475,25 +4377,11 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-30T20:06:45+00:00"
+            "time": "2020-09-15T07:58:55+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -4542,34 +4430,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.10",
+            "version": "v4.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866"
+                "reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866",
-                "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e17bb5e0663dc725f7cdcafc932132735b4725cd",
+                "reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd",
                 "shasum": ""
             },
             "require": {
@@ -4587,6 +4461,7 @@
                 "psr/log": "~1.0",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
+                "symfony/error-handler": "~3.4|~4.4",
                 "symfony/expression-language": "^3.4|^4.0|^5.0",
                 "symfony/http-foundation": "^3.4|^4.0|^5.0",
                 "symfony/service-contracts": "^1.1|^2",
@@ -4626,21 +4501,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-20T08:37:50+00:00"
+            "time": "2020-09-18T14:07:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -4702,34 +4563,20 @@
                 "interoperability",
                 "standards"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-06T13:19:58+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "6e4320f06d5f2cce0d96530162491f4465179157"
+                "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/6e4320f06d5f2cce0d96530162491f4465179157",
-                "reference": "6e4320f06d5f2cce0d96530162491f4465179157",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/1a8697545a8d87b9f2f6b1d32414199cc5e20aae",
+                "reference": "1a8697545a8d87b9f2f6b1d32414199cc5e20aae",
                 "shasum": ""
             },
             "require": {
@@ -4766,34 +4613,20 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-30T20:35:19+00:00"
+            "time": "2020-09-27T14:02:37+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187"
+                "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/4298870062bfc667cb78d2b379be4bf5dec5f187",
-                "reference": "4298870062bfc667cb78d2b379be4bf5dec5f187",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
+                "reference": "2c3ba7ad6884e6c4451ce2340e2dc23f6fa3e0d8",
                 "shasum": ""
             },
             "require": {
@@ -4829,34 +4662,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "time": "2020-09-02T16:23:27+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454"
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454",
-                "reference": "1c302646f6efc070cd46856e600e5e0684d6b454",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
                 "shasum": ""
             },
             "require": {
@@ -4868,7 +4687,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4905,34 +4724,20 @@
                 "polyfill",
                 "portable"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe"
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
-                "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
                 "shasum": ""
             },
             "require": {
@@ -4947,7 +4752,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -4990,34 +4795,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-21T09:57:48+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
-                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
                 "shasum": ""
             },
             "require": {
@@ -5029,7 +4820,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -5071,34 +4862,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a"
+                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a",
-                "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b5f7b932ee6fa802fc792eabd77c4c88084517ce",
+                "reference": "b5f7b932ee6fa802fc792eabd77c4c88084517ce",
                 "shasum": ""
             },
             "require": {
@@ -5110,7 +4887,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -5148,34 +4925,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
+                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
-                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
+                "reference": "3fe414077251a81a1b15b1c709faf5c2fbae3d4e",
                 "shasum": ""
             },
             "require": {
@@ -5185,7 +4948,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -5225,34 +4988,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
-                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
                 "shasum": ""
             },
             "require": {
@@ -5261,7 +5010,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -5298,34 +5047,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca"
+                "reference": "9d920e3218205554171b2503bb3e4a1366824a16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
-                "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9d920e3218205554171b2503bb3e4a1366824a16",
+                "reference": "9d920e3218205554171b2503bb3e4a1366824a16",
                 "shasum": ""
             },
             "require": {
@@ -5334,7 +5069,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -5374,34 +5109,20 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.18.0",
+            "version": "v1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981"
+                "reference": "f54ef00f4678f348f133097fa8c3701d197ff44d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981",
-                "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/f54ef00f4678f348f133097fa8c3701d197ff44d",
+                "reference": "f54ef00f4678f348f133097fa8c3701d197ff44d",
                 "shasum": ""
             },
             "require": {
@@ -5410,7 +5131,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.18-dev"
+                    "dev-main": "1.19-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -5454,38 +5175,24 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-14T12:35:20+00:00"
+            "time": "2020-10-23T09:01:57+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.10",
+            "version": "v4.4.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5"
+                "reference": "9b887acc522935f77555ae8813495958c7771ba7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5",
-                "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5",
+                "url": "https://api.github.com/repos/symfony/process/zipball/9b887acc522935f77555ae8813495958c7771ba7",
+                "reference": "9b887acc522935f77555ae8813495958c7771ba7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3"
+                "php": ">=7.1.3"
             },
             "type": "library",
             "extra": {
@@ -5517,34 +5224,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-30T20:06:45+00:00"
+            "time": "2020-09-02T16:08:58+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.1.3",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442"
+                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/58c7475e5457c5492c26cc740cc0ad7464be9442",
-                "reference": "58c7475e5457c5492c26cc740cc0ad7464be9442",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d15da7ba4957ffb8f1747218be9e1a121fd298a1",
+                "reference": "d15da7ba4957ffb8f1747218be9e1a121fd298a1",
                 "shasum": ""
             },
             "require": {
@@ -5557,7 +5250,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5593,21 +5286,7 @@
                 "interoperability",
                 "standards"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-07-06T13:23:11+00:00"
+            "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "tedivm/jshrink",
@@ -5754,6 +5433,55 @@
             ],
             "time": "2018-01-15T15:26:51+00:00"
         },
+        {
+            "name": "webimpress/safe-writer",
+            "version": "2.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webimpress/safe-writer.git",
+                "reference": "5cfafdec5873c389036f14bf832a5efc9390dcdd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webimpress/safe-writer/zipball/5cfafdec5873c389036f14bf832a5efc9390dcdd",
+                "reference": "5cfafdec5873c389036f14bf832a5efc9390dcdd",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5.8 || ^9.3.7",
+                "vimeo/psalm": "^3.14.2",
+                "webimpress/coding-standard": "^1.1.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev",
+                    "dev-develop": "2.2.x-dev",
+                    "dev-release-1.0": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webimpress\\SafeWriter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "description": "Tool to write files safely, to avoid race conditions",
+            "keywords": [
+                "concurrent write",
+                "file writer",
+                "race condition",
+                "safe writer",
+                "webimpress"
+            ],
+            "time": "2020-08-25T07:21:11+00:00"
+        },
         {
             "name": "webonyx/graphql-php",
             "version": "v0.13.9",
@@ -5804,12 +5532,6 @@
                 "api",
                 "graphql"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/webonyx-graphql-php",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-07-02T05:49:25+00:00"
         },
         {
@@ -5877,16 +5599,16 @@
     "packages-dev": [
         {
             "name": "allure-framework/allure-codeception",
-            "version": "1.4.3",
+            "version": "1.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/allure-framework/allure-codeception.git",
-                "reference": "9e0e25f8960fa5ac17c65c932ea8153ce6700713"
+                "reference": "a69800eeef83007ced9502a3349ff72f5fb6b4e2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9e0e25f8960fa5ac17c65c932ea8153ce6700713",
-                "reference": "9e0e25f8960fa5ac17c65c932ea8153ce6700713",
+                "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/a69800eeef83007ced9502a3349ff72f5fb6b4e2",
+                "reference": "a69800eeef83007ced9502a3349ff72f5fb6b4e2",
                 "shasum": ""
             },
             "require": {
@@ -5924,7 +5646,7 @@
                 "steps",
                 "testing"
             ],
-            "time": "2020-03-13T11:07:13+00:00"
+            "time": "2020-09-09T10:51:33+00:00"
         },
         {
             "name": "allure-framework/allure-php-api",
@@ -6031,16 +5753,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.147.1",
+            "version": "3.158.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc"
+                "reference": "ba2956c3cb5ff0d7b808683b1c57ebc3f5cc9633"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8a561a4a1645ccdd06413a4f2defe55d35e0eecc",
-                "reference": "8a561a4a1645ccdd06413a4f2defe55d35e0eecc",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ba2956c3cb5ff0d7b808683b1c57ebc3f5cc9633",
+                "reference": "ba2956c3cb5ff0d7b808683b1c57ebc3f5cc9633",
                 "shasum": ""
             },
             "require": {
@@ -6112,7 +5834,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2020-07-20T18:18:31+00:00"
+            "time": "2020-10-22T18:12:00+00:00"
         },
         {
             "name": "beberlei/assert",
@@ -6330,16 +6052,16 @@
         },
         {
             "name": "codeception/codeception",
-            "version": "4.1.6",
+            "version": "4.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Codeception.git",
-                "reference": "5515b6a6c6f1e1c909aaff2e5f3a15c177dfd1a9"
+                "reference": "41036e8af66e727c4587012f0366b7f0576a99da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/5515b6a6c6f1e1c909aaff2e5f3a15c177dfd1a9",
-                "reference": "5515b6a6c6f1e1c909aaff2e5f3a15c177dfd1a9",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/41036e8af66e727c4587012f0366b7f0576a99da",
+                "reference": "41036e8af66e727c4587012f0366b7f0576a99da",
                 "shasum": ""
             },
             "require": {
@@ -6411,31 +6133,26 @@
                 "functional testing",
                 "unit testing"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/codeception",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2020-06-07T16:31:51+00:00"
+            "time": "2020-10-11T17:54:58+00:00"
         },
         {
             "name": "codeception/lib-asserts",
-            "version": "1.12.0",
+            "version": "1.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/lib-asserts.git",
-                "reference": "acd0dc8b394595a74b58dcc889f72569ff7d8e71"
+                "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/acd0dc8b394595a74b58dcc889f72569ff7d8e71",
-                "reference": "acd0dc8b394595a74b58dcc889f72569ff7d8e71",
+                "url": "https://api.github.com/repos/Codeception/lib-asserts/zipball/184231d5eab66bc69afd6b9429344d80c67a33b6",
+                "reference": "184231d5eab66bc69afd6b9429344d80c67a33b6",
                 "shasum": ""
             },
             "require": {
                 "codeception/phpunit-wrapper": ">6.0.15 <6.1.0 | ^6.6.1 | ^7.7.1 | ^8.0.3 | ^9.0",
-                "php": ">=5.6.0 <8.0"
+                "ext-dom": "*",
+                "php": ">=5.6.0 <9.0"
             },
             "type": "library",
             "autoload": {
@@ -6455,40 +6172,41 @@
                 },
                 {
                     "name": "Gintautas Miselis"
+                },
+                {
+                    "name": "Gustavo Nieves",
+                    "homepage": "https://medium.com/@ganieves"
                 }
             ],
             "description": "Assertion methods used by Codeception core and Asserts module",
-            "homepage": "http://codeception.com/",
+            "homepage": "https://codeception.com/",
             "keywords": [
                 "codeception"
             ],
-            "time": "2020-04-17T18:20:46+00:00"
+            "time": "2020-10-21T16:26:20+00:00"
         },
         {
             "name": "codeception/module-asserts",
-            "version": "1.2.1",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-asserts.git",
-                "reference": "79f13d05b63f2fceba4d0e78044bab668c9b2a6b"
+                "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/79f13d05b63f2fceba4d0e78044bab668c9b2a6b",
-                "reference": "79f13d05b63f2fceba4d0e78044bab668c9b2a6b",
+                "url": "https://api.github.com/repos/Codeception/module-asserts/zipball/59374f2fef0cabb9e8ddb53277e85cdca74328de",
+                "reference": "59374f2fef0cabb9e8ddb53277e85cdca74328de",
                 "shasum": ""
             },
             "require": {
                 "codeception/codeception": "*@dev",
-                "codeception/lib-asserts": "^1.12.0",
-                "php": ">=5.6.0 <8.0"
+                "codeception/lib-asserts": "^1.13.1",
+                "php": ">=5.6.0 <9.0"
             },
             "conflict": {
                 "codeception/codeception": "<4.0"
             },
-            "require-dev": {
-                "codeception/util-robohelpers": "dev-master"
-            },
             "type": "library",
             "autoload": {
                 "classmap": [
@@ -6505,16 +6223,20 @@
                 },
                 {
                     "name": "Gintautas Miselis"
+                },
+                {
+                    "name": "Gustavo Nieves",
+                    "homepage": "https://medium.com/@ganieves"
                 }
             ],
             "description": "Codeception module containing various assertions",
-            "homepage": "http://codeception.com/",
+            "homepage": "https://codeception.com/",
             "keywords": [
                 "assertions",
                 "asserts",
                 "codeception"
             ],
-            "time": "2020-04-20T07:26:11+00:00"
+            "time": "2020-10-21T16:48:15+00:00"
         },
         {
             "name": "codeception/module-sequence",
@@ -6561,16 +6283,16 @@
         },
         {
             "name": "codeception/module-webdriver",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/module-webdriver.git",
-                "reference": "09c167817393090ce3dbce96027d94656b1963ce"
+                "reference": "d055c645f600e991e33d1f289a9645eee46c384e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/09c167817393090ce3dbce96027d94656b1963ce",
-                "reference": "09c167817393090ce3dbce96027d94656b1963ce",
+                "url": "https://api.github.com/repos/Codeception/module-webdriver/zipball/d055c645f600e991e33d1f289a9645eee46c384e",
+                "reference": "d055c645f600e991e33d1f289a9645eee46c384e",
                 "shasum": ""
             },
             "require": {
@@ -6612,20 +6334,20 @@
                 "browser-testing",
                 "codeception"
             ],
-            "time": "2020-05-31T08:47:24+00:00"
+            "time": "2020-10-11T18:54:47+00:00"
         },
         {
             "name": "codeception/phpunit-wrapper",
-            "version": "9.0.2",
+            "version": "9.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/phpunit-wrapper.git",
-                "reference": "eb27243d8edde68593bf8d9ef5e9074734777931"
+                "reference": "72bac7770866799e23a7dda1ac6bec2f8baccf45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/eb27243d8edde68593bf8d9ef5e9074734777931",
-                "reference": "eb27243d8edde68593bf8d9ef5e9074734777931",
+                "url": "https://api.github.com/repos/Codeception/phpunit-wrapper/zipball/72bac7770866799e23a7dda1ac6bec2f8baccf45",
+                "reference": "72bac7770866799e23a7dda1ac6bec2f8baccf45",
                 "shasum": ""
             },
             "require": {
@@ -6656,7 +6378,7 @@
                 }
             ],
             "description": "PHPUnit classes used by Codeception",
-            "time": "2020-04-17T18:16:31+00:00"
+            "time": "2020-10-11T18:14:42+00:00"
         },
         {
             "name": "codeception/stub",
@@ -6842,16 +6564,16 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.10.3",
+            "version": "1.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d"
+                "reference": "bfe91e31984e2ba76df1c1339681770401ec262f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5db60a4969eba0e0c197a19c077780aadbc43c5d",
-                "reference": "5db60a4969eba0e0c197a19c077780aadbc43c5d",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/bfe91e31984e2ba76df1c1339681770401ec262f",
+                "reference": "bfe91e31984e2ba76df1c1339681770401ec262f",
                 "shasum": ""
             },
             "require": {
@@ -6861,7 +6583,8 @@
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^7.5"
+                "phpstan/phpstan": "^0.12.20",
+                "phpunit/phpunit": "^7.5 || ^9.1.5"
             },
             "type": "library",
             "extra": {
@@ -6907,7 +6630,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2020-05-25T17:24:27+00:00"
+            "time": "2020-08-10T19:35:50+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -6989,20 +6712,6 @@
                 "redis",
                 "xcache"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-07T18:54:01+00:00"
         },
         {
@@ -7126,20 +6835,6 @@
                 "constructor",
                 "instantiate"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-29T17:27:14+00:00"
         },
         {
@@ -7202,20 +6897,6 @@
                 "parser",
                 "php"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-25T17:44:05+00:00"
         },
         {
@@ -7307,12 +6988,6 @@
                 }
             ],
             "description": "A tool to automatically fix PHP code style",
-            "funding": [
-                {
-                    "url": "https://github.com/keradus",
-                    "type": "github"
-                }
-            ],
             "time": "2020-06-27T23:57:46+00:00"
         },
         {
@@ -8040,28 +7715,29 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.69",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "7106f78428a344bc4f643c233a94e48795f10967"
+                "reference": "9be3b16c877d477357c015cec057548cf9b2a14a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
-                "reference": "7106f78428a344bc4f643c233a94e48795f10967",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a",
+                "reference": "9be3b16c877d477357c015cec057548cf9b2a14a",
                 "shasum": ""
             },
             "require": {
                 "ext-fileinfo": "*",
-                "php": ">=5.5.9"
+                "league/mime-type-detection": "^1.3",
+                "php": "^7.2.5 || ^8.0"
             },
             "conflict": {
                 "league/flysystem-sftp": "<1.0.6"
             },
             "require-dev": {
-                "phpspec/phpspec": "^3.4",
-                "phpunit/phpunit": "^5.7.26"
+                "phpspec/prophecy": "^1.11.1",
+                "phpunit/phpunit": "^8.5.8"
             },
             "suggest": {
                 "ext-fileinfo": "Required for MimeType",
@@ -8120,7 +7796,48 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2020-05-18T15:13:39+00:00"
+            "time": "2020-08-23T07:39:11+00:00"
+        },
+        {
+            "name": "league/mime-type-detection",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/mime-type-detection.git",
+                "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/353f66d7555d8a90781f6f5e7091932f9a4250aa",
+                "reference": "353f66d7555d8a90781f6f5e7091932f9a4250aa",
+                "shasum": ""
+            },
+            "require": {
+                "ext-fileinfo": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.36",
+                "phpunit/phpunit": "^8.5.8"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "League\\MimeTypeDetection\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Frank de Jonge",
+                    "email": "info@frankdejonge.nl"
+                }
+            ],
+            "description": "Mime-type detection for Flysystem",
+            "time": "2020-10-18T11:50:25+00:00"
         },
         {
             "name": "lusitanian/oauth",
@@ -8230,16 +7947,16 @@
         },
         {
             "name": "magento/magento2-functional-testing-framework",
-            "version": "3.1.0",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/magento/magento2-functional-testing-framework.git",
-                "reference": "8a106ea029f222f4354854636861273c7577bee9"
+                "reference": "c6760313811f2c04545a261c706d2a73dd727b9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/8a106ea029f222f4354854636861273c7577bee9",
-                "reference": "8a106ea029f222f4354854636861273c7577bee9",
+                "url": "https://api.github.com/repos/magento/magento2-functional-testing-framework/zipball/c6760313811f2c04545a261c706d2a73dd727b9a",
+                "reference": "c6760313811f2c04545a261c706d2a73dd727b9a",
                 "shasum": ""
             },
             "require": {
@@ -8317,7 +8034,7 @@
                 "magento",
                 "testing"
             ],
-            "time": "2020-08-19T19:57:27+00:00"
+            "time": "2020-09-28T18:26:59+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -8367,25 +8084,25 @@
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.5.0",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "52168cb9472de06979613d365c7f1ab8798be895"
+                "reference": "42dae2cbd13154083ca6d70099692fef8ca84bfb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/52168cb9472de06979613d365c7f1ab8798be895",
-                "reference": "52168cb9472de06979613d365c7f1ab8798be895",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/42dae2cbd13154083ca6d70099692fef8ca84bfb",
+                "reference": "42dae2cbd13154083ca6d70099692fef8ca84bfb",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0",
-                "symfony/polyfill-mbstring": "^1.4"
+                "php": "^5.4 || ^7.0 || ^8.0",
+                "symfony/polyfill-mbstring": "^1.17"
             },
             "require-dev": {
-                "composer/xdebug-handler": "^1.2",
-                "phpunit/phpunit": "^4.8.36|^7.5.15"
+                "composer/xdebug-handler": "^1.4",
+                "phpunit/phpunit": "^4.8.36 || ^7.5.15"
             },
             "bin": [
                 "bin/jp.php"
@@ -8393,7 +8110,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.5-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -8420,7 +8137,7 @@
                 "json",
                 "jsonpath"
             ],
-            "time": "2019-12-30T18:03:34+00:00"
+            "time": "2020-07-31T21:01:56+00:00"
         },
         {
             "name": "mustache/mustache",
@@ -8514,12 +8231,6 @@
                 "object",
                 "object graph"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-06-29T13:22:24+00:00"
         },
         {
@@ -8735,23 +8446,23 @@
         },
         {
             "name": "php-cs-fixer/diff",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-CS-Fixer/diff.git",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756"
+                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756",
-                "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759",
+                "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^5.6 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+                "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0",
                 "symfony/process": "^3.3"
             },
             "type": "library",
@@ -8765,14 +8476,14 @@
                 "BSD-3-Clause"
             ],
             "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
                 {
                     "name": "Sebastian Bergmann",
                     "email": "sebastian@phpunit.de"
                 },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
                 {
                     "name": "SpacePossum"
                 }
@@ -8782,7 +8493,7 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2018-02-15T16:58:55+00:00"
+            "time": "2020-10-14T08:39:05+00:00"
         },
         {
             "name": "php-webdriver/webdriver",
@@ -9006,16 +8717,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.0",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "3170448f5769fe19f456173d833734e0ff1b84df"
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/3170448f5769fe19f456173d833734e0ff1b84df",
-                "reference": "3170448f5769fe19f456173d833734e0ff1b84df",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
                 "shasum": ""
             },
             "require": {
@@ -9054,20 +8765,20 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2020-07-20T20:05:34+00:00"
+            "time": "2020-09-03T19:13:55+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651"
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e878a14a65245fbe78f8080eba03b47c3b705651",
-                "reference": "e878a14a65245fbe78f8080eba03b47c3b705651",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
+                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
                 "shasum": ""
             },
             "require": {
@@ -9099,20 +8810,20 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-06-27T10:12:23+00:00"
+            "time": "2020-09-17T18:55:26+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.8.2",
+            "version": "2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "714629ed782537f638fe23c4346637659b779a77"
+                "reference": "ce10831d4ddc2686c1348a98069771dd314534a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/714629ed782537f638fe23c4346637659b779a77",
-                "reference": "714629ed782537f638fe23c4346637659b779a77",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/ce10831d4ddc2686c1348a98069771dd314534a8",
+                "reference": "ce10831d4ddc2686c1348a98069771dd314534a8",
                 "shasum": ""
             },
             "require": {
@@ -9123,6 +8834,8 @@
             },
             "require-dev": {
                 "easy-doc/easy-doc": "0.0.0 || ^1.3.2",
+                "ext-json": "*",
+                "ext-simplexml": "*",
                 "gregwar/rst": "^1.0",
                 "mikey179/vfsstream": "^1.6.4",
                 "phpunit/phpunit": "^4.8.36 || ^5.7.27",
@@ -9169,7 +8882,7 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2020-02-16T20:15:50+00:00"
+            "time": "2020-09-23T22:06:32+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -9224,42 +8937,32 @@
                 "php",
                 "type"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-20T17:29:33+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.11.1",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160"
+                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b20034be5efcdab4fb60ca3a29cba2949aead160",
-                "reference": "b20034be5efcdab4fb60ca3a29cba2949aead160",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/8ce87516be71aae9b956f81906aaf0338e0d8a2d",
+                "reference": "8ce87516be71aae9b956f81906aaf0338e0d8a2d",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.2",
-                "php": "^7.2",
-                "phpdocumentor/reflection-docblock": "^5.0",
+                "php": "^7.2 || ~8.0, <8.1",
+                "phpdocumentor/reflection-docblock": "^5.2",
                 "sebastian/comparator": "^3.0 || ^4.0",
                 "sebastian/recursion-context": "^3.0 || ^4.0"
             },
             "require-dev": {
                 "phpspec/phpspec": "^6.0",
-                "phpunit/phpunit": "^8.0"
+                "phpunit/phpunit": "^8.0 || ^9.0 <9.3"
             },
             "type": "library",
             "extra": {
@@ -9297,7 +9000,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-07-08T12:44:21+00:00"
+            "time": "2020-09-29T09:10:42+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -9403,33 +9106,27 @@
                 "testing",
                 "xunit"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-23T08:02:54+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.4",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e"
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/25fefc5b19835ca653877fe081644a3f8c1d915e",
-                "reference": "25fefc5b19835ca653877fe081644a3f8c1d915e",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -9459,34 +9156,28 @@
                 "filesystem",
                 "iterator"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-07-11T05:18:21+00:00"
+            "time": "2020-09-28T05:57:25+00:00"
         },
         {
             "name": "phpunit/php-invoker",
-            "version": "3.0.2",
+            "version": "3.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-invoker.git",
-                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66"
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f6eedfed1085dd1f4c599629459a0277d25f9a66",
-                "reference": "f6eedfed1085dd1f4c599629459a0277d25f9a66",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
                 "ext-pcntl": "*",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-pcntl": "*"
@@ -9494,7 +9185,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                 }
             },
             "autoload": {
@@ -9518,33 +9209,27 @@
             "keywords": [
                 "process"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T11:53:53+00:00"
+            "time": "2020-09-28T05:58:55+00:00"
         },
         {
             "name": "phpunit/php-text-template",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324"
+                "reference": "18c887016e60e52477e54534956d7b47bc52cd84"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
-                "reference": "6ff9c8ea4d3212b88fcf74e25e516e2c51c99324",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/18c887016e60e52477e54534956d7b47bc52cd84",
+                "reference": "18c887016e60e52477e54534956d7b47bc52cd84",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -9573,13 +9258,7 @@
             "keywords": [
                 "template"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T11:55:37+00:00"
+            "time": "2020-09-28T06:03:05+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -9632,16 +9311,16 @@
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374"
+                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/5672711b6b07b14d5ab694e700c62eeb82fcf374",
-                "reference": "5672711b6b07b14d5ab694e700c62eeb82fcf374",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/a853a0e183b9db7eed023d7933a858fa1c8d25a3",
+                "reference": "a853a0e183b9db7eed023d7933a858fa1c8d25a3",
                 "shasum": ""
             },
             "require": {
@@ -9677,14 +9356,8 @@
             "keywords": [
                 "tokenizer"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "abandoned": true,
-            "time": "2020-06-27T06:36:25+00:00"
+            "time": "2020-08-04T08:28:15+00:00"
         },
         {
             "name": "phpunit/phpunit",
@@ -9870,23 +9543,23 @@
         },
         {
             "name": "sebastian/code-unit",
-            "version": "1.0.5",
+            "version": "1.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit.git",
-                "reference": "c1e2df332c905079980b119c4db103117e5e5c90"
+                "reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/c1e2df332c905079980b119c4db103117e5e5c90",
-                "reference": "c1e2df332c905079980b119c4db103117e5e5c90",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/59236be62b1bb9919e6d7f60b0b832dc05cef9ab",
+                "reference": "59236be62b1bb9919e6d7f60b0b832dc05cef9ab",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -9912,33 +9585,27 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:50:45+00:00"
+            "time": "2020-10-02T14:47:54+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819"
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ee51f9bb0c6d8a43337055db3120829fa14da819",
-                "reference": "ee51f9bb0c6d8a43337055db3120829fa14da819",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -9963,35 +9630,29 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:04:00+00:00"
+            "time": "2020-09-28T05:30:19+00:00"
         },
         {
             "name": "sebastian/comparator",
-            "version": "4.0.3",
+            "version": "4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f"
+                "reference": "7a8ff306445707539c1a6397372a982a1ec55120"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
-                "reference": "dcc580eadfaa4e7f9d2cf9ae1922134ea962e14f",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7a8ff306445707539c1a6397372a982a1ec55120",
+                "reference": "7a8ff306445707539c1a6397372a982a1ec55120",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0",
+                "php": ">=7.3",
                 "sebastian/diff": "^4.0",
                 "sebastian/exporter": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -10033,33 +9694,27 @@
                 "compare",
                 "equality"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:05:46+00:00"
+            "time": "2020-09-30T06:47:25+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113"
+                "reference": "ffc949a1a2aae270ea064453d7535b82e4c32092"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
-                "reference": "1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ffc949a1a2aae270ea064453d7535b82e4c32092",
+                "reference": "ffc949a1a2aae270ea064453d7535b82e4c32092",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0",
+                "phpunit/phpunit": "^9.3",
                 "symfony/process": "^4.2 || ^5"
             },
             "type": "library",
@@ -10095,33 +9750,27 @@
                 "unidiff",
                 "unified diff"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-30T04:46:02+00:00"
+            "time": "2020-09-28T05:32:55+00:00"
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.2",
+            "version": "5.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2"
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
-                "reference": "0a757cab9d5b7ef49a619f1143e6c9c1bc0fe9d2",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
+                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "suggest": {
                 "ext-posix": "*"
@@ -10129,7 +9778,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.0-dev"
+                    "dev-master": "5.1-dev"
                 }
             },
             "autoload": {
@@ -10154,35 +9803,29 @@
                 "environment",
                 "hhvm"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:07:24+00:00"
+            "time": "2020-09-28T05:52:38+00:00"
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "571d721db4aec847a0e59690b954af33ebf9f023"
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/571d721db4aec847a0e59690b954af33ebf9f023",
-                "reference": "571d721db4aec847a0e59690b954af33ebf9f023",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0",
+                "php": ">=7.3",
                 "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "^9.2"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -10227,13 +9870,7 @@
                 "export",
                 "exporter"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:08:55+00:00"
+            "time": "2020-09-28T05:24:23+00:00"
         },
         {
             "name": "sebastian/finder-facade",
@@ -10338,25 +9975,25 @@
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8"
+                "reference": "f6f5957013d84725427d361507e13513702888a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
-                "reference": "074fed2d0a6d08e1677dd8ce9d32aecb384917b8",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f6f5957013d84725427d361507e13513702888a4",
+                "reference": "f6f5957013d84725427d361507e13513702888a4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0",
+                "php": ">=7.3",
                 "sebastian/object-reflector": "^2.0",
                 "sebastian/recursion-context": "^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -10381,33 +10018,27 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:11:32+00:00"
+            "time": "2020-09-28T05:55:06+00:00"
         },
         {
             "name": "sebastian/object-reflector",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "127a46f6b057441b201253526f81d5406d6c7840"
+                "reference": "d9d0ab3b12acb1768bc1e0a89b23c90d2043cbe5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/127a46f6b057441b201253526f81d5406d6c7840",
-                "reference": "127a46f6b057441b201253526f81d5406d6c7840",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/d9d0ab3b12acb1768bc1e0a89b23c90d2043cbe5",
+                "reference": "d9d0ab3b12acb1768bc1e0a89b23c90d2043cbe5",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -10432,13 +10063,7 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:12:55+00:00"
+            "time": "2020-09-28T05:56:16+00:00"
         },
         {
             "name": "sebastian/phpcpd",
@@ -10493,23 +10118,23 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "4.0.2",
+            "version": "4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63"
+                "reference": "ed8c9cd355089134bc9cba421b5cfdd58f0eaef7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/062231bf61d2b9448c4fa5a7643b5e1829c11d63",
-                "reference": "062231bf61d2b9448c4fa5a7643b5e1829c11d63",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/ed8c9cd355089134bc9cba421b5cfdd58f0eaef7",
+                "reference": "ed8c9cd355089134bc9cba421b5cfdd58f0eaef7",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
@@ -10542,30 +10167,24 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:14:17+00:00"
+            "time": "2020-09-28T05:17:32+00:00"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0653718a5a629b065e91f774595267f8dc32e213"
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0653718a5a629b065e91f774595267f8dc32e213",
-                "reference": "0653718a5a629b065e91f774595267f8dc32e213",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.0"
@@ -10593,38 +10212,32 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:16:22+00:00"
+            "time": "2020-09-28T06:45:17+00:00"
         },
         {
             "name": "sebastian/type",
-            "version": "2.2.1",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a"
+                "reference": "fa592377f3923946cb90bf1f6a71ba2e5f229909"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/86991e2b33446cd96e648c18bcdb1e95afb2c05a",
-                "reference": "86991e2b33446cd96e648c18bcdb1e95afb2c05a",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fa592377f3923946cb90bf1f6a71ba2e5f229909",
+                "reference": "fa592377f3923946cb90bf1f6a71ba2e5f229909",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.2"
+                "phpunit/phpunit": "^9.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.2-dev"
+                    "dev-master": "2.3-dev"
                 }
             },
             "autoload": {
@@ -10645,30 +10258,24 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-07-05T08:31:53+00:00"
+            "time": "2020-10-06T08:41:03+00:00"
         },
         {
             "name": "sebastian/version",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c"
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/626586115d0ed31cb71483be55beb759b5af5a3c",
-                "reference": "626586115d0ed31cb71483be55beb759b5af5a3c",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": ">=7.3"
             },
             "type": "library",
             "extra": {
@@ -10694,13 +10301,7 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
-            "time": "2020-06-26T12:18:43+00:00"
+            "time": "2020-09-28T06:39:44+00:00"
         },
         {
             "name": "spomky-labs/otphp",
@@ -10775,16 +10376,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.5.5",
+            "version": "3.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6"
+                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
-                "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
+                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
                 "shasum": ""
             },
             "require": {
@@ -10822,20 +10423,20 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2020-04-17T01:09:41+00:00"
+            "time": "2020-10-23T02:01:07+00:00"
         },
         {
             "name": "symfony/config",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880"
+                "reference": "6ad8be6e1280f6734150d8a04a9160dd34ceb191"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/b8623ef3d99fe62a34baf7a111b576216965f880",
-                "reference": "b8623ef3d99fe62a34baf7a111b576216965f880",
+                "url": "https://api.github.com/repos/symfony/config/zipball/6ad8be6e1280f6734150d8a04a9160dd34ceb191",
+                "reference": "6ad8be6e1280f6734150d8a04a9160dd34ceb191",
                 "shasum": ""
             },
             "require": {
@@ -10888,34 +10489,20 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-23T13:08:13+00:00"
+            "time": "2020-09-02T16:23:27+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "6508423eded583fc07e88a0172803e1a62f0310c"
+                "reference": "2dea4a3ef2eb79138354c1d49e9372cc921af20b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6508423eded583fc07e88a0172803e1a62f0310c",
-                "reference": "6508423eded583fc07e88a0172803e1a62f0310c",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2dea4a3ef2eb79138354c1d49e9372cc921af20b",
+                "reference": "2dea4a3ef2eb79138354c1d49e9372cc921af20b",
                 "shasum": ""
             },
             "require": {
@@ -10977,34 +10564,20 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-06-12T08:11:32+00:00"
+            "time": "2020-10-01T12:14:45+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.1.3",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14"
+                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5e20b83385a77593259c9f8beb2c43cd03b2ac14",
-                "reference": "5e20b83385a77593259c9f8beb2c43cd03b2ac14",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5fa56b4074d1ae755beb55617ddafe6f5d78f665",
+                "reference": "5fa56b4074d1ae755beb55617ddafe6f5d78f665",
                 "shasum": ""
             },
             "require": {
@@ -11013,7 +10586,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-master": "2.2-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -11041,34 +10614,20 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-06-06T08:49:21+00:00"
+            "time": "2020-09-07T11:33:47+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "f93055171b847915225bd5b0a5792888419d8d75"
+                "reference": "353b42e7b4fd1c898aab09a059466c9cea74039b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f93055171b847915225bd5b0a5792888419d8d75",
-                "reference": "f93055171b847915225bd5b0a5792888419d8d75",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/353b42e7b4fd1c898aab09a059466c9cea74039b",
+                "reference": "353b42e7b4fd1c898aab09a059466c9cea74039b",
                 "shasum": ""
             },
             "require": {
@@ -11116,34 +10675,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-06-15T06:52:54+00:00"
+            "time": "2020-09-27T14:14:57+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "c0c418f05e727606e85b482a8591519c4712cf45"
+                "reference": "4404d6545125863561721514ad9388db2661eec5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/c0c418f05e727606e85b482a8591519c4712cf45",
-                "reference": "c0c418f05e727606e85b482a8591519c4712cf45",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/4404d6545125863561721514ad9388db2661eec5",
+                "reference": "4404d6545125863561721514ad9388db2661eec5",
                 "shasum": ""
             },
             "require": {
@@ -11193,34 +10738,20 @@
                 "mime",
                 "mime-type"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-06-09T15:07:35+00:00"
+            "time": "2020-09-02T16:23:27+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447"
+                "reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/663f5dd5e14057d1954fe721f9709d35837f2447",
-                "reference": "663f5dd5e14057d1954fe721f9709d35837f2447",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4c7e155bf7d93ea4ba3824d5a14476694a5278dd",
+                "reference": "4c7e155bf7d93ea4ba3824d5a14476694a5278dd",
                 "shasum": ""
             },
             "require": {
@@ -11263,25 +10794,11 @@
                 "configuration",
                 "options"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-23T13:08:13+00:00"
+            "time": "2020-09-27T03:44:28+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
@@ -11327,34 +10844,20 @@
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-20T17:43:50+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v5.1.2",
+            "version": "v5.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23"
+                "reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/ea342353a3ef4f453809acc4ebc55382231d4d23",
-                "reference": "ea342353a3ef4f453809acc4ebc55382231d4d23",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a",
+                "reference": "e147a68cb66a8b510f4b7481fe4da5b2ab65ec6a",
                 "shasum": ""
             },
             "require": {
@@ -11404,34 +10907,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-05-20T17:43:50+00:00"
+            "time": "2020-09-27T03:44:28+00:00"
         },
         {
             "name": "thecodingmachine/safe",
-            "version": "v1.1.3",
+            "version": "v1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/safe.git",
-                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb"
+                "reference": "72d9fee55e14e07a6283c9b3e28c09e85923a148"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/9f277171e296a3c8629c04ac93ec95ff0f208ccb",
-                "reference": "9f277171e296a3c8629c04ac93ec95ff0f208ccb",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/72d9fee55e14e07a6283c9b3e28c09e85923a148",
+                "reference": "72d9fee55e14e07a6283c9b3e28c09e85923a148",
                 "shasum": ""
             },
             "require": {
@@ -11452,15 +10941,21 @@
                 "psr-4": {
                     "Safe\\": [
                         "lib/",
+                        "deprecated/",
                         "generated/"
                     ]
                 },
                 "files": [
+                    "deprecated/apc.php",
+                    "deprecated/libevent.php",
+                    "deprecated/mssql.php",
+                    "deprecated/stats.php",
+                    "lib/special_cases.php",
                     "generated/apache.php",
-                    "generated/apc.php",
                     "generated/apcu.php",
                     "generated/array.php",
                     "generated/bzip2.php",
+                    "generated/calendar.php",
                     "generated/classobj.php",
                     "generated/com.php",
                     "generated/cubrid.php",
@@ -11489,14 +10984,12 @@
                     "generated/inotify.php",
                     "generated/json.php",
                     "generated/ldap.php",
-                    "generated/libevent.php",
                     "generated/libxml.php",
                     "generated/lzf.php",
                     "generated/mailparse.php",
                     "generated/mbstring.php",
                     "generated/misc.php",
                     "generated/msql.php",
-                    "generated/mssql.php",
                     "generated/mysql.php",
                     "generated/mysqli.php",
                     "generated/mysqlndMs.php",
@@ -11528,7 +11021,6 @@
                     "generated/sqlsrv.php",
                     "generated/ssdeep.php",
                     "generated/ssh2.php",
-                    "generated/stats.php",
                     "generated/stream.php",
                     "generated/strings.php",
                     "generated/swoole.php",
@@ -11542,8 +11034,7 @@
                     "generated/yaml.php",
                     "generated/yaz.php",
                     "generated/zip.php",
-                    "generated/zlib.php",
-                    "lib/special_cases.php"
+                    "generated/zlib.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -11551,7 +11042,7 @@
                 "MIT"
             ],
             "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
-            "time": "2020-07-10T09:34:29+00:00"
+            "time": "2020-10-22T09:17:04+00:00"
         },
         {
             "name": "theseer/fdomdocument",
@@ -11631,12 +11122,6 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
             "time": "2020-07-12T23:59:07+00:00"
         },
         {
@@ -11699,16 +11184,6 @@
                 "env",
                 "environment"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-14T17:54:18+00:00"
         },
         {

From 45ff6359d82a761562aa4a56782e1c262ab8bb33 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 23 Oct 2020 12:56:17 -0500
Subject: [PATCH 630/671] 29251 fix static

---
 .../BuyRequest/SuperAttributeDataProvider.php | 60 +++++++++++++------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
index d9c8ade39f621..0fa4b8da50817 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -8,17 +8,17 @@
 namespace Magento\ConfigurableProductGraphQl\Model\Cart\BuyRequest;
 
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\CatalogInventory\Api\StockStateInterface;
+use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\Stdlib\ArrayManager;
-use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
-use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Quote\Model\Quote;
+use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
 
 /**
  * DataProvider for building super attribute options in buy requests
@@ -76,7 +76,6 @@ public function __construct(
      */
     public function execute(array $cartItemData): array
     {
-
         $parentSku = $this->arrayManager->get('parent_sku', $cartItemData);
         if ($parentSku === null) {
             return [];
@@ -94,17 +93,7 @@ public function execute(array $cartItemData): array
             throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
         }
 
-
-        // Child stock check has to be performed a catalog by default would not show/check it
-        $childProduct = $this->productRepository->get($sku, false, null, true);
-
-        $result = $this->stockState->checkQuoteItemQty($childProduct->getId(), $qty, $qty, $qty, $cart->getStoreId());
-
-        if ($result->getHasError() ) {
-            throw new LocalizedException(
-                __($result->getMessage())
-            );
-        }
+        $this->checkProductStock($sku, (float) $qty, (int) $cart->getStoreId());
 
         $configurableProductLinks = $parentProduct->getExtensionAttributes()->getConfigurableProductLinks();
         if (!in_array($product->getId(), $configurableProductLinks)) {
@@ -124,12 +113,47 @@ public function execute(array $cartItemData): array
                 }
             }
         }
-        // Some options might be disabled and/or available when parent and child sku are provided
+        $this->checkSuperAttributeData($parentSku, $superAttributesData);
+
+        return ['super_attribute' => $superAttributesData];
+    }
+
+    /**
+     * Stock check for a product
+     *
+     * @param string $sku
+     * @param float $qty
+     * @param int $scopeId
+     */
+    private function checkProductStock(string $sku, float $qty, int $scopeId): void
+    {
+        // Child stock check has to be performed a catalog by default would not show/check it
+        $childProduct = $this->productRepository->get($sku, false, null, true);
+
+        $result = $this->stockState->checkQuoteItemQty($childProduct->getId(), $qty, $qty, $qty, $scopeId);
+
+        if ($result->getHasError()) {
+            throw new LocalizedException(
+                __($result->getMessage())
+            );
+        }
+    }
+
+    /**
+     * Check super attribute data.
+     *
+     * Some options might be disabled and/or available when parent and child sku are provided.
+     *
+     * @param string $parentSku
+     * @param array $superAttributesData
+     * @throws LocalizedException
+     */
+    private function checkSuperAttributeData(string $parentSku, array $superAttributesData): void
+    {
         if (empty($superAttributesData)) {
             throw new LocalizedException(
                 __('The product with SKU %sku is out of stock.', ['sku' => $parentSku])
             );
         }
-        return ['super_attribute' => $superAttributesData];
     }
 }

From badf7a17b2f76e1cd2ddb31aa26415668ef4640f Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Fri, 23 Oct 2020 14:01:57 -0500
Subject: [PATCH 631/671] 29251 fix static

---
 .../Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 12eebe9b926e8..f2dd6389d2c4a 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -16,7 +16,7 @@
 use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder;
 
 /**
- * Add simple product to cart
+ * Add simple product to cart mutation
  */
 class AddSimpleProductToCart
 {

From 97c350bbbb60aee37293a6e5afd8306c9ce4bf6e Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Fri, 23 Oct 2020 15:41:06 -0500
Subject: [PATCH 632/671] MC-37726: Price filter uses base currency for ranges

---
 .../Model/Resolver/Aggregations.php           |   4 +-
 .../Catalog/ProductSearchAggregationsTest.php | 133 +++++++++++++++---
 2 files changed, 114 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
index 7d10762d0f3b6..cddb95d5ba765 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
@@ -74,7 +74,9 @@ public function resolve(
             if (isset($results['price_bucket'])) {
                 foreach ($results['price_bucket']['options'] as &$value) {
                     list($from, $to) = explode('-', $value['label']);
-                    $newLabel = $this->priceCurrency->convertAndRound($from) . '-' . $this->priceCurrency->convertAndRound($to);
+                    $newLabel = $this->priceCurrency->convertAndRound($from)
+                        . '-'
+                        . $this->priceCurrency->convertAndRound($to);
                     $value['label'] = $newLabel;
                     $value['value'] = str_replace('-', '_', $newLabel);
                 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
index 9dbd902f1714e..075388b0f023c 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -7,6 +7,11 @@
 
 namespace Magento\GraphQl\Catalog;
 
+use Magento\Config\App\Config\Type\System;
+use Magento\Config\Model\ResourceModel\Config;
+use Magento\Directory\Model\Currency;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -22,28 +27,9 @@ public function testAggregationBooleanAttribute()
             . 'MC-36768: Custom attribute not appears in elasticsearch'
         );
 
-        $skus= '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"';
-        $query = <<<QUERY
-{
-    products(filter: {sku: {in: [{$skus}]}}){
-    items{
-      id
-      sku
-      name
-    }
-    aggregations{
-      label
-      attribute_code
-      count
-      options{
-        label
-        value
-        count
-      }
-    }
-  }
-}
-QUERY;
+        $query = $this->getGraphQlQuery(
+            '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
+        );
 
         $result = $this->graphQlQuery($query);
 
@@ -69,4 +55,107 @@ function ($a) {
         $this->assertCount(2, $booleanAggregation['options']);
         $this->assertContainsEquals(['label' => '0', 'value'=> '0', 'count' => '2'], $booleanAggregation['options']);
     }
+
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+     */
+    public function testAggregationPriceRanges()
+    {
+        $query = $this->getGraphQlQuery(
+            '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
+        );
+        $result = $this->graphQlQuery($query);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('aggregations', $result['products']);
+
+        $priceAggregation = array_filter(
+            $result['products']['aggregations'],
+            function ($a) {
+                return $a['attribute_code'] == 'price';
+            }
+        );
+        $this->assertNotEmpty($priceAggregation);
+        $priceAggregation = reset($priceAggregation);
+        $this->assertEquals('Price', $priceAggregation['label']);
+        $this->assertEquals(4, $priceAggregation['count']);
+        $expectedOptions = [
+            ['label' => '10-20', 'value'=> '10_20', 'count' => '2'],
+            ['label' => '20-30', 'value'=> '20_30', 'count' => '1'],
+            ['label' => '30-40', 'value'=> '30_40', 'count' => '1'],
+            ['label' => '40-50', 'value'=> '40_50', 'count' => '1']
+        ];
+        $this->assertEquals($expectedOptions, $priceAggregation['options']);
+    }
+
+    /**
+     * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
+     * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+     */
+    public function testAggregationPriceRangesWithCurrencyHeader()
+    {
+        // add USD as allowed (not default) currency
+        $objectManager = Bootstrap::getObjectManager();
+        /* @var Store $store */
+        $store = $objectManager->create(Store::class);
+        $store->load('fixture_second_store');
+        /** @var Config $configResource */
+        $configResource = $objectManager->get(Config::class);
+        $configResource->saveConfig(
+            Currency::XML_PATH_CURRENCY_ALLOW,
+            'USD',
+            ScopeInterface::SCOPE_STORES,
+            $store->getId()
+        );
+        // Configuration cache clean is required to reload currency setting
+        /** @var System $config */
+        $config = $objectManager->get(System::class);
+        $config->clean();
+
+        $headerMap['Store'] = 'fixture_second_store';
+        $headerMap['Content-Currency'] = 'USD';
+        $query = $this->getGraphQlQuery(
+            '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
+        );
+        $result = $this->graphQlQuery($query, [], '', $headerMap);
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertArrayHasKey('aggregations', $result['products']);
+        $priceAggregation = array_filter(
+            $result['products']['aggregations'],
+            function ($a) {
+                return $a['attribute_code'] == 'price';
+            }
+        );
+        $this->assertNotEmpty($priceAggregation);
+        $priceAggregation = reset($priceAggregation);
+        $this->assertEquals('Price', $priceAggregation['label']);
+        $this->assertEquals(4, $priceAggregation['count']);
+        $expectedOptions = [
+            ['label' => '10-20', 'value'=> '10_20', 'count' => '2'],
+            ['label' => '20-30', 'value'=> '20_30', 'count' => '1'],
+            ['label' => '30-40', 'value'=> '30_40', 'count' => '1'],
+            ['label' => '40-50', 'value'=> '40_50', 'count' => '1']
+        ];
+        $this->assertEquals($expectedOptions, $priceAggregation['options']);
+    }
+
+    private function getGraphQlQuery(string $skus)
+    {
+        return <<<QUERY
+{
+    products(filter: {sku: {in: [{$skus}]}}){
+    aggregations{
+      label
+      attribute_code
+      count
+      options{
+        label
+        value
+        count
+      }
+    }
+  }
+}
+QUERY;
+    }
 }

From 3009cdc6772ec1e8b0fae0eaad37865fb88c70dc Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Sat, 24 Oct 2020 02:16:44 +0300
Subject: [PATCH 633/671] M2CE-30469: [GRAPHQL] Made the attribute
 `destination_cart_id` for mergeCarts mutation not required.

---
 .../Model/Resolver/MergeCarts.php             | 81 +++++++++++++++----
 .../Magento/QuoteGraphQl/etc/schema.graphqls  |  2 +-
 .../GraphQl/Quote/Customer/MergeCartsTest.php |  3 -
 3 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
index d77d19df55603..50682413aea1e 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
@@ -7,17 +7,23 @@
 
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
+use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\GraphQl\Model\Query\ContextInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Cart\CustomerCartResolver;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 
 /**
  * Merge Carts Resolver
+ *
+ * @SuppressWarnings(PHPMD.LongVariable)
  */
 class MergeCarts implements ResolverInterface
 {
@@ -31,44 +37,87 @@ class MergeCarts implements ResolverInterface
      */
     private $cartRepository;
 
+    /**
+     * @var CustomerCartResolver
+     */
+    private $customerCartResolver;
+
+    /**
+     * @var QuoteIdToMaskedQuoteIdInterface
+     */
+    private $quoteIdToMaskedQuoteId;
+
     /**
      * @param GetCartForUser $getCartForUser
      * @param CartRepositoryInterface $cartRepository
+     * @param CustomerCartResolver $customerCartResolver
+     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
      */
     public function __construct(
         GetCartForUser $getCartForUser,
-        CartRepositoryInterface $cartRepository
+        CartRepositoryInterface $cartRepository,
+        CustomerCartResolver $customerCartResolver,
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartRepository = $cartRepository;
+        $this->customerCartResolver = $customerCartResolver;
+        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
     }
 
     /**
      * @inheritdoc
      */
-    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
-    {
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
         if (empty($args['source_cart_id'])) {
-            throw new GraphQlInputException(__('Required parameter "source_cart_id" is missing'));
-        }
-
-        if (empty($args['destination_cart_id'])) {
-            throw new GraphQlInputException(__('Required parameter "destination_cart_id" is missing'));
+            throw new GraphQlInputException(__(
+                'Required parameter "source_cart_id" is missing'
+            ));
         }
 
         /** @var ContextInterface $context */
         if (false === $context->getExtensionAttributes()->getIsCustomer()) {
-            throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+            throw new GraphQlAuthorizationException(__(
+                'The current customer isn\'t authorized.'
+            ));
+        }
+        $currentUserId = $context->getUserId();
+
+        if (empty($args['destination_cart_id'])) {
+            try {
+                $cart = $this->customerCartResolver->resolve($currentUserId);
+            } catch (CouldNotSaveException $exception) {
+                throw new GraphQlNoSuchEntityException(
+                    __('Could not create empty cart for customer'),
+                    $exception
+                );
+            }
+            $customerMaskedCartId = $this->quoteIdToMaskedQuoteId->execute(
+                (int) $cart->getId()
+            );
         }
 
         $guestMaskedCartId = $args['source_cart_id'];
-        $customerMaskedCartId = $args['destination_cart_id'];
+        $customerMaskedCartId = $customerMaskedCartId ?? $args['destination_cart_id'];
 
-        $currentUserId = $context->getUserId();
         $storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
         // passing customerId as null enforces source cart should always be a guestcart
-        $guestCart = $this->getCartForUser->execute($guestMaskedCartId, null, $storeId);
-        $customerCart = $this->getCartForUser->execute($customerMaskedCartId, $currentUserId, $storeId);
+        $guestCart = $this->getCartForUser->execute(
+            $guestMaskedCartId,
+            null,
+            $storeId
+        );
+        $customerCart = $this->getCartForUser->execute(
+            $customerMaskedCartId,
+            $currentUserId,
+            $storeId
+        );
         $customerCart->merge($guestCart);
         $guestCart->setIsActive(false);
         $this->cartRepository->save($customerCart);
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 4e0e7ce5732be..cc9d1803b3e31 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -20,7 +20,7 @@ type Mutation {
     setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
     setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
     setPaymentMethodAndPlaceOrder(input: SetPaymentMethodAndPlaceOrderInput): PlaceOrderOutput @deprecated(reason: "Should use setPaymentMethodOnCart and placeOrder mutations in single request.") @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentAndPlaceOrder")
-    mergeCarts(source_cart_id: String!, destination_cart_id: String!): Cart! @doc(description:"Merges the source cart into the destination cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\MergeCarts")
+    mergeCarts(source_cart_id: String!, destination_cart_id: String): Cart! @doc(description:"Merges the source cart into the destination cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\MergeCarts")
     placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
     addProductsToCart(cartId: String!, cartItems: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add any type of product to the cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
index 65e91bf193020..b33d9982b8187 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
@@ -192,9 +192,6 @@ public function testMergeCartsWithEmptySourceCartId()
      */
     public function testMergeCartsWithEmptyDestinationCartId()
     {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Required parameter "destination_cart_id" is missing');
-
         $guestQuote = $this->quoteFactory->create();
         $this->quoteResource->load(
             $guestQuote,

From d4e5894ae29b8088c8cc6db59f332bfc70dd9a4a Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Sun, 25 Oct 2020 22:28:53 +0200
Subject: [PATCH 634/671] M2CE-30469: The tests and logic fixes

---
 .../Model/Resolver/MergeCarts.php             |  8 +-
 .../GraphQl/Quote/Customer/MergeCartsTest.php | 76 +++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
index 50682413aea1e..d53ab597eaba4 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
@@ -89,7 +89,7 @@ public function resolve(
         }
         $currentUserId = $context->getUserId();
 
-        if (empty($args['destination_cart_id'])) {
+        if (!isset($args['destination_cart_id'])) {
             try {
                 $cart = $this->customerCartResolver->resolve($currentUserId);
             } catch (CouldNotSaveException $exception) {
@@ -101,6 +101,12 @@ public function resolve(
             $customerMaskedCartId = $this->quoteIdToMaskedQuoteId->execute(
                 (int) $cart->getId()
             );
+        } else {
+            if (empty($args['destination_cart_id'])) {
+                throw new GraphQlInputException(__(
+                    'The parameter "destination_cart_id" cannot be empty'
+                ));
+            }
         }
 
         $guestMaskedCartId = $args['source_cart_id'];
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
index b33d9982b8187..4f50b9df3098a 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/MergeCartsTest.php
@@ -192,6 +192,9 @@ public function testMergeCartsWithEmptySourceCartId()
      */
     public function testMergeCartsWithEmptyDestinationCartId()
     {
+        $this->expectException(\Exception::class);
+        $this->expectExceptionMessage('The parameter "destination_cart_id" cannot be empty');
+
         $guestQuote = $this->quoteFactory->create();
         $this->quoteResource->load(
             $guestQuote,
@@ -206,6 +209,54 @@ public function testMergeCartsWithEmptyDestinationCartId()
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Checkout/_files/quote_with_virtual_product_saved.php
+     * @magentoApiDataFixture Magento/Customer/_files/customer.php
+     * @magentoApiDataFixture Magento/GraphQl/Catalog/_files/simple_product.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/customer/create_empty_cart.php
+     * @magentoApiDataFixture Magento/GraphQl/Quote/_files/add_simple_product.php
+     */
+    public function testMergeCartsWithoutDestinationCartId()
+    {
+        $guestQuote = $this->quoteFactory->create();
+        $this->quoteResource->load(
+            $guestQuote,
+            'test_order_with_virtual_product_without_address',
+            'reserved_order_id'
+        );
+        $guestQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$guestQuote->getId());
+        $query = $this->getCartMergeMutationWithoutDestinationCartId(
+            $guestQuoteMaskedId
+        );
+        $mergeResponse = $this->graphQlMutation($query, [], '', $this->getHeaderMap());
+
+        self::assertArrayHasKey('mergeCarts', $mergeResponse);
+        $cartResponse = $mergeResponse['mergeCarts'];
+        self::assertArrayHasKey('items', $cartResponse);
+        self::assertCount(2, $cartResponse['items']);
+
+        $customerQuote = $this->quoteFactory->create();
+        $this->quoteResource->load($customerQuote, 'test_quote', 'reserved_order_id');
+        $customerQuoteMaskedId = $this->quoteIdToMaskedId->execute((int)$customerQuote->getId());
+
+        $cartResponse = $this->graphQlMutation(
+            $this->getCartQuery($customerQuoteMaskedId),
+            [],
+            '',
+            $this->getHeaderMap()
+        );
+
+        self::assertArrayHasKey('cart', $cartResponse);
+        self::assertArrayHasKey('items', $cartResponse['cart']);
+        self::assertCount(2, $cartResponse['cart']['items']);
+        $item1 = $cartResponse['cart']['items'][0];
+        self::assertArrayHasKey('quantity', $item1);
+        self::assertEquals(2, $item1['quantity']);
+        $item2 = $cartResponse['cart']['items'][1];
+        self::assertArrayHasKey('quantity', $item2);
+        self::assertEquals(1, $item2['quantity']);
+    }
+
     /**
      * Add simple product to cart
      *
@@ -253,6 +304,31 @@ private function getCartMergeMutation(string $guestQuoteMaskedId, string $custom
 QUERY;
     }
 
+    /**
+     * Create the mergeCart mutation
+     *
+     * @param string $guestQuoteMaskedId
+     * @return string
+     */
+    private function getCartMergeMutationWithoutDestinationCartId(
+        string $guestQuoteMaskedId
+    ): string {
+        return <<<QUERY
+mutation {
+  mergeCarts(
+    source_cart_id: "{$guestQuoteMaskedId}"
+  ){
+  items {
+      quantity
+      product {
+        sku
+      }
+    }
+  }
+}
+QUERY;
+    }
+
     /**
      * Get cart query
      *

From dedf0950ae58a4dbeea5db0672897b540613a0c6 Mon Sep 17 00:00:00 2001
From: Yurii Sapiha <yurasapiga93@gmail.com>
Date: Mon, 26 Oct 2020 10:45:58 +0200
Subject: [PATCH 635/671] MC-37128: Create automated test for "[Security] No
 XSS injections in order comments"

---
 .../_files/quote_with_address_and_shipping_method_saved.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php
index 0f8e92e252057..98953fe785695 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_address_and_shipping_method_saved.php
@@ -18,7 +18,9 @@
 $quoteRepository = $objectManager->get(CartRepositoryInterface::class);
 /** @var CartManagementInterface $quoteManagement */
 $quoteManagement = $objectManager->get(CartManagementInterface::class);
-$quote = $objectManager->get(GetQuoteByReservedOrderId::class)->execute('test_order_1');
+/** @var GetQuoteByReservedOrderId $getQuoteByReservedOrderId */
+$getQuoteByReservedOrderId = $objectManager->get(GetQuoteByReservedOrderId::class);
+$quote = $getQuoteByReservedOrderId->execute('test_order_1');
 $quote->setIsActive(true);
 $quote->getShippingAddress()->setShippingMethod('flatrate_flatrate');
 $quote->getShippingAddress()->setCollectShippingRates(true);

From 3aa86ee47ac73aa12c5771bf8b4adaa278d15628 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 26 Oct 2020 11:01:06 +0200
Subject: [PATCH 636/671] MC-37954: PLP sort by name is case-sensitive with
 ElasticSearch

---
 .../Model/Adapter/BatchDataMapper/ProductDataMapper.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
index 53472710671a4..0edc63b10f9ab 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/ProductDataMapper.php
@@ -272,6 +272,9 @@ private function isAttributeLabelsShouldBeMapped(Attribute $attribute): bool
      * @param array $attributeValues
      * @param int $storeId
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function prepareAttributeValues(
         int $productId,

From 80c3184e9655f3a003119b30dbc744839dad5c63 Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Mon, 26 Oct 2020 11:06:56 +0200
Subject: [PATCH 637/671] MC-38488: [MFTF]
 AdminMediaGalleryAssertUsedInLinkBlocksGridTest failed because of bad design

---
 ...eryAssertImageUsedInLinkBlocksGridTest.xml | 63 ++++++++-------
 ...ediaGalleryDeletedAllImagesActionGroup.xml | 30 ++++++++
 .../Test/Mftf/Helper/MediaGalleryUiHelper.php | 77 +++++++++++++++++++
 ...nhancedMediaGalleryImageActionsSection.xml |  2 +-
 ...nEnhancedMediaGalleryMassActionSection.xml |  1 +
 .../AdminMediaGalleryMessagesSection.xml      | 13 ++++
 .../web/js/grid/filters/elements/ui-select.js |  4 +-
 7 files changed, 155 insertions(+), 35 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml

diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
index c25e55cd30461..63f6a483665c9 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
@@ -9,29 +9,44 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest">
         <annotations>
-            <features value="AdminMediaGalleryUsedInBlocksFilter"/>
-            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
-            <title value="Used in blocks link"/>
+            <features value="MediaGalleryCmsUi"/>
             <stories value="Story 58: User sees entities where asset is used in" />
-            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
+            <title value="Used in blocks link"/>
             <description value="User filters assets used in blocks"/>
             <severity value="CRITICAL"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
             <group value="media_gallery_ui"/>
         </annotations>
         <before>
-            <createData entity="_defaultBlock" stepKey="block" />
-            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+            <createData entity="_defaultBlock" stepKey="createBlock" />
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
         </before>
         <after>
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCacheAfterTest">
-                <argument name="tags" value="block_html"/>
+            <deleteData createDataKey="createBlock" stepKey="deleteBlock"/>
+
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolderAgain">
+                <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
+            <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeImageDetails"/>
+
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
+                <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
             </actionGroup>
+
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImagesAfterTest"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
 
         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
-            <argument name="CMSBlockPage" value="$$block$$"/>
+            <argument name="CMSBlockPage" value="$createBlock$"/>
         </actionGroup>
         <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
         <waitForPageLoad stepKey="waitForInitialPageLoad" />
@@ -39,10 +54,10 @@
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
         <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
         <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
-            <argument name="name" value="blockImage"/>
+            <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated">
-            <argument name="name" value="blockImage"/>
+            <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>
         <waitForPageLoad stepKey="waitForGridToLoadAfterNewFolderCreated"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
@@ -57,34 +72,16 @@
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
         <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
-            <argument name="name" value="blockImage"/>
+            <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInBlocks">
             <argument name="entityName" value="Blocks"/>
         </actionGroup>
-        <wait time="5" stepKey="waitForAssertLoads"/>
-        <reloadPage stepKey="reloadBlocksGridPage"/>
-        <waitForPageLoad stepKey="waitForBlocksGridPageLoad"/>
+
         <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
         </actionGroup>
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterInBlocksGrid"/>
-
-        <deleteData createDataKey="block" stepKey="deleteBlock"/>
-
-        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
-        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolderAgain">
-            <argument name="name" value="blockImage"/>
-        </actionGroup>
-        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
-        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
-        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeImageDetails"/>
-
-        <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
-        <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted">
-            <argument name="name" value="blockImage"/>
-        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
new file mode 100644
index 0000000000000..f77521879c8ea
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup">
+        <annotations>
+            <description>Open Media Gallery page and delete all images</description>
+        </annotations>
+
+        <amOnPage url="{{AdminStandaloneMediaGalleryPage.url}}" stepKey="openMediaGalleryPage"/>
+        <!-- It sometimes is loading too long for default 10s -->
+        <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <helper class="\Magento\MediaGalleryUi\Test\Mftf\Helper\MediaGalleryUiHelper" method="deleteAllImagesUsingMassAction" stepKey="deleteAllImagesUsingMassAction">
+            <argument name="emptyRow">{{AdminMediaGalleryGridSection.noDataMessage}}</argument>
+            <argument name="deleteImagesButton">{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}</argument>
+            <argument name="checkImage">{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckboxAll}}</argument>
+            <argument name="deleteSelectedButton">{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}</argument>
+            <argument name="modalAcceptButton">{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}</argument>
+            <argument name="successMessageContainer">{{AdminMediaGalleryMessagesSection.success}}</argument>
+            <argument name="successMessage">been successfully deleted</argument>
+        </helper>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
new file mode 100644
index 0000000000000..4059a8460bb51
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver as FacebookWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\WebDriverBy;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
+
+/**
+ * Class for MFTF helpers for MediaGalleryUi module.
+ */
+class MediaGalleryUiHelper extends Helper
+{
+    /**
+     * Delete all images using mass action.
+     *
+     * @param string $emptyRow
+     * @param string $deleteImagesButton
+     * @param string $checkImage
+     * @param string $deleteSelectedButton
+     * @param string $modalAcceptButton
+     * @param string $successMessageContainer
+     * @param string $successMessage
+     *
+     * @return void
+     */
+    public function deleteAllImagesUsingMassAction(
+        string $emptyRow,
+        string $deleteImagesButton,
+        string $checkImage,
+        string $deleteSelectedButton,
+        string $modalAcceptButton,
+        string $successMessageContainer,
+        string $successMessage
+    ): void {
+        try {
+            /** @var MagentoWebDriver $webDriver */
+            $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+            /** @var FacebookWebDriver $webDriver */
+            $webDriver = $magentoWebDriver->webDriver;
+            $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+            while (empty($rows)) {
+                $magentoWebDriver->click($deleteImagesButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($deleteSelectedButton, 10);
+
+                // Check all images
+                /** @var RemoteWebElement[] $images */
+                $imagesCheckboxes = $webDriver->findElements(WebDriverBy::cssSelector($checkImage));
+                /** @var RemoteWebElement $image */
+                foreach ($imagesCheckboxes as $imageCheckbox) {
+                    $imageCheckbox->click();
+                }
+
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->click($deleteSelectedButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+                $magentoWebDriver->click($modalAcceptButton);
+                $magentoWebDriver->waitForPageLoad(60);
+                $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+                $magentoWebDriver->see($successMessage, $successMessageContainer);
+
+                $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+            }
+        } catch (\Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
index a8e9feaa2d623..bfb92f0cd8ee7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -10,7 +10,7 @@
     <section name="AdminEnhancedMediaGalleryImageActionsSection">
         <element name="openContextMenu" type="button" selector=".three-dots"/>
         <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
-        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[@class='action-menu-item' and contains(text(), 'View Details')]" timeout="30" />
+        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[text()='View Details']" timeout="30" />
         <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
         <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
         <element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index 07f2dc23530e1..9018ccb4ddd69 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -13,5 +13,6 @@
         <element name="cancelMassActionMode" type="button" selector="#cancel_massaction"/>
         <element name="deleteImages" type="button" selector="#delete_massaction"/>
         <element name="deleteSelected" type="button" selector="#delete_selected_massaction"/>
+        <element name="massActionCheckboxAll" type="checkbox" selector="[data-id='media-gallery-masonry-grid'] .mediagallery-massaction-checkbox input[type='checkbox']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
new file mode 100644
index 0000000000000..42a936b6c0ebc
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminMediaGalleryMessagesSection">
+        <element name="success" type="text" selector=".media-gallery-container ul.messages div.message.message-success span"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
index a913f3fa4a042..cddcc7d49ffe8 100644
--- a/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
+++ b/app/code/Magento/Ui/view/base/web/js/grid/filters/elements/ui-select.js
@@ -18,13 +18,15 @@ define([
             loadedOption: [],
             validationLoading: true,
             imports: {
+                applied: '${ $.filterChipsProvider }:applied',
                 activeIndex: '${ $.bookmarkProvider }:activeIndex'
             },
             modules: {
                 filterChips: '${ $.filterChipsProvider }'
             },
             listens: {
-                activeIndex: 'validateInitialValue'
+                activeIndex: 'validateInitialValue',
+                applied: 'validateInitialValue'
             }
 
         },

From 76b9492952301f7f4a7b888bac9cdc16d2568d9c Mon Sep 17 00:00:00 2001
From: engcom-Kilo <mikola.malevanec@transoftgroup.com>
Date: Mon, 19 Oct 2020 17:48:24 +0300
Subject: [PATCH 638/671] MC-38509: Submitting invalid create account form
 leaves the submit button disabled.

---
 ...frontCreateCustomerWithInvalidDataTest.xml | 39 +++++++++++++++++++
 .../frontend/web/js/block-submit-on-send.js   |  6 +++
 2 files changed, 45 insertions(+)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithInvalidDataTest.xml

diff --git a/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithInvalidDataTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithInvalidDataTest.xml
new file mode 100644
index 0000000000000..ef610831a721d
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/StorefrontCreateCustomerWithInvalidDataTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontCreateCustomerWithInvalidDataTest">
+        <annotations>
+            <stories value="Create a Customer via the Storefront"/>
+            <features value="Customer"/>
+            <title value="Register customer on storefront after customer form validation failed."/>
+            <description value="Customer should be able to re-submit register form after correcting invalid form data on storefront."/>
+            <severity value="CRITICAL"/>
+            <testCaseId value="MC-38532"/>
+            <useCaseId value="MC-38509"/>
+            <group value="customer"/>
+        </annotations>
+
+        <actionGroup ref="StorefrontOpenCustomerAccountCreatePageActionGroup" stepKey="openCreateAccountPage"/>
+        <!--Try to submit register form with wrong password.-->
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountFormWithWrongData">
+            <argument name="customer" value="Simple_Customer_With_Password_Length_Is_Below_Eight_Characters"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="tryToSubmitFormWithWrongPassword"/>
+        <actionGroup ref="AssertMessageCustomerCreateAccountPasswordComplexityActionGroup" stepKey="seeTheErrorPasswordLength">
+            <argument name="message" value="Minimum length of this field must be equal or greater than 8 symbols. Leading and trailing spaces will be ignored."/>
+        </actionGroup>
+        <!--Re-submit customer register form with correct data.-->
+        <actionGroup ref="StorefrontFillCustomerAccountCreationFormActionGroup" stepKey="fillCreateAccountFormWithCorrectData">
+            <argument name="customer" value="Simple_US_Customer"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickCreateAnAccountCustomerAccountCreationFormActionGroup" stepKey="submitCreateAccountForm"/>
+        <actionGroup ref="AssertMessageCustomerCreateAccountActionGroup" stepKey="seeSuccessMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/block-submit-on-send.js b/app/code/Magento/Customer/view/frontend/web/js/block-submit-on-send.js
index b941ec7a254d8..75f4ee6097685 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/block-submit-on-send.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/block-submit-on-send.js
@@ -14,9 +14,15 @@ define([
 
         dataForm.submit(function () {
             $(this).find(':submit').attr('disabled', 'disabled');
+
+            if (this.isValid === false) {
+                $(this).find(':submit').prop('disabled', false);
+            }
+            this.isValid = true;
         });
         dataForm.bind('invalid-form.validate', function () {
             $(this).find(':submit').prop('disabled', false);
+            this.isValid = false;
         });
     };
 });

From 0e9238ea655adbc361d5d9077bdd7efea28b8c93 Mon Sep 17 00:00:00 2001
From: SmVladyslav <vlatame.tsg@gmail.com>
Date: Mon, 26 Oct 2020 12:18:32 +0200
Subject: [PATCH 639/671] MC-37120: Shopping cart is empty after adding simple
 product if another product was removed from Multiple Addresses checkout
 before

---
 .../Model/DisableMultishipping.php            |  38 ++++++
 .../Observer/DisableMultishippingObserver.php |  46 +++++++
 .../Plugin/DisableMultishippingMode.php       |  25 ++--
 .../Unit/Model/DisableMultishippingTest.php   | 116 ++++++++++++++++++
 .../Plugin/DisableMultishippingModeTest.php   |  90 +++++++++-----
 .../Multishipping/etc/frontend/events.xml     |  12 ++
 .../DisableMultishippingObserverTest.php      |  87 +++++++++++++
 .../Plugin/DisableMultishippingModeTest.php   |  70 +++++++++++
 8 files changed, 442 insertions(+), 42 deletions(-)
 create mode 100644 app/code/Magento/Multishipping/Model/DisableMultishipping.php
 create mode 100644 app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php
 create mode 100644 app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
 create mode 100644 app/code/Magento/Multishipping/etc/frontend/events.xml
 create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Observer/DisableMultishippingObserverTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Multishipping/Plugin/DisableMultishippingModeTest.php

diff --git a/app/code/Magento/Multishipping/Model/DisableMultishipping.php b/app/code/Magento/Multishipping/Model/DisableMultishipping.php
new file mode 100644
index 0000000000000..a871cee715538
--- /dev/null
+++ b/app/code/Magento/Multishipping/Model/DisableMultishipping.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Model;
+
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Turn Off Multishipping mode if enabled.
+ */
+class DisableMultishipping
+{
+    /**
+     * Disable Multishipping mode for provided Quote and return TRUE if it was changed.
+     *
+     * @param CartInterface $quote
+     * @return bool
+     */
+    public function execute(CartInterface $quote): bool
+    {
+        $modeChanged = false;
+        if ($quote->getIsMultiShipping()) {
+            $quote->setIsMultiShipping(0);
+            $extensionAttributes = $quote->getExtensionAttributes();
+            if ($extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+                $extensionAttributes->setShippingAssignments([]);
+            }
+
+            $modeChanged = true;
+        }
+
+        return $modeChanged;
+    }
+}
diff --git a/app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php b/app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php
new file mode 100644
index 0000000000000..a72bce87965a4
--- /dev/null
+++ b/app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Event\Observer as EventObserver;
+use Magento\Multishipping\Model\DisableMultishipping;
+use Magento\Quote\Api\Data\CartInterface;
+
+/**
+ * Observer for disabling Multishipping mode.
+ */
+class DisableMultishippingObserver implements ObserverInterface
+{
+    /**
+     * @var DisableMultishipping
+     */
+    private $disableMultishipping;
+
+    /**
+     * @param DisableMultishipping $disableMultishipping
+     */
+    public function __construct(
+        DisableMultishipping $disableMultishipping
+    ) {
+        $this->disableMultishipping = $disableMultishipping;
+    }
+
+    /**
+     * Disable Multishipping mode before saving Quote.
+     *
+     * @param EventObserver $observer
+     * @return void
+     */
+    public function execute(EventObserver $observer): void
+    {
+        /** @var CartInterface $quote */
+        $quote = $observer->getEvent()->getCart()->getQuote();
+        $this->disableMultishipping->execute($quote);
+    }
+}
diff --git a/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php b/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
index fff2346d76240..f4e6928173f60 100644
--- a/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
+++ b/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
@@ -9,6 +9,7 @@
 
 use Magento\Checkout\Model\Cart;
 use Magento\Framework\App\Action\Action;
+use Magento\Multishipping\Model\DisableMultishipping;
 
 /**
  * Turns Off Multishipping mode for Quote.
@@ -20,13 +21,21 @@ class DisableMultishippingMode
      */
     private $cart;
 
+    /**
+     * @var DisableMultishipping
+     */
+    private $disableMultishipping;
+
     /**
      * @param Cart $cart
+     * @param DisableMultishipping $disableMultishipping
      */
     public function __construct(
-        Cart $cart
+        Cart $cart,
+        DisableMultishipping $disableMultishipping
     ) {
         $this->cart = $cart;
+        $this->disableMultishipping = $disableMultishipping;
     }
 
     /**
@@ -36,16 +45,16 @@ public function __construct(
      * @return void
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function beforeExecute(Action $subject)
+    public function beforeExecute(Action $subject): void
     {
         $quote = $this->cart->getQuote();
-        if ($quote->getIsMultiShipping()) {
-            $quote->setIsMultiShipping(0);
-            $extensionAttributes = $quote->getExtensionAttributes();
-            if ($extensionAttributes && $extensionAttributes->getShippingAssignments()) {
-                $extensionAttributes->setShippingAssignments([]);
-            }
+        $modChanged = $this->disableMultishipping->execute($quote);
+        if ($modChanged) {
+            $totalsCollectedBefore = $quote->getTotalsCollectedFlag();
             $this->cart->saveQuote();
+            if (!$totalsCollectedBefore) {
+                $quote->setTotalsCollectedFlag(false);
+            }
         }
     }
 }
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
new file mode 100644
index 0000000000000..9882f8d1441aa
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Test\Unit\Model;
+
+use Magento\Multishipping\Model\DisableMultishipping;
+use Magento\Quote\Api\Data\CartExtensionInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * 'Disable Multishipping' model unit tests.
+ */
+class DisableMultishippingTest extends TestCase
+{
+    /**
+     * @var CartInterface|MockObject
+     */
+    private $quoteMock;
+
+    /**
+     * @var DisableMultishipping
+     */
+    private $disableMultishippingModel;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->quoteMock = $this->getMockBuilder(CartInterface::class)
+            ->addMethods(['getIsMultiShipping', 'setIsMultiShipping'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->disableMultishippingModel = new DisableMultishipping();
+    }
+
+    /**
+     * Test 'execute' method if 'MultiShipping' mode is enabled.
+     *
+     * @param bool $hasShippingAssignments
+     * @return void
+     * @dataProvider executeWithMultishippingModeEnabledDataProvider
+     */
+    public function testExecuteWithMultishippingModeEnabled(bool $hasShippingAssignments): void
+    {
+        $shippingAssignments = $hasShippingAssignments ? ['example_shipping_assigment'] : null;
+
+        $this->quoteMock->expects($this->once())
+            ->method('getIsMultiShipping')
+            ->willReturn(true);
+
+        $this->quoteMock->expects($this->once())
+            ->method('setIsMultiShipping')
+            ->with(0);
+
+        /** @var CartExtensionInterface|MockObject $extensionAttributesMock */
+        $extensionAttributesMock = $this->getMockBuilder(CartExtensionInterface::class)
+            ->addMethods(['getShippingAssignments', 'setShippingAssignments'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $extensionAttributesMock->expects($this->once())
+            ->method('getShippingAssignments')
+            ->willReturn($shippingAssignments);
+
+        $extensionAttributesMock->expects($hasShippingAssignments ? $this->once() : $this->never())
+            ->method('setShippingAssignments')
+            ->with([])
+            ->willReturnSelf();
+
+        $this->quoteMock->expects($this->once())
+            ->method('getExtensionAttributes')
+            ->willReturn($extensionAttributesMock);
+
+        $this->assertTrue($this->disableMultishippingModel->execute($this->quoteMock));
+    }
+
+    /**
+     * DataProvider for testExecuteWithMultishippingModeEnabled().
+     *
+     * @return array
+     */
+    public function executeWithMultishippingModeEnabledDataProvider(): array
+    {
+        return [
+            'check_with_shipping_assignments' => [true],
+            'check_without_shipping_assignments' => [false]
+        ];
+    }
+
+    /**
+     * Test 'execute' method if 'Multishipping' mode is disabled.
+     *
+     * @return void
+     */
+    public function testExecuteWithMultishippingModeDisabled(): void
+    {
+        $this->quoteMock->expects($this->once())
+            ->method('getIsMultiShipping')
+            ->willReturn(false);
+
+        $this->quoteMock->expects($this->never())
+            ->method('setIsMultiShipping');
+
+        $this->quoteMock->expects($this->never())
+            ->method('getExtensionAttributes');
+
+        $this->assertFalse($this->disableMultishippingModel->execute($this->quoteMock));
+    }
+}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php b/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
index fb16bd251706c..64cbcbf147d48 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
@@ -10,10 +10,9 @@
 
 use Magento\Checkout\Controller\Index\Index;
 use Magento\Checkout\Model\Cart;
+use Magento\Multishipping\Model\DisableMultishipping as DisableMultishippingModel;
 use Magento\Multishipping\Plugin\DisableMultishippingMode;
-use Magento\Quote\Api\Data\CartExtensionInterface;
-use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\Data\CartInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -23,15 +22,20 @@
 class DisableMultishippingModeTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var Cart|MockObject
      */
     private $cartMock;
 
     /**
-     * @var MockObject
+     * @var CartInterface|MockObject
      */
     private $quoteMock;
 
+    /**
+     * @var DisableMultishippingModel|MockObject
+     */
+    private $disableMultishippingMock;
+
     /**
      * @var DisableMultishippingMode
      */
@@ -43,43 +47,40 @@ class DisableMultishippingModeTest extends TestCase
     protected function setUp(): void
     {
         $this->cartMock = $this->createMock(Cart::class);
-        $this->quoteMock = $this->getMockBuilder(Quote::class)
-            ->addMethods(['setIsMultiShipping', 'getIsMultiShipping'])
-            ->onlyMethods(['__wakeUp', 'getExtensionAttributes'])
+        $this->quoteMock = $this->getMockBuilder(CartInterface::class)
+            ->addMethods(['setTotalsCollectedFlag', 'getTotalsCollectedFlag'])
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $this->cartMock->expects($this->once())
             ->method('getQuote')
             ->willReturn($this->quoteMock);
-        $this->object = new DisableMultishippingMode($this->cartMock);
+        $this->disableMultishippingMock = $this->createMock(DisableMultishippingModel::class);
+        $this->object = new DisableMultishippingMode(
+            $this->cartMock,
+            $this->disableMultishippingMock
+        );
     }
 
     /**
-     * Tests turn off multishipping on multishipping quote.
+     * Test 'Disable Multishipping' plugin if 'Multishipping' mode is changed.
      *
+     * @param bool $totalsCollectedBefore
      * @return void
+     * @dataProvider pluginWithChangedMultishippingModeDataProvider
      */
-    public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
+    public function testPluginWithChangedMultishippingMode(bool $totalsCollectedBefore): void
     {
         $subject = $this->createMock(Index::class);
-        $extensionAttributes = $this->getMockBuilder(CartExtensionInterface::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['setShippingAssignments', 'getShippingAssignments'])
-            ->getMockForAbstractClass();
-        $extensionAttributes->method('getShippingAssignments')
-            ->willReturn(
-                $this->getMockForAbstractClass(ShippingAssignmentInterface::class)
-            );
-        $extensionAttributes->expects($this->once())
-            ->method('setShippingAssignments')
-            ->with([]);
-        $this->quoteMock->method('getExtensionAttributes')
-            ->willReturn($extensionAttributes);
+        $this->disableMultishippingMock->expects($this->once())
+            ->method('execute')
+            ->with($this->quoteMock)
+            ->willReturn(true);
         $this->quoteMock->expects($this->once())
-            ->method('getIsMultiShipping')->willReturn(1);
-        $this->quoteMock->expects($this->once())
-            ->method('setIsMultiShipping')
-            ->with(0);
+            ->method('getTotalsCollectedFlag')
+            ->willReturn($totalsCollectedBefore);
+        $this->quoteMock->expects($totalsCollectedBefore ? $this->never() : $this->once())
+            ->method('setTotalsCollectedFlag')
+            ->with(false);
         $this->cartMock->expects($this->once())
             ->method('saveQuote');
 
@@ -87,16 +88,37 @@ public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
     }
 
     /**
-     * Tests turn off multishipping on non-multishipping quote.
+     * DataProvider for testPluginWithChangedMultishippingMode().
+     *
+     * @return array
+     */
+    public function pluginWithChangedMultishippingModeDataProvider(): array
+    {
+        return [
+            'check_when_totals_are_collected' => [true],
+            'check_when_totals_are_not_collected' => [false]
+        ];
+    }
+
+    /**
+     * Test 'Disable Multishipping' plugin if 'Multishipping' mode is NOT changed.
      *
      * @return void
      */
-    public function testExecuteTurnsOffMultishippingModeOnNotMultishippingQuote(): void
+    public function testPluginWithNotChangedMultishippingMode(): void
     {
         $subject = $this->createMock(Index::class);
-        $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(0);
-        $this->quoteMock->expects($this->never())->method('setIsMultiShipping');
-        $this->cartMock->expects($this->never())->method('saveQuote');
+        $this->disableMultishippingMock->expects($this->once())
+            ->method('execute')
+            ->with($this->quoteMock)
+            ->willReturn(false);
+        $this->quoteMock->expects($this->never())
+            ->method('getTotalsCollectedFlag');
+        $this->quoteMock->expects($this->never())
+            ->method('setTotalsCollectedFlag');
+        $this->cartMock->expects($this->never())
+            ->method('saveQuote');
+
         $this->object->beforeExecute($subject);
     }
 }
diff --git a/app/code/Magento/Multishipping/etc/frontend/events.xml b/app/code/Magento/Multishipping/etc/frontend/events.xml
new file mode 100644
index 0000000000000..219e358528ca2
--- /dev/null
+++ b/app/code/Magento/Multishipping/etc/frontend/events.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="checkout_cart_save_before">
+        <observer name="magento_multishipping_disabler" instance="Magento\Multishipping\Observer\DisableMultishippingObserver"/>
+    </event>
+</config>
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Observer/DisableMultishippingObserverTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Observer/DisableMultishippingObserverTest.php
new file mode 100644
index 0000000000000..3145f945b5009
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Observer/DisableMultishippingObserverTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Observer;
+
+use Magento\Checkout\Model\Cart;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Quote\Model\GetQuoteByReservedOrderId;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * 'Disable Multishipping' observer integration tests.
+ *
+ * @magentoDataFixture Magento/Checkout/_files/quote_with_simple_product_saved.php
+ * @magentoAppArea frontend
+ */
+class DisableMultishippingObserverTest extends TestCase
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @var Cart
+     */
+    private $cart;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->cart = $this->objectManager->get(Cart::class);
+        $this->prepareQuote();
+    }
+
+    /**
+     * Test that Quote totals are calculated correctly when Cart is saved with 'Multishipping' mode enabled.
+     *
+     * @return void
+     */
+    public function testObserverWithEnabledMultishippingMode(): void
+    {
+        $quote = $this->cart->getQuote();
+        $extensionAttributes = $quote->getExtensionAttributes();
+        $this->assertEquals(1, (int)$quote->getItemsQty());
+        $this->assertCount(1, $extensionAttributes->getShippingAssignments());
+
+        $quote->setIsMultiShipping(1);
+        $quoteItem = current($quote->getItems());
+        $itemData = [$quoteItem->getId() => ['qty' => 2]];
+
+        $this->cart->updateItems($itemData)->save();
+
+        $this->assertEquals(2, (int)$quote->getItemsQty());
+        $this->assertEquals(0, $quote->getIsMultiShipping());
+        $this->assertCount(0, $extensionAttributes->getShippingAssignments());
+    }
+
+    /**
+     * Prepare Quote before test execution.
+     *
+     * @return void
+     */
+    private function prepareQuote(): void
+    {
+        /** @var CartInterface $quote */
+        $quote = $this->objectManager->get(GetQuoteByReservedOrderId::class)
+            ->execute('test_order_with_simple_product_without_address');
+        $shippingAssignment = $this->objectManager->get(ShippingAssignmentInterface::class);
+        $quote->getExtensionAttributes()->setShippingAssignments([$shippingAssignment]);
+        /** @var CheckoutSession $checkoutSession */
+        $checkoutSession = $this->objectManager->get(CheckoutSession::class);
+        $checkoutSession->clearQuote();
+        $checkoutSession->setQuoteId($quote->getId());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Multishipping/Plugin/DisableMultishippingModeTest.php b/dev/tests/integration/testsuite/Magento/Multishipping/Plugin/DisableMultishippingModeTest.php
new file mode 100644
index 0000000000000..07e1fdd5a9d23
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Multishipping/Plugin/DisableMultishippingModeTest.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Multishipping\Plugin;
+
+use Magento\Checkout\Model\Cart;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Data\Form\FormKey;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * 'Disable Multishipping' plugin integration tests.
+ *
+ * @see DisableMultishippingMode
+ */
+class DisableMultishippingModeTest extends AbstractController
+{
+    /**
+     * @var Cart
+     */
+    private $cart;
+
+    /**
+     * @var FormKey
+     */
+    private $formKey;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->cart = $this->_objectManager->get(Cart::class);
+        $this->formKey = $this->_objectManager->get(FormKey::class);
+    }
+
+    /**
+     * Test that Quote totals are updated correctly when 'Multishipping' mode is enabled.
+     *
+     * @magentoDataFixture Magento/Catalog/_files/products.php
+     * @return void
+     */
+    public function testPluginWithEnabledMultishippingMode(): void
+    {
+        $quote = $this->cart->getQuote();
+        $postData = [
+            'qty' => '1',
+            'product' => '1',
+        ];
+        $this->getRequest()->setPostValue($postData)
+            ->setMethod(HttpRequest::METHOD_POST)
+            ->setParam('form_key', $this->formKey->getFormKey());
+
+        $this->dispatch('checkout/cart/add');
+        $this->assertEquals(1, (int)$quote->getItemsQty());
+
+        $quote->setTotalsCollectedFlag(false)
+            ->setIsMultiShipping(true);
+
+        $this->dispatch('checkout/cart/add');
+        $this->assertEquals(2, (int)$quote->getItemsQty());
+        $this->assertEquals(0, $quote->getIsMultiShipping());
+    }
+}

From c15c7c74d80711be59fcd75baf6c0f7da7419507 Mon Sep 17 00:00:00 2001
From: Vasya Tsviklinskyi <tsviklinskyi@gmail.com>
Date: Mon, 26 Oct 2020 13:13:15 +0200
Subject: [PATCH 640/671] MC-37954: PLP sort by name is case-sensitive with
 ElasticSearch

---
 .../Model/Indexer/ReindexAllTest.php          |  39 ++++++
 .../Elasticsearch/_files/case_sensitive.php   | 126 ++++++++++++++++++
 .../_files/case_sensitive_rollback.php        |  35 +++++
 3 files changed, 200 insertions(+)
 create mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive_rollback.php

diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
index 9679b4f232ee2..6df4d8fbb2d92 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -130,6 +130,45 @@ public function testSort()
         $this->assertEquals($productSimpleId, $firstInSearchResults);
     }
 
+    /**
+     * Test sorting of products with lower and upper case names after full reindex
+     *
+     * @magentoDbIsolation enabled
+     * @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest
+     * @magentoDataFixture Magento/Elasticsearch/_files/case_sensitive.php
+     */
+    public function testSortCaseSensitive(): void
+    {
+        $productFirst = $this->productRepository->get('fulltext-1');
+        $productSecond = $this->productRepository->get('fulltext-2');
+        $productThird = $this->productRepository->get('fulltext-3');
+        $productFourth = $this->productRepository->get('fulltext-4');
+        $productFifth = $this->productRepository->get('fulltext-5');
+        $correctSortedIds = [
+            $productFirst->getId(),
+            $productFourth->getId(),
+            $productSecond->getId(),
+            $productFifth->getId(),
+            $productThird->getId(),
+        ];
+        $this->reindexAll();
+        $result = $this->sortByName();
+        $firstInSearchResults = (int) $result[0]['_id'];
+        $secondInSearchResults = (int) $result[1]['_id'];
+        $thirdInSearchResults = (int) $result[2]['_id'];
+        $fourthInSearchResults = (int) $result[3]['_id'];
+        $fifthInSearchResults = (int) $result[4]['_id'];
+        $actualSortedIds = [
+            $firstInSearchResults,
+            $secondInSearchResults,
+            $thirdInSearchResults,
+            $fourthInSearchResults,
+            $fifthInSearchResults
+        ];
+        $this->assertCount(5, $result);
+        $this->assertEquals($correctSortedIds, $actualSortedIds);
+    }
+
     /**
      * Test search of specific product after full reindex
      *
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive.php
new file mode 100644
index 0000000000000..1b664f958dd46
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_boolean_attribute.php');
+
+/** @var $objectManager \Magento\Framework\ObjectManagerInterface */
+$objectManager = Bootstrap::getObjectManager();
+
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+try {
+    $productRepository->get('fulltext-1');
+} catch (NoSuchEntityException $e) {
+    /** @var $productFirst Product */
+    $productFirst = $objectManager->create(Product::class);
+    $productFirst->setTypeId('simple')
+        ->setAttributeSetId(4)
+        ->setWebsiteIds([1])
+        ->setName('A')
+        ->setSku('fulltext-1')
+        ->setPrice(10)
+        ->setMetaTitle('first meta title')
+        ->setMetaKeyword('first meta keyword')
+        ->setMetaDescription('first meta description')
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setBooleanAttribute(1)
+        ->save();
+}
+
+try {
+    $productRepository->get('fulltext-2');
+} catch (NoSuchEntityException $e) {
+    /** @var $productSecond Product */
+    $productSecond = $objectManager->create(Product::class);
+    $productSecond->setTypeId('simple')
+        ->setAttributeSetId(4)
+        ->setWebsiteIds([1])
+        ->setName('B')
+        ->setSku('fulltext-2')
+        ->setPrice(20)
+        ->setMetaTitle('second meta title')
+        ->setMetaKeyword('second meta keyword')
+        ->setMetaDescription('second meta description')
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setBooleanAttribute(1)
+        ->save();
+}
+
+try {
+    $productRepository->get('fulltext-3');
+} catch (NoSuchEntityException $e) {
+    /** @var $productThird Product */
+    $productThird = $objectManager->create(Product::class);
+    $productThird->setTypeId('simple')
+        ->setAttributeSetId(4)
+        ->setWebsiteIds([1])
+        ->setName('C')
+        ->setSku('fulltext-3')
+        ->setPrice(20)
+        ->setMetaTitle('third meta title')
+        ->setMetaKeyword('third meta keyword')
+        ->setMetaDescription('third meta description')
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setBooleanAttribute(1)
+        ->save();
+}
+
+try {
+    $productRepository->get('fulltext-4');
+} catch (NoSuchEntityException $e) {
+    /** @var $productFourth Product */
+    $productFourth = $objectManager->create(Product::class);
+    $productFourth->setTypeId('simple')
+        ->setAttributeSetId(4)
+        ->setWebsiteIds([1])
+        ->setName('a')
+        ->setSku('fulltext-4')
+        ->setPrice(20)
+        ->setMetaTitle('fourth meta title')
+        ->setMetaKeyword('fourth meta keyword')
+        ->setMetaDescription('fourth meta description')
+        ->setUrlKey('aa')
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setBooleanAttribute(0)
+        ->save();
+}
+
+try {
+    $productRepository->get('fulltext-5');
+} catch (NoSuchEntityException $e) {
+    /** @var $productFifth Product */
+    $productFifth = $objectManager->create(Product::class);
+    $productFifth->setTypeId('simple')
+        ->setAttributeSetId(4)
+        ->setWebsiteIds([1])
+        ->setName('b')
+        ->setSku('fulltext-5')
+        ->setPrice(20)
+        ->setMetaTitle('fifth meta title')
+        ->setMetaKeyword('fifth meta keyword')
+        ->setMetaDescription('fifth meta description')
+        ->setUrlKey('bb')
+        ->setVisibility(Visibility::VISIBILITY_BOTH)
+        ->setStatus(Status::STATUS_ENABLED)
+        ->setStockData(['use_config_manage_stock' => 0])
+        ->setBooleanAttribute(0)
+        ->save();
+}
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive_rollback.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive_rollback.php
new file mode 100644
index 0000000000000..a97faa29a1588
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/_files/case_sensitive_rollback.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
+
+Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_boolean_attribute_rollback.php');
+
+/** @var $objectManager \Magento\Framework\ObjectManagerInterface */
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+$collection = $objectManager->create(\Magento\Catalog\Model\ResourceModel\Product\Collection::class);
+$collection->addAttributeToSelect('id')->load();
+if ($collection->count() > 0) {
+    $collection->delete();
+}
+
+/** @var \Magento\Store\Model\Store $store */
+$store = $objectManager->create(\Magento\Store\Model\Store::class);
+$storeCode = 'secondary';
+$store->load($storeCode);
+if ($store->getId()) {
+    $store->delete();
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

From 5f775d2d58f9296aeac3b27788e95a8475824865 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 13:30:51 +0200
Subject: [PATCH 641/671] MC-38589: [MFTF]
 AdminEnhancedMediaGalleryVerifyAssetFilterTest failed because of bad design

---
 .../AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
index 90ae7a5f10368..18c52a884c6eb 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
@@ -32,7 +32,7 @@
             <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
 
             <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFridFilters"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
@@ -41,7 +41,7 @@
             <argument name="id" value="$category.id$"/>
         </actionGroup>
         <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFridFilters"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadFirstIMage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
@@ -56,7 +56,7 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
 
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFridFiltersAgain"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
             <argument name="filterName" value="Asset"/>

From 0b2e2db10b41030e82ce8be0cd78a736d266b31c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 13:49:13 +0200
Subject: [PATCH 642/671] MC-38589: [MFTF]
 AdminEnhancedMediaGalleryVerifyAssetFilterTest failed because of bad design

---
 .../AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
index 18c52a884c6eb..a3208af0da238 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryVerifyFilterByAssetTest.xml
@@ -32,7 +32,7 @@
             <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
 
             <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFridFilters"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
 
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
@@ -41,7 +41,7 @@
             <argument name="id" value="$category.id$"/>
         </actionGroup>
         <actionGroup ref="AdminOpenMediaGalleryTinyMce4ActionGroup" stepKey="openMediaGalleryFromWysiwyg"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFridFilters"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
         <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadFirstIMage">
             <argument name="image" value="ImageUpload3"/>
         </actionGroup>
@@ -56,7 +56,7 @@
         <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
 
         <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
-        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFridFiltersAgain"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFiltersAgain"/>
         <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
         <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setUsedInFilter">
             <argument name="filterName" value="Asset"/>

From 8d5f5c5d32a6b06039b5d265aa879eec4bb4c8b6 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 15:27:55 +0200
Subject: [PATCH 643/671] MC-38620: Merge release branch into 2.4-develop

fix tests after merge
---
 .../Address/CollectTotalsObserverTest.php     |  5 ----
 .../AddDownloadableProductToWishlistTest.php  | 23 -------------------
 2 files changed, 28 deletions(-)

diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index 8b72749d13b49..c817ec2a512c3 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -271,11 +271,6 @@ public function testDispatchWithDefaultCustomerGroupId()
             ->method('getCustomerGroupId')
             ->willReturn('customerGroupId');
         $this->customerMock->expects($this->exactly(2))->method('getId')->willReturn('1');
-        $this->groupManagementMock->expects($this->once())
-            ->method('getDefaultGroup')
-            ->willReturn($this->groupInterfaceMock);
-        $this->groupInterfaceMock->expects($this->once())
-            ->method('getId')->willReturn('defaultCustomerGroupId');
         /** Assertions */
         $this->quoteAddressMock->expects($this->once())
             ->method('setPrevQuoteCustomerGroupId')
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
index aca3012768b06..0de45fb21b20b 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/AddDownloadableProductToWishlistTest.php
@@ -120,29 +120,6 @@ public function testAddDownloadableProductWithOptions(): void
         $this->assertEquals('Downloadable Product Sample', $wishlistItemSamples[0]['title']);
     }
 
-    /**
-     * @magentoConfigFixture default_store wishlist/general/active 0
-     * @magentoApiDataFixture Magento/Customer/_files/customer.php
-     * @magentoApiDataFixture Magento/Downloadable/_files/product_downloadable_with_custom_options.php
-     */
-    public function testAddDownloadableProductOnDisabledWishlist(): void
-    {
-        $qty = 2;
-        $sku = 'downloadable-product-with-purchased-separately-links';
-        $links = $this->getProductsLinks($sku);
-        $linkId = key($links);
-        $itemOptions = $this->getCustomOptionsWithIDV2ForQueryBySku->execute($sku);
-        $itemOptions['selected_options'][] = $this->generateProductLinkSelectedOptions($linkId);
-        $productOptionsQuery = trim(preg_replace(
-            '/"([^"]+)"\s*:\s*/',
-            '$1:',
-            json_encode($itemOptions)
-        ), '{}');
-        $query = $this->getQuery($qty, $sku, $productOptionsQuery);
-        $this->expectExceptionMessage('The wishlist configuration is currently disabled.');
-        $this->graphQlMutation($query, [], '', $this->getHeaderMap());
-    }
-
     /**
      * Function returns array of all product's links
      *

From 4de0d0145ddbe855ff3e8c46b9acf4ce65005db5 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 17:53:07 +0200
Subject: [PATCH 644/671] MC-38620: Merge release branch into 2.4-develop

fix tests after merge
---
 .../Frontend/Quote/Address/CollectTotalsObserver.php      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index 504a035049eb4..d938ad7d638f1 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -141,11 +141,9 @@ public function execute(Observer $observer)
             $address->setPrevQuoteCustomerGroupId($quote->getCustomerGroupId());
             $quote->setCustomerGroupId($groupId);
             $this->customerSession->setCustomerGroupId($groupId);
-            if ($customer->getId() !== null) {
-                $customer->setGroupId($groupId);
-                $customer->setEmail($customer->getEmail() ?: $quote->getCustomerEmail());
-                $quote->setCustomer($customer);
-            }
+            $customer->setGroupId($groupId);
+            $customer->setEmail($customer->getEmail() ?: $quote->getCustomerEmail());
+            $quote->setCustomer($customer);
         }
     }
 }

From 162b49ea1cde46618d856a9f7e8139113aeb65ba Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 18:17:52 +0200
Subject: [PATCH 645/671] MC-38620: Merge release branch into 2.4-develop

fix tests after merge
---
 .../testsuite/Magento/Sales/Helper/ReorderTest.php           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Sales/Helper/ReorderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Helper/ReorderTest.php
index 5a21f551ff1a7..fa0e9e7bc4e1b 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Helper/ReorderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Helper/ReorderTest.php
@@ -68,13 +68,14 @@ public function testCanReorderForGuest(): void
     }
 
     /**
-     * @magentoDataFixture Magento/Sales/_files/customer_order_with_two_items.php
+     * @magentoDataFixture Magento/Customer/_files/customer.php
+     * @magentoDataFixture Magento/Sales/_files/order.php
      *
      * @return void
      */
     public function testCanReorderForLoggedCustomer(): void
     {
-        $order = $this->orderFactory->create()->loadByIncrementId('100000555');
+        $order = $this->orderFactory->create()->loadByIncrementId('100000001');
         $this->customerSession->setCustomerId($order->getCustomerId());
         $this->assertTrue($this->helper->canReorder($order->getId()));
     }

From a15601591250d341c6b10647508f14c7977f2870 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 22:03:03 +0200
Subject: [PATCH 646/671] MC-38620: Merge release branch into 2.4-develop

fix tests after merge
---
 .../Frontend/Quote/Address/CollectTotalsObserverTest.php    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
index c817ec2a512c3..ae2a4734215ad 100644
--- a/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
+++ b/app/code/Magento/Quote/Test/Unit/Observer/Frontend/Quote/Address/CollectTotalsObserverTest.php
@@ -270,7 +270,8 @@ public function testDispatchWithDefaultCustomerGroupId()
         $this->quoteMock->expects($this->exactly(2))
             ->method('getCustomerGroupId')
             ->willReturn('customerGroupId');
-        $this->customerMock->expects($this->exactly(2))->method('getId')->willReturn('1');
+        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
+
         /** Assertions */
         $this->quoteAddressMock->expects($this->once())
             ->method('setPrevQuoteCustomerGroupId')
@@ -323,7 +324,6 @@ public function testDispatchWithCustomerCountryInEU()
             ->method('setPrevQuoteCustomerGroupId')
             ->with('customerGroupId');
 
-        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
         $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
         $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
         $this->customerDataFactoryMock->expects($this->any())
@@ -431,8 +431,6 @@ public function testDispatchWithEmptyShippingAddress()
             ->method('setPrevQuoteCustomerGroupId')
             ->with('customerGroupId');
 
-        $this->customerMock->expects($this->once())->method('getId')->willReturn('1');
-
         $this->quoteMock->expects($this->once())->method('setCustomerGroupId')->with('customerGroupId');
         $this->quoteMock->expects($this->once())->method('setCustomer')->with($this->customerMock);
         $this->customerDataFactoryMock->expects($this->any())

From 8f25d13db436bd2f6134dcd6bc8431b8f3e9dff9 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 26 Oct 2020 22:54:59 +0200
Subject: [PATCH 647/671] MC-38620: Merge release branch into 2.4-develop

fix tests after merge
---
 .../GraphQl/Wishlist/UpdateProductsFromWishlistTest.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
index 0e5a9544b8e99..691c06782070f 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Wishlist/UpdateProductsFromWishlistTest.php
@@ -99,14 +99,14 @@ public function testUpdateProductInWishlistWithZeroQty()
     {
         $wishlist = $this->getWishlist();
         $wishlistId = $wishlist['customer']['wishlist']['id'];
-        $wishlistItem = $wishlist['customer']['wishlist']['items'][0];
+        $wishlistItem = $wishlist['customer']['wishlist']['items_v2'][0];
         $qty = 0;
         $description = 'Description for zero quantity';
         $updateWishlistQuery = $this->getQuery((int) $wishlistId, (int) $wishlistItem['id'], $qty, $description);
         $response = $this->graphQlMutation($updateWishlistQuery, [], '', $this->getHeaderMap());
         self::assertEquals(1, $response['updateProductsInWishlist']['wishlist']['items_count']);
-        self::assertNotEmpty($response['updateProductsInWishlist']['wishlist']['items'], 'empty wish list items');
-        self::assertCount(1, $response['updateProductsInWishlist']['wishlist']['items']);
+        self::assertNotEmpty($response['updateProductsInWishlist']['wishlist']['items_v2'], 'empty wish list items');
+        self::assertCount(1, $response['updateProductsInWishlist']['wishlist']['items_v2']);
         self::assertArrayHasKey('user_errors', $response['updateProductsInWishlist']);
         self::assertCount(1, $response['updateProductsInWishlist']['user_errors']);
         $message = 'The quantity of a wish list item cannot be 0';
@@ -127,7 +127,7 @@ public function testUpdateProductWithValidQtyAndNoDescription()
     {
         $wishlist = $this->getWishlist();
         $wishlistId = $wishlist['customer']['wishlist']['id'];
-        $wishlistItem = $wishlist['customer']['wishlist']['items'][0];
+        $wishlistItem = $wishlist['customer']['wishlist']['items_v2'][0];
         $qty = 2;
         $updateWishlistQuery = $this->getQueryWithNoDescription((int) $wishlistId, (int) $wishlistItem['id'], $qty);
         $response = $this->graphQlMutation($updateWishlistQuery, [], '', $this->getHeaderMap());

From 0761e1ad760d103090100664d21af055ca8d21ee Mon Sep 17 00:00:00 2001
From: Serhiy Yelahin <serhiy.yelahin@transoftgroup.com>
Date: Tue, 27 Oct 2020 12:16:00 +0200
Subject: [PATCH 648/671] MC-38663: Korean postal code is now 5 digit not 6

---
 app/code/Magento/Directory/etc/zip_codes.xml              | 1 +
 .../Model/Country/Postcode/Config/ReaderTest.php          | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/app/code/Magento/Directory/etc/zip_codes.xml b/app/code/Magento/Directory/etc/zip_codes.xml
index de6c064815d7a..634d4abe06763 100644
--- a/app/code/Magento/Directory/etc/zip_codes.xml
+++ b/app/code/Magento/Directory/etc/zip_codes.xml
@@ -229,6 +229,7 @@
     <zip countryCode="KR">
         <codes>
             <code id="pattern_1" active="true" example="123-456">^[0-9]{3}-[0-9]{3}$</code>
+            <code id="pattern_2" active="true" example="12345">^[0-9]{5}$</code>
         </codes>
     </zip>
     <zip countryCode="KG">
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php
index 9146535ed5181..87dfd2a4a3981 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/Config/ReaderTest.php
@@ -49,5 +49,13 @@ public function testRead()
         $this->assertEquals('^[0-9]{4}$', $result['AR']['pattern_1']['pattern']);
         $this->assertEquals('A1234BCD', $result['AR']['pattern_2']['example']);
         $this->assertEquals('^[a-zA-z]{1}[0-9]{4}[a-zA-z]{3}$', $result['AR']['pattern_2']['pattern']);
+
+        $this->assertArrayHasKey('KR', $result);
+        $this->assertArrayHasKey('pattern_1', $result['KR']);
+        $this->assertArrayHasKey('pattern_2', $result['KR']);
+        $this->assertEquals('123-456', $result['KR']['pattern_1']['example']);
+        $this->assertEquals('^[0-9]{3}-[0-9]{3}$', $result['KR']['pattern_1']['pattern']);
+        $this->assertEquals('12345', $result['KR']['pattern_2']['example']);
+        $this->assertEquals('^[0-9]{5}$', $result['KR']['pattern_2']['pattern']);
     }
 }

From 63737e339c457f9611efa7fb7be60a91c680099c Mon Sep 17 00:00:00 2001
From: OlgaVasyltsun <olga.vasyltsun@transoftgroup.com>
Date: Tue, 27 Oct 2020 14:41:28 +0200
Subject: [PATCH 649/671] MC-38488: [MFTF]
 AdminMediaGalleryAssertUsedInLinkBlocksGridTest failed because of bad design

---
 ...minMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
index 63f6a483665c9..530605bb7e233 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
@@ -27,7 +27,7 @@
             <deleteData createDataKey="createBlock" stepKey="deleteBlock"/>
 
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAgain"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnStandaloneMediaGalleryPage"/>
             <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolderAgain">
                 <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
             </actionGroup>
@@ -40,7 +40,7 @@
                 <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
             </actionGroup>
 
-            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnMediaGalleryPage"/>
             <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImagesAfterTest"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
         </after>
@@ -50,7 +50,7 @@
         </actionGroup>
         <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImageIcon" />
         <waitForPageLoad stepKey="waitForInitialPageLoad" />
-        <waitForPageLoad stepKey="waitForSecondaryPageLoad" />
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderNewCreateButton}}" stepKey="waitForNewFolderButton"/>
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilter"/>
         <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
         <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
@@ -70,7 +70,7 @@
         <click selector="{{BlockNewPagePageActionsSection.saveBlock}}" stepKey="saveBlock"/>
 
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
-        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersOnStandaloneMediaGallery"/>
         <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCreatedFolder">
             <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>

From 7569b08df6c47335f199a7226cb363f4ae562425 Mon Sep 17 00:00:00 2001
From: mastiuhin-olexandr <mastiuhin.olexandr@transoftgroup.com>
Date: Tue, 27 Oct 2020 17:37:17 +0200
Subject: [PATCH 650/671] MC-33288: [2.4][MSI][MFTF]
 StorefrontLoggedInCustomerCreateOrderAllOptionQuantityConfigurableProductCustomStockTest
 fails because of bad design

---
 .../Magento/Catalog/Model/ResourceModel/Product/Relation.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
index deba2b555d5cc..2f8c4a34f0087 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
@@ -152,7 +152,7 @@ public function getRelationsByChildren(array $childrenIds): array
             )->join(
                 ['relation' => $this->getTable('catalog_product_relation')],
                 'relation.parent_id = cpe.' . $linkField
-            )->where('child_id IN(?)', $childrenIds);
+            )->where('relation.child_id IN(?)', $childrenIds);
 
         return $connection->fetchCol($select);
     }

From 647628ac00897af4d312d131f0cfd3ecd93b5fbf Mon Sep 17 00:00:00 2001
From: Andrii Beziazychnyi <a.beziazychnyi@atwix.com>
Date: Tue, 27 Oct 2020 23:12:58 +0200
Subject: [PATCH 651/671] Backward Compatibility fixes

---
 .../QuoteGraphQl/Model/Resolver/MergeCarts.php    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
index d53ab597eaba4..297fd25be1fae 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
@@ -7,6 +7,7 @@
 
 namespace Magento\QuoteGraphQl\Model\Resolver;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
@@ -50,19 +51,21 @@ class MergeCarts implements ResolverInterface
     /**
      * @param GetCartForUser $getCartForUser
      * @param CartRepositoryInterface $cartRepository
-     * @param CustomerCartResolver $customerCartResolver
-     * @param QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+     * @param CustomerCartResolver|null $customerCartResolver
+     * @param QuoteIdToMaskedQuoteIdInterface|null $quoteIdToMaskedQuoteId
      */
     public function __construct(
         GetCartForUser $getCartForUser,
         CartRepositoryInterface $cartRepository,
-        CustomerCartResolver $customerCartResolver,
-        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId
+        CustomerCartResolver $customerCartResolver = null,
+        QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId = null
     ) {
         $this->getCartForUser = $getCartForUser;
         $this->cartRepository = $cartRepository;
-        $this->customerCartResolver = $customerCartResolver;
-        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId;
+        $this->customerCartResolver = $customerCartResolver
+            ?: ObjectManager::getInstance()->get(CustomerCartResolver::class);
+        $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId
+            ?: ObjectManager::getInstance()->get(QuoteIdToMaskedQuoteIdInterface::class);
     }
 
     /**

From b47713413edc980fbdfb31d63a7f82d3e3504d8d Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 28 Oct 2020 12:59:32 +0200
Subject: [PATCH 652/671] MC-38651: [MFTF]
 AdminMediaGalleryAssertUsedInLinkPagesGridTest failed because of bad design

---
 ...inCmsPageFillOutBasicFieldsActionGroup.xml | 30 ++++++++
 ...nSaveAndContinueEditCmsPageActionGroup.xml | 22 ++++++
 .../SaveAndContinueEditCmsPageActionGroup.xml |  2 +-
 ...FillOutCustomCMSPageContentActionGroup.xml |  2 +-
 ...iaGalleryAssertUsedInLinkPagesGridTest.xml |  7 +-
 ...GalleryAssertUsedInLinkedPagesGridTest.xml | 75 ++++++++++++++++++
 ...ediaGalleryCloseViewDetailsActionGroup.xml |  4 +-
 ...ediaGalleryDeletedAllImagesActionGroup.xml | 26 +++++++
 ...ncedMediaGalleryUploadImageActionGroup.xml |  1 +
 ...ediaGalleryViewImageDetailsActionGroup.xml |  2 +-
 ...eryAssertFolderDoesNotExistActionGroup.xml |  4 +-
 ...ediaGalleryAssertFolderNameActionGroup.xml |  2 +-
 ...minMediaGalleryFolderDeleteActionGroup.xml |  4 +-
 ...minMediaGalleryFolderSelectActionGroup.xml |  8 +-
 ...ediaGalleryFromPageNoEditorActionGroup.xml |  2 +-
 .../Test/Mftf/Helper/MediaGalleryUiHelper.php | 77 +++++++++++++++++++
 ...nhancedMediaGalleryImageActionsSection.xml |  2 +-
 ...nEnhancedMediaGalleryMassActionSection.xml |  1 +
 ...EnhancedMediaGalleryViewDetailsSection.xml |  3 +-
 .../AdminMediaGalleryFolderSection.xml        |  8 +-
 .../AdminMediaGalleryMessagesSection.xml      | 11 +++
 21 files changed, 273 insertions(+), 20 deletions(-)
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml
 create mode 100644 app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml

diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml
new file mode 100644
index 0000000000000..52b4cee37b03c
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml
@@ -0,0 +1,30 @@
+<?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="AdminCmsPageFillOutBasicFieldsActionGroup">
+        <annotations>
+            <description>Fills out the Page details (Page Title, Content and URL Key) on the Admin Page creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="title" type="string" defaultValue="{{_defaultCmsPage.title}}"/>
+            <argument name="contentHeading" type="string" defaultValue="{{_defaultCmsPage.content_heading}}"/>
+            <argument name="content" type="string" defaultValue="{{_defaultCmsPage.content}}"/>
+            <argument name="urlKey" type="string" defaultValue="{{_defaultCmsPage.identifier}}"/>
+        </arguments>
+
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{title}}" stepKey="fillTitle"/>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="expandContentTabIfCollapsed"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{contentHeading}}" stepKey="fillContentHeading"/>
+        <scrollTo selector="{{CmsNewPagePageContentSection.content}}" stepKey="scrollToPageContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{content}}" stepKey="fillContent"/>
+        <conditionalClick selector="{{CmsNewPagePageSeoSection.header}}" dependentSelector="{{CmsNewPagePageSeoSection.urlKey}}" visible="false" stepKey="clickExpandSearchEngineOptimisationIfCollapsed"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{urlKey}}" stepKey="fillUrlKey"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.xml
new file mode 100644
index 0000000000000..5c8b390b59ba0
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.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="AdminSaveAndContinueEditCmsPageActionGroup">
+        <annotations>
+            <description>Clicks on the Save and Continue button and see success message.</description>
+        </annotations>
+
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueButton"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSaveAndContinueButton"/>
+        <waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the page." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SaveAndContinueEditCmsPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SaveAndContinueEditCmsPageActionGroup.xml
index a8dce19153a98..d5ccb4e1c1e71 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/SaveAndContinueEditCmsPageActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/SaveAndContinueEditCmsPageActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="SaveAndContinueEditCmsPageActionGroup">
         <annotations>
-            <description>Clicks on the Save and Continue button.</description>
+            <description>DEPRECATED. Use AdminSaveAndContinueEditCmsPageActionGroup instead. Clicks on the Save and Continue button.</description>
         </annotations>
 
         <waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForSaveAndContinueVisibility"/>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
index f0938016d12f1..e0ec79394fdda 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
@@ -10,7 +10,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="FillOutCustomCMSPageContentActionGroup">
         <annotations>
-            <description>Fills out the Page details (Page Title, Content and URL Key)</description>
+            <description>DEPRECATED. Use AdminCmsPageFillOutBasicFieldsActionGroup and other AGs from CMS module. Fills out the Page details (Page Title, Content and URL Key)</description>
         </annotations>
 
         <arguments>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml
index 9b37a84122227..c29ddbae0eb52 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkPagesGridTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryAssertUsedInLinkPagesGridTest">
+    <test name="AdminMediaGalleryAssertUsedInLinkPagesGridTest" deprecated="Use AdminMediaGalleryAssertUsedInLinkedPagesGridTest instead">
         <annotations>
             <features value="AdminMediaGalleryUsedInBlocksFilter"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
-            <title value="Used in pages link"/>
+            <title value="DEPRECATED. Used in pages link"/>
             <stories value="Story 58: User sees entities where asset is used in" />
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
             <description value="User filters assets used in pages"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryAssertUsedInLinkedPagesGridTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
new file mode 100644
index 0000000000000..2bf229d2a65d3
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryAssertUsedInLinkedPagesGridTest">
+        <annotations>
+            <features value="MediaGalleryCmsUi"/>
+            <stories value="Story 58: User sees entities where asset is used in" />
+            <title value="Used in pages link"/>
+            <description value="User filters assets used in pages"/>
+            <severity value="CRITICAL"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1168"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/4951848"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="navigateToCreateNewPage"/>
+        <actionGroup ref="AdminCmsPageFillOutBasicFieldsActionGroup" stepKey="fillBasicPageFields"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload3"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectContentImageInGrid">
+            <argument name="imageName" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedContentImage"/>
+        <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveCmsPageAndContinue"/>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFiltersAgain"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInPages">
+            <argument name="entityName" value="Pages"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
+        </actionGroup>
+         <actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
+            <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+        </actionGroup>
+
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersInPageGrid"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFiltersAndAgain"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAgain"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
index 3754eb319da44..effb574853bb7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
@@ -10,10 +10,10 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup">
         <annotations>
-            <description>Closes View Details panel</description>
+            <description>Closes View Details panel of Media Gallery image.</description>
         </annotations>
 
         <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.cancel}}" stepKey="clickCancel"/>
-        <wait time="1" stepKey="waitForElementRender"/>
+        <waitForElementNotVisible selector="{{AdminEnhancedMediaGalleryViewDetailsSection.modalTitle}}" stepKey="waitForElementRender"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
new file mode 100644
index 0000000000000..4aa460327578a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
@@ -0,0 +1,26 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <actionGroup name="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup">
+        <annotations>
+            <description>Open Media Gallery page and delete all images</description>
+        </annotations>
+        <amOnPage url="{{AdminStandaloneMediaGalleryPage.url}}" stepKey="openMediaGalleryPage"/>
+        <!-- It sometimes is loading too long for default 10s -->
+        <waitForPageLoad time="60" stepKey="waitForPageFullyLoaded"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
+        <helper class="\Magento\MediaGalleryUi\Test\Mftf\Helper\MediaGalleryUiHelper" method="deleteAllImagesUsingMassAction" stepKey="deleteAllImagesUsingMassAction">
+            <argument name="emptyRow">{{AdminMediaGalleryGridSection.noDataMessage}}</argument>
+            <argument name="deleteImagesButton">{{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}</argument>
+            <argument name="checkImage">{{AdminEnhancedMediaGalleryMassActionSection.massActionCheckboxAll}}</argument>
+            <argument name="deleteSelectedButton">{{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}</argument>
+            <argument name="modalAcceptButton">{{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}</argument>
+            <argument name="successMessageContainer">{{AdminMediaGalleryMessagesSection.success}}</argument>
+            <argument name="successMessage">been successfully deleted</argument>
+        </helper>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml
index 053a1185b3fda..9a9c09cda9ab2 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryUploadImageActionGroup.xml
@@ -17,6 +17,7 @@
             <argument name="image"/>
         </arguments>
 
+        <waitForPageLoad stepKey="waitForPageFullyLoaded"/>
         <attachFile selector="{{AdminEnhancedMediaGalleryActionsSection.upload}}" userInput="{{image.value}}" stepKey="uploadImage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml
index b5c0bbac69bec..d216af75c7be1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryViewImageDetailsActionGroup.xml
@@ -15,6 +15,6 @@
 
         <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.openContextMenu}}" stepKey="openContextMenu"/>
         <click selector="{{AdminEnhancedMediaGalleryImageActionsSection.viewDetails}}" stepKey="viewDetails"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryViewDetailsSection.modalTitle}}" stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml
index d0d9817da6d34..488ea03ebd86c 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderDoesNotExistActionGroup.xml
@@ -12,7 +12,7 @@
         <arguments>
             <argument name="name" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
         </arguments>
-        <wait time="5" stepKey="waitForFolderTreeReloads"/>
-        <dontSeeElement selector="//div[contains(@class, 'media-directory-container')]//a[contains(text(), '{{name}}')]" stepKey="folderDoesNotExist"/>
+        <waitForPageLoad stepKey="waitForFolderTreeReloads"/>
+        <dontSeeElement selector="{{AdminMediaGalleryFolderSection.folderInTree(name)}}" stepKey="folderDoesNotExist"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml
index 7d71c764bc8de..e42eb31dc00d8 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryAssertFolderNameActionGroup.xml
@@ -12,6 +12,6 @@
         <arguments>
             <argument name="name" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
         </arguments>
-        <waitForElementVisible selector="//div[contains(@class, 'media-directory-container')]//a[contains(text(), '{{name}}')]" stepKey="waitForFolder"/>
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderInTree(name)}}" stepKey="waitForFolder"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
index f7e8f551e681f..398003c7f2b02 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
@@ -9,8 +9,8 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminMediaGalleryFolderDeleteActionGroup">
-        <wait time="2" stepKey="waitBeforeDeleteButtonWillBeActive"/>
-        <click selector="{{AdminMediaGalleryFolderSection.folderDeleteButton}}" stepKey="clickDeleteButton"/>
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderDeleteButtonActive}}" stepKey="waitBeforeDeleteButtonWillBeActive"/>
+        <click selector="{{AdminMediaGalleryFolderSection.folderDeleteButtonActive}}" stepKey="clickDeleteButton"/>
         <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderDeleteModalHeader}}" stepKey="waitBeforeModalAppears"/>
         <click selector="{{AdminMediaGalleryFolderSection.folderConfirmDeleteButton}}" stepKey="clickConfirmDeleteButton"/>
     </actionGroup>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
index b8ed1d4f1cd25..5751b8ec323da 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
@@ -9,11 +9,15 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminMediaGalleryFolderSelectActionGroup">
+        <annotations>
+            <description>Wait for folder name appeared in tree and then click it.</description>
+        </annotations>
         <arguments>
             <argument name="name" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
         </arguments>
-        <wait time="2" stepKey="waitBeforeClickOnFolder"/>
-        <click selector="//div[contains(@class, 'media-directory-container')]//a[contains(text(), '{{name}}')]" stepKey="selectFolder"/>
+
+        <waitForElementVisible selector="{{AdminMediaGalleryFolderSection.folderInTree(name)}}" stepKey="waitBeforeClickOnFolder"/>
+        <click selector="{{AdminMediaGalleryFolderSection.folderInTree(name)}}" stepKey="selectFolder"/>
         <waitForLoadingMaskToDisappear stepKey="waitForFolderContents"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
index a434aa72679e4..287b6219115f2 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
@@ -9,7 +9,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenMediaGalleryFromPageNoEditorActionGroup">
-        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContent"/>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="clickExpandContent"/>
         <waitForElementVisible selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="waitForInsertImageButton" />
         <scrollTo selector="{{CmsWYSIWYGSection.InsertImageBtn}}" x="0" y="-80" stepKey="scrollToInsertImageButton"/>
         <click selector="{{CmsWYSIWYGSection.InsertImageBtn}}" stepKey="clickInsertImage" />
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
new file mode 100644
index 0000000000000..4059a8460bb51
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryUi\Test\Mftf\Helper;
+
+use Facebook\WebDriver\Remote\RemoteWebDriver as FacebookWebDriver;
+use Facebook\WebDriver\Remote\RemoteWebElement;
+use Facebook\WebDriver\WebDriverBy;
+use Magento\FunctionalTestingFramework\Helper\Helper;
+use Magento\FunctionalTestingFramework\Module\MagentoWebDriver;
+
+/**
+ * Class for MFTF helpers for MediaGalleryUi module.
+ */
+class MediaGalleryUiHelper extends Helper
+{
+    /**
+     * Delete all images using mass action.
+     *
+     * @param string $emptyRow
+     * @param string $deleteImagesButton
+     * @param string $checkImage
+     * @param string $deleteSelectedButton
+     * @param string $modalAcceptButton
+     * @param string $successMessageContainer
+     * @param string $successMessage
+     *
+     * @return void
+     */
+    public function deleteAllImagesUsingMassAction(
+        string $emptyRow,
+        string $deleteImagesButton,
+        string $checkImage,
+        string $deleteSelectedButton,
+        string $modalAcceptButton,
+        string $successMessageContainer,
+        string $successMessage
+    ): void {
+        try {
+            /** @var MagentoWebDriver $webDriver */
+            $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+            /** @var FacebookWebDriver $webDriver */
+            $webDriver = $magentoWebDriver->webDriver;
+            $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+            while (empty($rows)) {
+                $magentoWebDriver->click($deleteImagesButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($deleteSelectedButton, 10);
+
+                // Check all images
+                /** @var RemoteWebElement[] $images */
+                $imagesCheckboxes = $webDriver->findElements(WebDriverBy::cssSelector($checkImage));
+                /** @var RemoteWebElement $image */
+                foreach ($imagesCheckboxes as $imageCheckbox) {
+                    $imageCheckbox->click();
+                }
+
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->click($deleteSelectedButton);
+                $magentoWebDriver->waitForPageLoad(30);
+                $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+                $magentoWebDriver->click($modalAcceptButton);
+                $magentoWebDriver->waitForPageLoad(60);
+                $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+                $magentoWebDriver->see($successMessage, $successMessageContainer);
+
+                $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+            }
+        } catch (\Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
index f36fca88dc760..1a8f6f553d4ce 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -10,7 +10,7 @@
     <section name="AdminEnhancedMediaGalleryImageActionsSection">
         <element name="openContextMenu" type="button" selector=".three-dots"/>
         <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
-        <element name="viewDetails" type="button" selector="[data-ui-id='action-image-details']"/>
+        <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[text()='View Details']" timeout="30"/>
         <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
         <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
         <element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index 07f2dc23530e1..9018ccb4ddd69 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -13,5 +13,6 @@
         <element name="cancelMassActionMode" type="button" selector="#cancel_massaction"/>
         <element name="deleteImages" type="button" selector="#delete_massaction"/>
         <element name="deleteSelected" type="button" selector="#delete_selected_massaction"/>
+        <element name="massActionCheckboxAll" type="checkbox" selector="[data-id='media-gallery-masonry-grid'] .mediagallery-massaction-checkbox input[type='checkbox']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
index 92f3323214065..9b9dc157bbc27 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryViewDetailsSection.xml
@@ -8,6 +8,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEnhancedMediaGalleryViewDetailsSection">
+        <element name="modalTitle" type="text" selector="//aside[contains(@class, 'media-gallery-image-details') and contains(@class, '_show')]//header[contains(@class, 'modal-header')]//h1[contains(@class, 'modal-title') and contains(., 'Image Details')]"/>
         <element name="title" type="text" selector=".image-title"/>
         <element name="contentType" type="text" selector="span[data-ui-id='content-type']"/>
         <element name="type" type="text" selector="//div[@class='attribute']/span[contains(text(), 'Type')]/following-sibling::div"/>
@@ -22,7 +23,7 @@
         <element name="usedIn" type="button" selector="//div[@class='attribute']/span[contains(text(), 'Used In')]"/>
         <element name="updatedAtDate" type="button" selector="//div[@class='attribute']/span[contains(text(), 'Modified')]/following-sibling::div"/>
         <element name="addImage" type="button" selector=".add-image-action"/>
-        <element name="cancel" type="button" selector="#image-details-action-cancel"/>
+        <element name="cancel" type="button" selector="#image-details-action-cancel" timeout="10"/>
         <element name="usedInLink" type="button" parameterized="true" selector="//div[@class='attribute']/span[contains(text(), 'Used In')]/following-sibling::div/a[contains(text(), '{{entityName}}')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
index 2e6919f692042..acc378dac6e67 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
@@ -12,13 +12,15 @@
         <element name="folderNewModalHeader" type="block" selector="//h1[contains(text(), 'New Folder Name')]"/>
         <element name="folderDeleteModalHeader" type="block" selector="//h1[contains(text(), 'Are you sure you want to delete this folder?')]"/>
         <element name="folderNewCreateButton" type="button" selector="#create_folder"/>
-        <element name="folderDeleteButton" type="button" selector="#delete_folder"/>
-        <element name="folderConfirmDeleteButton" type="button" selector="//footer//button/span[contains(text(), 'OK')]"/>
+        <element name="folderDeleteButton" type="button" selector="#delete_folder" timeout="30"/>
+        <element name="folderDeleteButtonActive" type="button" selector="#delete_folder:not(.disabled)" timeout="30"/>
+        <element name="folderConfirmDeleteButton" type="button" selector="//footer//button/span[contains(text(), 'OK')]" timeout="30"/>
         <element name="folderCancelDeleteButton" type="button" selector="//footer//button/span[contains(text(), 'Cancel')]"/>
         <element name="folderNameField" type="button" selector="[name=folder_name]"/>
-        <element name="folderConfirmCreateButton" type="button" selector="//button/span[contains(text(),'Confirm')]"/>
+        <element name="folderConfirmCreateButton" type="button" selector="//button/span[contains(text(),'Confirm')]" timeout="30"/>
         <element name="folderNameValidationMessage" type="block" selector="label.mage-error"/>
         <element name="folderArrow" type="button" selector="#{{id}} &gt; .jstree-icon" parameterized="true"/>
         <element name="checkIfFolderArrowExpand" type="button" selector="//li[@id='{{id}}' and contains(@class,'jstree-closed')]" parameterized="true"/>
+        <element name="folderInTree" type="text" selector="//div[contains(@class, 'media-directory-container')]//ul//li//a[contains(text(), '{{name}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
new file mode 100644
index 0000000000000..659fb51080225
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
@@ -0,0 +1,11 @@
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <section name="AdminMediaGalleryMessagesSection">
+        <element name="success" type="text" selector=".media-gallery-container ul.messages div.message.message-success span"/>
+    </section>
+</sections>

From 87d936894839ac92528b6f4fcf476ee2ba4eb550 Mon Sep 17 00:00:00 2001
From: Vitaliy Prokopov <vitaliyprokopov@Vitaliys-MacBook-Pro.local>
Date: Wed, 28 Oct 2020 16:16:27 +0200
Subject: [PATCH 653/671] fixed url issue for image

---
 .../Model/Resolver/Category/Image.php              | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php
index 5de7fdc10ff4a..549b1311000ec 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php
@@ -7,14 +7,16 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\FileInfo;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DirectoryList;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Filesystem\DirectoryList;
-use Magento\Catalog\Model\Category\FileInfo;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
  * Resolve category image to a fully qualified URL
@@ -52,7 +54,7 @@ public function resolve(
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-        /** @var \Magento\Catalog\Model\Category $category */
+        /** @var Category $category */
         $category = $value['model'];
         $imagePath = $category->getData('image');
         if (empty($imagePath)) {
@@ -60,7 +62,7 @@ public function resolve(
         }
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
-        $baseUrl = $store->getBaseUrl();
+        $baseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_WEB);
 
         $filenameWithMedia =  $this->fileInfo->isBeginsWithMediaDirectoryPath($imagePath)
             ? $imagePath : $this->formatFileNameWithMediaCategoryFolder($imagePath);

From 5ef4711270360c3b418f38a1c05730919a5dd91f Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 29 Oct 2020 12:01:35 +0200
Subject: [PATCH 654/671] MC-38589: [MFTF]
 AdminEnhancedMediaGalleryVerifyAssetFilterTest failed because of bad design

---
 .../AdminMediaGalleryClickAddSelectedActionGroup.xml        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
index f575e346a8ca0..711a271c9d4ec 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
@@ -10,8 +10,8 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminMediaGalleryClickAddSelectedActionGroup">
         <waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="waitForAddSelectedButton"/>
-        <click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="clickAddSelected"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
-        <waitForElementVisible selector="{{MediaGallerySection.insertEditImageModalWindow}}" stepKey="waitForInsertEditImageWindow"/>
+        <click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="ClickAddSelected"/>
+        <waitForPageLoad stepKey="waitForImageToBeAdded"/>
+        <waitForElementVisible selector="{{MediaGallerySection.insertEditImageModalWindow}}" stepKey="waitForLoadingMaskDisappear"/>
     </actionGroup>
 </actionGroups>

From 07062f4ad5d5f8d3d5b52b4e080d8ec76fd2f316 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 29 Oct 2020 12:40:17 +0200
Subject: [PATCH 655/671] MC-37213: [MFTF]
 AdminMediaGalleryCatalogUiUsedInProductFilterTest is flaky

---
 .../Test/Mftf/Suite/MediaGalleryUiSuite.xml          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
index bda9b6ad08e43..e81dc807d0f48 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
@@ -11,12 +11,16 @@
     <suite name="MediaGalleryUiSuite">
         <before>
             <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
-            <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/>
-            <magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="enableEnhancedMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryRenditionsEnableActionGroup" stepKey="enableMediaGalleryRenditions"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </before>
         <after>
-            <magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/>
-            <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminMediaGalleryEnhancedEnableActionGroup" stepKey="disableEnhancedMediaGallery"/>
             <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" />
         </after>
         <include>

From 871e62d023b3b227153a8d82bdc22d7ac25862d2 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 29 Oct 2020 15:43:07 +0200
Subject: [PATCH 656/671] MC-38651: [MFTF]
 AdminMediaGalleryAssertUsedInLinkPagesGridTest failed because of bad design

---
 .../Test/Mftf/Section/AdminMediaGalleryFolderSection.xml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
index acc378dac6e67..be12829229663 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
@@ -21,6 +21,6 @@
         <element name="folderNameValidationMessage" type="block" selector="label.mage-error"/>
         <element name="folderArrow" type="button" selector="#{{id}} &gt; .jstree-icon" parameterized="true"/>
         <element name="checkIfFolderArrowExpand" type="button" selector="//li[@id='{{id}}' and contains(@class,'jstree-closed')]" parameterized="true"/>
-        <element name="folderInTree" type="text" selector="//div[contains(@class, 'media-directory-container')]//ul//li//a[contains(text(), '{{name}}')]" parameterized="true"/>
+        <element name="folderInTree" type="text" selector="//div[contains(@class, 'media-directory-container')]//ul//li//a[normalize-space(text())='{{name}}']" parameterized="true"/>
     </section>
 </sections>

From ecf59ac44640a8b3af9d391c3bdb87f22c7d171e Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Thu, 29 Oct 2020 15:46:14 +0200
Subject: [PATCH 657/671] MC-38651: [MFTF]
 AdminMediaGalleryAssertUsedInLinkPagesGridTest failed because of bad design

---
 .../Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
index 2bf229d2a65d3..539d6ccb6c0dd 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
@@ -20,7 +20,7 @@
         </annotations>
 
         <before>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
         </before>
 

From 3a95f15db88c04747fcc838aba909c09de00252f Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Thu, 29 Oct 2020 11:41:41 -0500
Subject: [PATCH 658/671] MC-37726: Price filter uses base currency for ranges

---
 .../GraphQl/Catalog/ProductPriceTest.php      | 60 +++++++++++++++++--
 .../Catalog/ProductSearchAggregationsTest.php | 31 ++--------
 2 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
index f1c1be44ccd13..7a3829a325c59 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
@@ -78,6 +78,54 @@ public function testProductWithSinglePrice()
         $this->assertPrices($expectedPriceRange, $product['price_range']);
     }
 
+    /**
+     * @magentoApiDataFixture Magento/Catalog/_files/products.php
+     * @magentoConfigFixture default_store currency/options/allow EUR,USD
+     */
+    public function testProductWithSinglePriceNonDefaultCurrency()
+    {
+        $skus = ['simple'];
+        $query = $this->getProductQuery($skus);
+        $headerMap = [
+            'Content-Currency' => 'EUR'
+        ];
+        $result = $this->graphQlQuery($query, [], '', $headerMap);
+
+        $this->assertArrayNotHasKey('errors', $result);
+        $this->assertNotEmpty($result['products']['items']);
+        $product = $result['products']['items'][0];
+        $this->assertNotEmpty($product['price_range']);
+
+        $expectedPriceRange = [
+            "minimum_price" => [
+                "regular_price" => [
+                    "value" => 20
+                ],
+                "final_price" => [
+                    "value" => 20
+                ],
+                "discount" => [
+                    "amount_off" => 0,
+                    "percent_off" => 0
+                ]
+            ],
+            "maximum_price" => [
+                "regular_price" => [
+                    "value" => 20
+                ],
+                "final_price" => [
+                    "value" => 20
+                ],
+                "discount" => [
+                    "amount_off" => 0,
+                    "percent_off" => 0
+                ]
+            ]
+        ];
+
+        $this->assertPrices($expectedPriceRange, $product['price_range'], 'EUR');
+    }
+
     /**
      * Pricing for Simple, Grouped and Configurable products with no special or tier prices configured
      *
@@ -909,7 +957,7 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
       name
       sku
       price_range {
-        minimum_price {regular_price 
+        minimum_price {regular_price
         {
          value
          currency
@@ -949,13 +997,13 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
       ... on ConfigurableProduct{
         variants{
           product{
-           
+
             sku
             price_range {
         minimum_price {regular_price {value}
           final_price {
             value
-            
+
           }
           discount {
             amount_off
@@ -965,11 +1013,11 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
         maximum_price {
           regular_price {
             value
-           
+
           }
           final_price {
             value
-            
+
           }
           discount {
             amount_off
@@ -985,7 +1033,7 @@ private function getQueryConfigurableProductAndVariants(array $sku): string
               final_price{value}
                 quantity
               }
-            
+
             }
           }
         }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
index 075388b0f023c..57b6b24472bf7 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -89,31 +89,12 @@ function ($a) {
     }
 
     /**
-     * @magentoApiDataFixture Magento/Store/_files/second_store_with_second_currency.php
      * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
+     * @magentoConfigFixture default_store currency/options/allow EUR,USD
      */
     public function testAggregationPriceRangesWithCurrencyHeader()
     {
-        // add USD as allowed (not default) currency
-        $objectManager = Bootstrap::getObjectManager();
-        /* @var Store $store */
-        $store = $objectManager->create(Store::class);
-        $store->load('fixture_second_store');
-        /** @var Config $configResource */
-        $configResource = $objectManager->get(Config::class);
-        $configResource->saveConfig(
-            Currency::XML_PATH_CURRENCY_ALLOW,
-            'USD',
-            ScopeInterface::SCOPE_STORES,
-            $store->getId()
-        );
-        // Configuration cache clean is required to reload currency setting
-        /** @var System $config */
-        $config = $objectManager->get(System::class);
-        $config->clean();
-
-        $headerMap['Store'] = 'fixture_second_store';
-        $headerMap['Content-Currency'] = 'USD';
+        $headerMap['Content-Currency'] = 'EUR';
         $query = $this->getGraphQlQuery(
             '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
         );
@@ -131,10 +112,10 @@ function ($a) {
         $this->assertEquals('Price', $priceAggregation['label']);
         $this->assertEquals(4, $priceAggregation['count']);
         $expectedOptions = [
-            ['label' => '10-20', 'value'=> '10_20', 'count' => '2'],
-            ['label' => '20-30', 'value'=> '20_30', 'count' => '1'],
-            ['label' => '30-40', 'value'=> '30_40', 'count' => '1'],
-            ['label' => '40-50', 'value'=> '40_50', 'count' => '1']
+            ['label' => '20-40', 'value'=> '20_40', 'count' => '2'],
+            ['label' => '40-60', 'value'=> '40_60', 'count' => '1'],
+            ['label' => '60-80', 'value'=> '60_80', 'count' => '1'],
+            ['label' => '80-100', 'value'=> '80_100', 'count' => '1']
         ];
         $this->assertEquals($expectedOptions, $priceAggregation['options']);
     }

From d835452dd2d859c43ad149ece77390a879a6ddda Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Thu, 29 Oct 2020 12:46:40 -0500
Subject: [PATCH 659/671] MC-37726: Price filter uses base currency for ranges

---
 .../Magento/GraphQl/Catalog/ProductPriceTest.php  | 15 ++++++++-------
 .../Catalog/ProductSearchAggregationsTest.php     | 13 +++++++------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
index 7a3829a325c59..b6c4b55dc1d23 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductPriceTest.php
@@ -80,14 +80,15 @@ public function testProductWithSinglePrice()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products.php
-     * @magentoConfigFixture default_store currency/options/allow EUR,USD
+     * @magentoApiDataFixture Magento/Directory/_files/usd_cny_rate.php
+     * @magentoConfigFixture default_store currency/options/allow CNY,USD
      */
     public function testProductWithSinglePriceNonDefaultCurrency()
     {
         $skus = ['simple'];
         $query = $this->getProductQuery($skus);
         $headerMap = [
-            'Content-Currency' => 'EUR'
+            'Content-Currency' => 'CNY'
         ];
         $result = $this->graphQlQuery($query, [], '', $headerMap);
 
@@ -99,10 +100,10 @@ public function testProductWithSinglePriceNonDefaultCurrency()
         $expectedPriceRange = [
             "minimum_price" => [
                 "regular_price" => [
-                    "value" => 20
+                    "value" => 70
                 ],
                 "final_price" => [
-                    "value" => 20
+                    "value" => 70
                 ],
                 "discount" => [
                     "amount_off" => 0,
@@ -111,10 +112,10 @@ public function testProductWithSinglePriceNonDefaultCurrency()
             ],
             "maximum_price" => [
                 "regular_price" => [
-                    "value" => 20
+                    "value" => 70
                 ],
                 "final_price" => [
-                    "value" => 20
+                    "value" => 70
                 ],
                 "discount" => [
                     "amount_off" => 0,
@@ -123,7 +124,7 @@ public function testProductWithSinglePriceNonDefaultCurrency()
             ]
         ];
 
-        $this->assertPrices($expectedPriceRange, $product['price_range'], 'EUR');
+        $this->assertPrices($expectedPriceRange, $product['price_range'], 'CNY');
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
index 57b6b24472bf7..9ff33795cb868 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -90,11 +90,12 @@ function ($a) {
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products_for_search.php
-     * @magentoConfigFixture default_store currency/options/allow EUR,USD
+     * @magentoApiDataFixture Magento/Directory/_files/usd_cny_rate.php
+     * @magentoConfigFixture default_store currency/options/allow CNY,USD
      */
     public function testAggregationPriceRangesWithCurrencyHeader()
     {
-        $headerMap['Content-Currency'] = 'EUR';
+        $headerMap['Content-Currency'] = 'CNY';
         $query = $this->getGraphQlQuery(
             '"search_product_1", "search_product_2", "search_product_3", "search_product_4" ,"search_product_5"'
         );
@@ -112,10 +113,10 @@ function ($a) {
         $this->assertEquals('Price', $priceAggregation['label']);
         $this->assertEquals(4, $priceAggregation['count']);
         $expectedOptions = [
-            ['label' => '20-40', 'value'=> '20_40', 'count' => '2'],
-            ['label' => '40-60', 'value'=> '40_60', 'count' => '1'],
-            ['label' => '60-80', 'value'=> '60_80', 'count' => '1'],
-            ['label' => '80-100', 'value'=> '80_100', 'count' => '1']
+            ['label' => '70-140', 'value'=> '70_140', 'count' => '2'],
+            ['label' => '140-210', 'value'=> '140_210', 'count' => '1'],
+            ['label' => '210-280', 'value'=> '210_280', 'count' => '1'],
+            ['label' => '280-350', 'value'=> '280_350', 'count' => '1']
         ];
         $this->assertEquals($expectedOptions, $priceAggregation['options']);
     }

From 908456b80bc687c8268e3c5ec9d4cfaa14c65999 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Thu, 29 Oct 2020 12:55:24 -0500
Subject: [PATCH 660/671] MC-37726: Price filter uses base currency for ranges

---
 .../GraphQl/Catalog/ProductSearchAggregationsTest.php       | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
index 9ff33795cb868..bd4530d0724a1 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchAggregationsTest.php
@@ -7,12 +7,6 @@
 
 namespace Magento\GraphQl\Catalog;
 
-use Magento\Config\App\Config\Type\System;
-use Magento\Config\Model\ResourceModel\Config;
-use Magento\Directory\Model\Currency;
-use Magento\Store\Model\ScopeInterface;
-use Magento\Store\Model\Store;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
 class ProductSearchAggregationsTest extends GraphQlAbstract

From 44fa566db29f8a1911e64371b06849587e60d1d9 Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Thu, 29 Oct 2020 15:59:21 -0500
Subject: [PATCH 661/671] MC-37726: Price filter uses base currency for ranges

---
 app/code/Magento/CatalogGraphQl/composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
index 46d7454a6d7e2..463f974056749 100644
--- a/app/code/Magento/CatalogGraphQl/composer.json
+++ b/app/code/Magento/CatalogGraphQl/composer.json
@@ -7,6 +7,7 @@
         "magento/module-eav": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-inventory": "*",
+        "magento/module-directory": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-eav-graph-ql": "*",

From ebbf23a009ff0a65456512f9ab1502af8b638123 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Thu, 29 Oct 2020 16:00:05 -0500
Subject: [PATCH 662/671] added tests for seo disabled

---
 .../Catalog/CategoriesQuery/CategoriesFilterTest.php        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php
index a3daf89631c17..09f39bf1441f5 100644
--- a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoriesFilterTest.php
@@ -395,8 +395,9 @@ public function testMinimumMatchQueryLength()
      * Test category image full name is returned
      *
      * @magentoApiDataFixture Magento/Catalog/_files/catalog_category_with_long_image_name.php
+     * @magentoConfigFixture default_store web/seo/use_rewrites 0
      */
-    public function testCategoryImageName()
+    public function testCategoryImageNameAndSeoDisabled()
     {
         /** @var CategoryCollection $categoryCollection */
         $categoryCollection = Bootstrap::getObjectManager()->get(CategoryCollection::class);
@@ -427,14 +428,13 @@ public function testCategoryImageName()
         $categories = $response['categories'];
         $this->assertArrayNotHasKey('errors', $response);
         $this->assertNotEmpty($response['categories']['items']);
-        $expectedImageUrl = str_replace('index.php/', '', $expectedImageUrl);
-        $categories['items'][0]['image'] = str_replace('index.php/', '', $categories['items'][0]['image']);
         $this->assertEquals('Parent Image Category', $categories['items'][0]['name']);
         $this->assertEquals($expectedImageUrl, $categories['items'][0]['image']);
     }
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/categories.php
+     * @magentoConfigFixture default_store web/seo/use_rewrites 1
      */
     public function testFilterByUrlPathTopLevelCategory()
     {

From 9094403c198214c1dcc34021e0d4bac3bc8b091e Mon Sep 17 00:00:00 2001
From: Cari Spruiell <spruiell@adobe.com>
Date: Thu, 29 Oct 2020 16:00:52 -0500
Subject: [PATCH 663/671] MC-37726: Price filter uses base currency for ranges

---
 app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
index cddb95d5ba765..cc76855cc6d20 100644
--- a/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
+++ b/app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php
@@ -37,8 +37,8 @@ class Aggregations implements ResolverInterface
 
     /**
      * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
-     * @param PriceCurrency $priceCurrency
      * @param LayerBuilder $layerBuilder
+     * @param PriceCurrency $priceCurrency
      */
     public function __construct(
         \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider,

From cf5e1563a1290ad638b22511666a3af53a4a4ae2 Mon Sep 17 00:00:00 2001
From: Serhii Balko <serhii.balko@transoftgroup.com>
Date: Fri, 30 Oct 2020 09:53:31 +0200
Subject: [PATCH 664/671] MC-35740: Using API to capture payment

---
 app/code/Magento/Sales/etc/webapi_soap/di.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 1a8478438b04a..12ad410279a08 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -19,7 +19,7 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Order\ShipmentRepository">
-        <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
+    <type name="Magento\Sales\Model\Service\InvoiceService">
+        <plugin name="addTransactionCommentAfterCapture" type="Magento\Sales\Plugin\Model\Service\Invoice\AddTransactionCommentAfterCapture"/>
     </type>
 </config>

From 320aee986572290d5a6f4c5324fd2d9cbf12af5c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 30 Oct 2020 10:08:58 +0200
Subject: [PATCH 665/671] MC-38589: [MFTF]
 AdminEnhancedMediaGalleryVerifyAssetFilterTest failed because of bad design

---
 .../AdminMediaGalleryClickAddSelectedActionGroup.xml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
index 711a271c9d4ec..6cfc7b07831d0 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryClickAddSelectedActionGroup.xml
@@ -12,6 +12,6 @@
         <waitForElementVisible selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="waitForAddSelectedButton"/>
         <click selector="{{AdminMediaGalleryHeaderButtonsSection.addSelected}}" stepKey="ClickAddSelected"/>
         <waitForPageLoad stepKey="waitForImageToBeAdded"/>
-        <waitForElementVisible selector="{{MediaGallerySection.insertEditImageModalWindow}}" stepKey="waitForLoadingMaskDisappear"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskDisappear"/>
     </actionGroup>
 </actionGroups>

From 2be562a6502015f13de5829b940e7a48e0fc919c Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 30 Oct 2020 12:04:09 +0200
Subject: [PATCH 666/671] MC-33288: [2.4][MSI][MFTF]
 StorefrontLoggedInCustomerCreateOrderAllOptionQuantityConfigurableProductCustomStockTest
 fails because of bad design

---
 .../Catalog/Model/ResourceModel/Product/Relation.php       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
index 2f8c4a34f0087..392a4aeedfeb3 100644
--- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
+++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Relation.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -24,16 +25,16 @@ class Relation extends AbstractDb
 
     /**
      * @param Context $context
-     * @param null $connectionName
+     * @param string $connectionName
      * @param MetadataPool $metadataPool
      */
     public function __construct(
         Context $context,
         $connectionName = null,
-        MetadataPool $metadataPool
+        MetadataPool $metadataPool = null
     ) {
         parent::__construct($context, $connectionName);
-        $this->metadataPool = $metadataPool;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
     }
 
     /**

From d180f78d5ebc04c43ef76f466843a7cb9b123570 Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Fri, 30 Oct 2020 14:04:16 +0200
Subject: [PATCH 667/671] MC-38814: [MFTF]
 AdminMediaGalleryInsertLargeImageFileSizeTest failed because of bad design

---
 ...diaGalleryInsertImageLargeFileSizeTest.xml | 58 +++++++++++++++++++
 ...diaGalleryInsertLargeImageFileSizeTest.xml |  7 ++-
 2 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml

diff --git a/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml
new file mode 100644
index 0000000000000..2d80b490e2d9b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryInsertImageLargeFileSizeTest">
+        <annotations>
+            <features value="MediaGalleryRenditions"/>
+            <stories value="User inserts image rendition to the content"/>
+            <title value="Admin user should see correct image file size after rendition"/>
+            <description value="Admin user should see correct image file size after rendition"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1507933/scenarios/5200023"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1806"/>
+            <severity value="AVERAGE"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllImages"/>
+            <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <!-- Open category page -->
+        <actionGroup ref="GoToAdminCategoryPageByIdActionGroup" stepKey="openCategoryPage">
+            <argument name="id" value="$category.id$"/>
+        </actionGroup>
+
+        <!-- Add image to category from gallery -->
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFiltersAgain"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="addCategoryImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickImageInGridActionGroup" stepKey="selectImage">
+            <argument name="imageName" value="{{ImageUpload.fileName}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="addSelected"/>
+
+        <!-- Assert added image size -->
+        <actionGroup ref="AdminAssertImageUploadFileSizeThanActionGroup" stepKey="assertSize">
+            <argument name="fileSize" value="26 KB"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml
index d859f4852aaaf..061f062eabe6b 100644
--- a/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml
+++ b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml
@@ -8,16 +8,19 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryInsertLargeImageFileSizeTest">
+    <test name="AdminMediaGalleryInsertLargeImageFileSizeTest" deprecated="Use AdminMediaGalleryInsertImageLargeFileSizeTest instead">
         <annotations>
             <features value="AdminMediaGalleryInsertLargeImageFileSizeTest"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1806"/>
-            <title value="Admin user should see correct image file size after rendition"/>
+            <title value="DEPRECATED. Admin user should see correct image file size after rendition"/>
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1507933/scenarios/5200023"/>
             <stories value="User inserts image rendition to the content"/>
             <description value="Admin user should see correct image file size after rendition"/>
             <severity value="AVERAGE"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryInsertImageLargeFileSizeTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleSubCategory" stepKey="category"/>

From 5fe07d4224a809791e6cb64903d5024ca944b07a Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Mon, 2 Nov 2020 17:09:14 +0200
Subject: [PATCH 668/671] MC-38651: [MFTF]
 AdminMediaGalleryAssertUsedInLinkPagesGridTest failed because of bad design

---
 .../Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
index 539d6ccb6c0dd..4e589faef9a1f 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
@@ -60,8 +60,8 @@
         <actionGroup ref="AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup" stepKey="assertFilterApplied">
             <argument name="filterPlaceholder" value="{{ImageMetadata.title}}"/>
         </actionGroup>
-         <actionGroup ref="AdminDeleteCmsPageFromGridActionGroup" stepKey="deleteCmsPage">
-            <argument name="urlKey" value="{{_defaultCmsPage.identifier}}"/>
+        <actionGroup ref="AdminDeleteCMSPageByUrlKeyActionGroup" stepKey="deleteCmsPage">
+            <argument name="pageUrlKey" value="{{_defaultCmsPage.identifier}}"/>
         </actionGroup>
 
         <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersInPageGrid"/>

From 672768c1061940d320ad62ab0c84847235054aff Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 3 Nov 2020 13:31:19 +0200
Subject: [PATCH 669/671] MC-38851:[MFTF]
 AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest failed because of
 bad design

---
 ...alogUiVerifyUsedInLinkCategoryGridTest.xml |   7 +-
 ...ogUiVerifyUsedInLinkedCategoryGridTest.xml | 102 ++++++++++++++++++
 ...ediaGalleryImageDetailsEditActionGroup.xml |   2 +-
 ...ediaGalleryImageDetailsSaveActionGroup.xml |   2 +-
 ...EnhancedMediaGalleryEditDetailsSection.xml |   3 +-
 5 files changed, 111 insertions(+), 5 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index f9ffda43d2547..a3f1bd7c01136 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest">
+    <test name="AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest" deprecated="Use AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest instead">
         <annotations>
             <features value="AdminMediaGalleryCategoryGrid"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
-            <title value="User can open each entity the asset is associated with in a separate tab to manage association"/>
+            <title value="DEPRECATED. User can open each entity the asset is associated with in a separate tab to manage association"/>
             <stories value="Story 58: User sees entities where asset is used in" />
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
             <description value="User can open each entity the asset is associated with in a separate tab to manage association"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleSubCategory" stepKey="category"/>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml
new file mode 100644
index 0000000000000..8e197b740bb11
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest">
+        <annotations>
+            <features value="MediaGalleryCatalogUi"/>
+            <stories value="Story 58: User sees entities where asset is used in" />
+            <title value="User can open each entity the asset is associated with in a separate tab to manage association"/>
+            <description value="User can open each entity the asset is associated with in a separate tab to manage association"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1503"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/943908/scenarios/4523889"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+            <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolder"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+            <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openMediaGalleryCategoryGridPage"/>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="GoToAdminCategoryPageByIdActionGroup" stepKey="openCategoryPage">
+            <argument name="id" value="$category.id$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear" />
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsEditActionGroup" stepKey="editImage"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
+        <actionGroup ref="AdminMediaGalleryClickAddSelectedActionGroup" stepKey="clickAddSelectedCategoryImage"/>
+        <actionGroup ref="AdminSaveCategoryFormActionGroup" stepKey="saveCategory"/>
+
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploaderToVerifyLink"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectCategoryImageFolder"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryClickEntityUsedInActionGroup" stepKey="clickUsedInCategories">
+            <argument name="entityName" value="Categories"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterApplied">
+            <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageNumberOfRecordsActionGroup" stepKey="assertOneRecordInGrid">
+            <argument name="numberOfRecords" value="1 records found"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageImageColumnActionGroup" stepKey="assertCategoryGridPageImageColumn">
+            <argument name="file" value="{{UpdatedImageDetails.file}}"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageDetailsActionGroup" stepKey="assertCategoryInGrid">
+            <argument name="category" value="$category$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminCategoryGridPageProductsInMenuEnabledColumnsActionGroup" stepKey="assertCategoryGridPageProductsInMenuEnabledColumns"/>
+
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetCategoriesGridFilters"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridExpandFilterActionGroup" stepKey="expandFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectUsedInFilterActionGroup" stepKey="setAssetFilter">
+            <argument name="filterName" value="Asset"/>
+            <argument name="optionName" value="{{UpdatedImageDetails.title}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryCategoryGridApplyFiltersActionGroup" stepKey="applyFilters"/>
+        <actionGroup ref="AssertAdminMediaGalleryAssetFilterPlaceHolderActionGroup" stepKey="assertFilterAppliedAfterUrlFilterApplier">
+            <argument name="filterPlaceholder" value="{{UpdatedImageDetails.title}}"/>
+        </actionGroup>
+
+        <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGallery"/>
+        <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="openCategoryImageFolder"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetailsToVerifyEmptyUsedIn"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionNotDisplayedActionGroup" stepKey="assertThereIsNoUsedInSection"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeDetails"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml
index 931da0ee06fef..5f7ab2d2d008f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsEditActionGroup.xml
@@ -13,6 +13,6 @@
             <description>Edit image from the View Details panel</description>
         </annotations>
         <click selector="{{AdminEnhancedMediaGalleryViewDetailsSection.edit}}" stepKey="editImage"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryEditDetailsSection.modalTitle}}" stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
index 0da3de9501c13..69e8d94522cde 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
@@ -19,6 +19,6 @@
         <fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.title}}" userInput="{{image.title}}" stepKey="setTitle" />
         <fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.description}}" userInput="{{image.description}}" stepKey="setDescription" />
         <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.save}}" stepKey="saveDetails"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryViewDetailsSection.modalTitle}}" stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
index b0bed4563003e..351367055e62b 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
@@ -16,6 +16,7 @@
         <element name="addNewKeyword" type="input" selector="[data-ui-id='add-keyword']"/>
         <element name="removeSelectedKeyword" type="button" selector="//span[contains(text(), '{{keyword}}')]/following-sibling::button[@data-action='remove-selected-item']" parameterized="true"/>
         <element name="cancel" type="button" selector="#image-details-action-cancel"/>
-        <element name="save" type="button" selector="#image-details-action-save"/>
+        <element name="save" type="button" selector="#image-details-action-save" timeout="30"/>
+        <element name="modalTitle" type="text" selector="//aside[contains(@class, 'media-gallery-edit-image-details') and contains(@class, '_show')]//h1[contains(., 'Edit Image')]"/>
     </section>
 </sections>

From 987f4b8bf5c628eb4474ac553d74792d8fd6f2ab Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Tue, 3 Nov 2020 18:27:23 +0200
Subject: [PATCH 670/671] MC-38851:[MFTF]
 AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest failed because of
 bad design

---
 ...ediaGalleryImageDetailsSaveActionGroup.xml |  2 +-
 ...nhancedMediaGalleryImageActionsSection.xml |  4 +-
 ...diaGalleryEditImageDetailsFromGridTest.xml | 52 ++++++++++++++++
 .../AdminMediaGalleryEditImageDetailsTest.xml |  7 ++-
 ...aGalleryEditImageDetailsFromDialogTest.xml | 61 +++++++++++++++++++
 ...daloneMediaGalleryEditImageDetailsTest.xml |  7 ++-
 6 files changed, 126 insertions(+), 7 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml
 create mode 100644 app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest.xml

diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
index 69e8d94522cde..0da3de9501c13 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryImageDetailsSaveActionGroup.xml
@@ -19,6 +19,6 @@
         <fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.title}}" userInput="{{image.title}}" stepKey="setTitle" />
         <fillField selector="{{AdminEnhancedMediaGalleryEditDetailsSection.description}}" userInput="{{image.description}}" stepKey="setDescription" />
         <click selector="{{AdminEnhancedMediaGalleryEditDetailsSection.save}}" stepKey="saveDetails"/>
-        <waitForElementVisible selector="{{AdminEnhancedMediaGalleryViewDetailsSection.modalTitle}}" stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
index 1a8f6f553d4ce..17c3e82144d6f 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryImageActionsSection.xml
@@ -11,8 +11,8 @@
         <element name="openContextMenu" type="button" selector=".three-dots"/>
         <element name="contextMenuItem" type="block" selector="//div[@class='media-gallery-image']//ul[@class='action-menu _active']//li//a[@class='action-menu-item']"/>
         <element name="viewDetails" type="button" selector="//ul[@class='action-menu _active']//a[text()='View Details']" timeout="30"/>
-        <element name="delete" type="button" selector="[data-ui-id='action-delete']"/>
-        <element name="edit" type="button" selector="[data-ui-id='action-edit']"/>
+        <element name="delete" type="button" selector="//ul[@class='action-menu _active']//a[text()='Delete']"/>
+        <element name="edit" type="button" selector="//ul[@class='action-menu _active']//a[text()='Edit']"/>
         <element name="imageInGrid" type="button" selector="//li[@data-ui-id='title'and text()='{{imageTitle}}']/parent::*/parent::*/parent::div//img[@class='media-gallery-image-column']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml
new file mode 100644
index 0000000000000..91a17a7c1167c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryEditImageDetailsFromGridTest">
+        <annotations>
+            <features value="MediaGalleryUi"/>
+            <stories value="[Story # 38] User views basic image attributes in Media Gallery"/>
+            <title value="User edits image meta data in media gallery"/>
+            <description value="User edits image meta data in Standalone Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/3961351"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/724"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryEditImageDetailsActionGroup" stepKey="editImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="verifyUpdateImageOnTheGrid">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
+            <argument name="description" value="UpdatedImageDetails.description"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
index 960443998d010..34c3159ab769e 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryEditImageDetailsTest">
+    <test name="AdminMediaGalleryEditImageDetailsTest" deprecated="Use AdminMediaGalleryEditImageDetailsFromGridTest instead">
         <annotations>
             <features value="MediaGallery"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/724"/>
-            <title value="User edits image meta data in media gallery"/>
+            <title value="DEPRECATED. User edits image meta data in media gallery"/>
             <stories value="[Story # 38] User views basic image attributes in Media Gallery"/>
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/3961351"/>
             <description value="User edits image meta data in Standalone Media Gallery"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryEditImageDetailsFromGridTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest.xml
new file mode 100644
index 0000000000000..250b42c5510a7
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest">
+        <annotations>
+            <features value="MediaGalleryUi"/>
+            <stories value="[Story # 38] User views basic image attributes in Media Gallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/724"/>
+            <title value="User edits image meta data in standalone media gallery"/>
+            <description value="User edits image meta data in Standalone Media Gallery"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/3961351"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeletedAllImagesActionGroup" stepKey="deleteAllMediaGalleryImages"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetMediaGalleryGridFilters"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryUploadImageActionGroup" stepKey="uploadImage">
+            <argument name="image" value="ImageUpload"/>
+        </actionGroup>
+        <generateDate date="now" format="s" stepKey="secondsFromMinuteStart"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="clickViewDetails"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUploadedImageDateTimeEqualsActionGroup" stepKey="verifyCreatedAndUpdatedAtDate" />
+
+        <executeJS function="return 60 - {$secondsFromMinuteStart} + 5" stepKey="calcWaitPeriod"/>
+        <wait time="$calcWaitPeriod" stepKey="waitTillEndOfAMinute"/>
+
+        <actionGroup ref="AdminEnhancedMediaGalleryCloseViewDetailsActionGroup" stepKey="closeViewDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryEditImageDetailsActionGroup" stepKey="editImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryImageDetailsSaveActionGroup" stepKey="saveImage">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AssertImageAttributesOnEnhancedMediaGalleryActionGroup" stepKey="verifyUpdateImageOnTheGrid">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="viewImageDetails"/>
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDetailsActionGroup" stepKey="verifyImageDetails">
+            <argument name="image" value="UpdatedImageDetails"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryImageCreatedAtNotEqualsUpdatedAtTimeActionGroup" stepKey="assertUpdatedAtTimeChanged" />
+        <actionGroup ref="AdminEnhancedMediaGalleryVerifyImageDescriptionActionGroup" stepKey="verifyImageDescription">
+            <argument name="description" value="UpdatedImageDetails.description"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
index 58c6f32b8d72f..039e9212945e2 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminStandaloneMediaGalleryEditImageDetailsTest">
+    <test name="AdminStandaloneMediaGalleryEditImageDetailsTest" deprecated="Use AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest instead">
         <annotations>
             <features value="MediaGallery"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/724"/>
-            <title value="User edits image meta data in standalone media gallery"/>
+            <title value="DEPRECATED. User edits image meta data in standalone media gallery"/>
             <stories value="[Story # 38] User views basic image attributes in Media Gallery"/>
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/3961351"/>
             <description value="User edits image meta data in Standalone Media Gallery"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

From ba82de1f5db35ed522926dc3977f36b30dde520f Mon Sep 17 00:00:00 2001
From: Myroslav Dobra <dmaraptor@gmail.com>
Date: Wed, 4 Nov 2020 09:38:26 +0200
Subject: [PATCH 671/671] MC-38894: [MFTF]
 AdminMediaGalleryCatalogUiEditCategoryGridPageTest failed because of bad
 design

---
 ...yCatalogUiEditCategoryFromGridPageTest.xml | 39 +++++++++++++++++++
 ...lleryCatalogUiEditCategoryGridPageTest.xml |  7 +++-
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest.xml

diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest.xml
new file mode 100644
index 0000000000000..2beb0ad12e5d0
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest">
+        <annotations>
+            <features value="MediaGalleryCatalogUi"/>
+            <stories value="Story 58: User sees entities where asset is used in" />
+            <title value="User Edits Category from Category grid"/>
+            <description value="Edit Category from Media Gallery Category Grid"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/5034526"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1667"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        </after>
+
+        <actionGroup ref="AdminOpenCategoryGridPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="resetGridFilters"/>
+        <actionGroup ref="AdminEditCategoryInGridPageActionGroup" stepKey="editCategoryItem">
+            <argument name="categoryName" value="$category.name$"/>
+        </actionGroup>
+        <actionGroup ref="AdminAssertCategoryPageTitleActionGroup" stepKey="assertCategoryByName"/>
+   </test>
+</tests>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
index 2a606d8ab6a9e..739b25d1ce0ed 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
@@ -7,16 +7,19 @@
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminMediaGalleryCatalogUiEditCategoryGridPageTest">
+    <test name="AdminMediaGalleryCatalogUiEditCategoryGridPageTest" deprecated="Use AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest instead">
         <annotations>
             <features value="AdminMediaGalleryCategoryGrid"/>
             <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1667"/>
-            <title value="User Edits Category from Category grid"/>
+            <title value="DEPRECATED. User Edits Category from Category grid"/>
             <stories value="Story 58: User sees entities where asset is used in" />
             <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1320712/scenarios/5034526"/>
             <description value="Edit Category from Media Gallery Category Grid"/>
             <severity value="CRITICAL"/>
             <group value="media_gallery_ui"/>
+            <skip>
+                <issueId value="DEPRECATED">Use AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest instead</issueId>
+            </skip>
         </annotations>
         <before>
             <createData entity="SimpleSubCategory" stepKey="category"/>